--- loncom/interface/lonmeta.pm 2004/06/16 18:33:46 1.80
+++ loncom/interface/lonmeta.pm 2004/06/17 18:22:13 1.82
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.80 2004/06/16 18:33:46 matthew Exp $
+# $Id: lonmeta.pm,v 1.82 2004/06/17 18:22:13 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -61,7 +61,6 @@ use Apache::lonmsg;
############################################################
sub get_dynamic_metadata_from_sql {
my ($url) = shift();
- # &Apache::lonnet::logthis('url = '.$url);
my ($authordom,$author)=($url=~m:^/res/(\w+)/(\w+)/:);
if (! defined($authordom)) {
$authordom = shift();
@@ -113,7 +112,6 @@ sub get_dynamic_metadata_from_sql {
my $url = $Data[0];
for (my $i=0;$i<=$#Fields;$i++) {
$ReturnHash{$url}->{$Fields[$i]}=$Data[$i];
- # &Apache::lonnet::logthis(' '.$Fields[$i].' => '.$Data[$i]);
}
}
$finished = 1;
@@ -285,7 +283,8 @@ sub fieldnames {
# Pretty printing of metadata field
sub prettyprint {
- my ($type,$value)=@_;
+ my ($type,$value,$target,$prefix,$form,$noformat)=@_;
+# $target,$prefix,$form are optional and for filecrumbs only
if (! defined($value)) {
return ' ';
}
@@ -339,8 +338,9 @@ sub prettyprint {
($type eq 'obsoletereplacement') ||
($type eq 'goto_list') ||
($type eq 'comefrom_list') ||
- ($type eq 'sequsage_list')) {
- return join('
',map {
+ ($type eq 'sequsage_list') ||
+ ($type eq 'linkto_list')) {
+ return '
'.$display.' | '.$content{$name});
if ($otherinfo) {
$r->print(' ('.$otherinfo.')');
}
- $r->print(" \n"); + $r->print(" |