--- loncom/interface/lonmeta.pm	2004/06/17 15:05:59	1.81
+++ loncom/interface/lonmeta.pm	2005/01/18 01:44:12	1.88
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.81 2004/06/17 15:05:59 www Exp $
+# $Id: lonmeta.pm,v 1.88 2005/01/18 01:44:12 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,11 +71,12 @@ sub get_dynamic_metadata_from_sql {
     if (! defined($authordom) || ! defined($author)) {
         return ();
     }
-    my @Fields = ('url',
+    my @Fields = ('url','count','course',
                   'goto','goto_list',
                   'comefrom','comefrom_list',
                   'sequsage','sequsage_list',
                   'stdno','stdno_list',
+		  'dependencies',
                   'avetries','avetries_list',
                   'difficulty','difficulty_list',
                   'disc','disc_list',
@@ -255,7 +256,7 @@ sub fieldnames {
          'owner' => 'Publisher/Owner',
          'copyright' => 'Copyright/Distribution',
          'customdistributionfile' => 'Custom Distribution File',
-         'sourceavail' => 'Source Availible',
+         'sourceavail' => 'Source Available',
          'sourcerights' => 'Source Custom Distribution File',
          'obsolete' => 'Obsolete',
          'obsoletereplacement' => 'Suggested Replacement for Obsolete File',
@@ -277,13 +278,15 @@ sub fieldnames {
          'stdno'      => 'Total number of students who have worked on this problem',
          'difficulty' => 'Degree of difficulty',
          'disc'       => 'Degree of discrimination',
+	 'dependencies' => 'Resources used by this resource',
          );
 }
 
 # 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 ' '; 
     }
@@ -337,8 +340,9 @@ sub prettyprint {
 	($type eq 'obsoletereplacement') ||
 	($type eq 'goto_list') ||
 	($type eq 'comefrom_list') ||
-	($type eq 'sequsage_list')) {
-	return join('<br />',map {
+	($type eq 'sequsage_list') ||
+	($type eq 'dependencies')) {
+	return '<ul><font size="-1">'.join("\n",map {
             my $url = &Apache::lonnet::clutter($_);
             my $title = &Apache::lonnet::gettitle($url);
             if ($title eq '') {
@@ -355,11 +359,10 @@ sub prettyprint {
                     $title .= ' Syllabus';
                 } 
             }
-            $_ = '<b>'.$title.'</b> '.
-                '<a href="'.$url.'" target="preview">'.
-                '<font size="-1">'.$url.'</font>'.
-                '</a>'
-        } split(/\s*\,\s*/,$value));
+            $_ = '<li>'.$title.' '.
+		&Apache::lonhtmlcommon::crumbs($url,$target,$prefix,$form,'-1',$noformat).
+                '</li>'
+	    } split(/\s*\,\s*/,$value)).'</ul></font>';
     }
     # Evaluations
     if (($type eq 'clear') ||
@@ -541,7 +544,7 @@ sub handler {
         &present_editable_metadata($r,$uri);
     } else {
         $r->print(&Apache::loncommon::bodytag
-                  ('Catalog Information','','','',$resdomain));
+		  ('Catalog Information','','','',$resdomain));
         &present_uneditable_metadata($r,$uri);
     }
     $r->print('</body></html>');
@@ -662,7 +665,7 @@ $disuri<br />
 $obsoletewarning
 $versiondisplay
 </p>
-<table cellspacing=2 border=0>
+<table cellspacing="2" border="0">
 $table
 </table>
 ENDHEAD
@@ -692,7 +695,7 @@ sub print_dynamic_metadata {
         exists($dynmeta{'goto'}) ||
         exists($dynmeta{'course'})) {
         $r->print('<h4>'.&mt('Access and Usage Statistics').'</h4>'.
-                  '<table cellspacing=2 border=0>');
+                  '<table cellspacing="2" border="0">');
         foreach ('count',
                  'sequsage','sequsage_list',
                  'comefrom','comefrom_list',
@@ -717,7 +720,7 @@ sub print_dynamic_metadata {
             $r->print('<h4>'.
                       &mt('Overall Assessment Statistical Data').
                       '</h4>'.
-                      '<table cellspacing=2 border=0>');
+                      '<table cellspacing="2" border="0">');
             $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{'stdno'}.'</td>'.
                       '<td bgcolor="#CCCCCC">'.
                       &prettyprint('stdno',$dynmeta{'stdno'}).
@@ -736,7 +739,7 @@ sub print_dynamic_metadata {
             $r->print('<h4>'.
                       &mt('Detailed Assessment Statistical Data').
                       '</h4>');
-            my $table = '<table cellspacing=2 border=0>'.
+            my $table = '<table cellspacing="2" border="0">'.
                 '<tr>'.
                 '<th>Course</th>'.
                 '<th>Section(s)</th>'.
@@ -796,7 +799,7 @@ sub print_dynamic_metadata {
         exists($dynmeta{'correct'}) || 
         exists($dynmeta{'technical'})){ 
         $r->print('<h4>'.&mt('Evaluation Data').'</h4>'.
-                  '<table cellspacing=2 border=0>');
+                  '<table cellspacing="2" border="0">');
         foreach ('clear','depth','helpful','correct','technical') {
             $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{$_}.'</td>'.
                       '<td bgcolor="#CCCCCC">'.
@@ -902,21 +905,18 @@ ENDBOMBS
                 &mt('Default Cataloging Information for Directory').' '.
                 $dir;
         }
-        my $bodytag=
-            &Apache::loncommon::bodytag('Edit Catalog Information');
         %Apache::lonpublisher::metadatafields=();
         %Apache::lonpublisher::metadatakeys=();
         &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile($fn));
         $r->print(<<ENDEDIT);
-<html><head><title>Edit Catalog Information</title></head>
-$bodytag
 <h1>$displayfile</h1>
 <form method="post" name="defaultmeta">
 ENDEDIT
         $r->print('<script language="JavaScript">'.
-                  &Apache::loncommon::browser_and_searcher_javascript.
+                  &Apache::loncommon::browser_and_searcher_javascript().
                   '</script>');
         my %lt=&fieldnames();
+	my $output;
         foreach ('author','title','subject','keywords','abstract','notes',
                  'copyright','customdistributionfile','language',
                  'standards',
@@ -930,17 +930,17 @@ ENDEDIT
                 $Apache::lonpublisher::metadatafields{'copyright'}=
                     'default';
             }
-            $r->print('<p>'.$lt{$_}.': '.
-                      &prettyinput
-                      ($_,$Apache::lonpublisher::metadatafields{$_},
-                       'new_'.$_,'defaultmeta').'</p>');
+            $output.=('<p>'.$lt{$_}.': '.
+                      &prettyinput($_,
+				   $Apache::lonpublisher::metadatafields{$_},
+				   'new_'.$_,'defaultmeta').'</p>');
         }
         if ($ENV{'form.store'}) {
             my $mfh;
             if (!  ($mfh=Apache::File->new('>'.$fn))) {
-                $r->print('<p><font color=red>'.
+                $r->print('<p><font color="red">'.
                           &mt('Could not write metadata').', '.
-                          &mt('FAIL').'</font>');
+                          &mt('FAIL').'</font></p>');
             } else {
                 foreach (sort keys %Apache::lonpublisher::metadatafields) {
                     next if ($_ =~ /\./);
@@ -963,10 +963,12 @@ ENDEDIT
                          '<>&"').
                          '</'.$tag.'>';
                 }
-                $r->print('<p>'.&mt('Wrote Metadata'));
+                $r->print('<p><font color="blue">'.&mt('Wrote Metadata').
+			  ' '.&Apache::lonlocal::locallocaltime(time).
+			  '</font></p>');
             }
         }
-        $r->print('<br /><input type="submit" name="store" value="'.
+	$r->print($output.'<br /><input type="submit" name="store" value="'.
                   &mt('Store Catalog Information').'">');
     }
     $r->print('</form>');