--- loncom/interface/lonmeta.pm	2003/10/24 14:58:36	1.39
+++ loncom/interface/lonmeta.pm	2003/12/31 02:33:27	1.52
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.39 2003/10/24 14:58:36 albertel Exp $
+# $Id: lonmeta.pm,v 1.52 2003/12/31 02:33:27 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -24,12 +24,7 @@
 # /home/httpd/html/adm/gpl.txt
 #
 # http://www.lon-capa.org/
-#
-# (TeX Content Handler
-#
-# 05/29/00,05/30,10/11 Gerd Kortemeyer)
-#
-# 10/19,10/21,10/23,11/27,08/09/01,12/22,12/24,12/25 Gerd Kortemeyer
+
 
 package Apache::lonmeta;
 
@@ -37,9 +32,16 @@ use strict;
 use Apache::Constants qw(:common);
 use Apache::lonnet();
 use Apache::loncommon();
+use Apache::lonhtmlcommon();
 use Apache::lonmsg;
 use Apache::lonpublisher;
 use Apache::lonlocal;
+use Apache::lonmysql;
+use Apache::lonmsg;
+
+# MySQL table columns
+
+my @columns;
 
 # ----------------------------------------- Fetch and evaluate dynamic metadata
 
@@ -55,7 +57,7 @@ sub dynamicmeta {
     my %sum=();
     my %cnt=();
     my %concat=();
-    my %listitems=('count'        => 'add',
+    my %listitems=(
                    'course'       => 'add',
                    'goto'         => 'add',
                    'comefrom'     => 'add',
@@ -85,7 +87,7 @@ sub dynamicmeta {
         } else {
             if (defined($sum{$cat})) {
                if ($evaldata{$_}) {
-                  $sum{$cat}.='<hr>'.$evaldata{$_};
+                  $sum{$cat}.='<hr />'.$evaldata{$_};
 	       }
  	    } else {
 	       $sum{$cat}=''.$evaldata{$_};
@@ -104,9 +106,27 @@ sub dynamicmeta {
        $returnhash{$_.'_list'}=$concat{$_};
        ### Apache->request->print("\n<hr />".$_.': '.$returnhash{$_}.'<br />'.$returnhash{$_.'_list'});
     }
+    #
+    # Deal with 'count' separately
+    $returnhash{'count'} = &access_count($url,$aauthor,$adomain);
+    # since "usage" is reserved word in MySQL ...
+    $returnhash{'sequsage'}=$returnhash{'usage'};
+    $returnhash{'sequsage_list'}=$returnhash{'usage_list'};
+
     return %returnhash;
 }
 
+sub access_count {
+    my ($src,$author,$adomain) = @_;
+    my %countdata=&Apache::lonnet::dump('nohist_accesscount',$adomain,
+                                        $author,$src);
+    if (! exists($countdata{$src})) {
+        return &mt('Not Available');
+    } else {
+        return $countdata{$src};
+    }
+}
+
 # ------------------------------------- Try to make an alt tag if there is none
 
 sub alttag {
@@ -121,7 +141,7 @@ sub alttag {
     $alttag=~s/\s+$//gs;
     $alttag=~s/^\s+//gs;
     if ($alttag) { return $alttag; } else 
-                 { return 'No information available'; }
+                 { return &mt('No information available'); }
 }
 
 # -------------------------------------------------------------- Author display
@@ -130,7 +150,7 @@ sub authordisplay {
     my ($aname,$adom)=@_;
     return &Apache::loncommon::aboutmewrapper(
                 &Apache::loncommon::plainname($aname,$adom),
-                    $aname,$adom).' <tt>['.$aname.'@'.$adom.']</tt>';
+                    $aname,$adom,'preview').' <tt>['.$aname.'@'.$adom.']</tt>';
 }
 
 # -------------------------------------------------------------- Pretty display
@@ -175,6 +195,207 @@ sub diffgraph {
     return $output;
 }
 
+# ==================================================== Turn MySQL row into hash
+
+sub metadata_col_to_hash {
+    my @cols=@_;
+    my %hash=();
+    for (my $i=0; $i<=$#columns; $i++) {
+	$hash{$columns[$i]}=$cols[$i];
+    }
+    return %hash;
+}
+
+# ============================================================= The field names
+
+sub fieldnames {
+    return &Apache::lonlocal::texthash(
+				   'title' => 'Title',
+				   'author' =>'Author(s)',
+				   'subject' => 'Subject',
+				   'keywords' => 'Keyword(s)',
+				   'notes' => 'Notes',
+				   'abstract' => 'Abstract',
+                                   'lowestgradelevel' => 'Lowest Grade Level',
+                                   'highestgradelevel' => 'Highest Grade Level',
+                                   'standards' => 'Standards',
+				   'mime' => 'MIME Type',
+				   'language' => 'Language',
+				   'creationdate' => 'Creation Date',
+				   'lastrevisiondate' => 'Last Revision Date',
+				   'owner' => 'Publisher/Owner',
+                                   'copyright' => 'Copyright/Distribution',
+				   'customdistributionfile' => 'Custom Distribution File',
+                                   'obsolete' => 'Obsolete',
+				   'obsoletereplacement' => 'Suggested Replacement for Obsolete File',
+				   'count'      => 'Network-wide number of accesses (hits)',
+				   'course'     => 'Network-wide number of courses using resource',
+				   'course_list' => 'Network-wide courses using resource',
+				   'sequsage'      => 'Number of resources using or importing resource',
+				   'sequsage_list' => 'Resources using or importing resource',
+				   'goto'       => 'Number of resources that follow this resource in maps',
+				   'goto_list'  => 'Resources that follow this resource in maps',
+				   'comefrom'   => 'Number of resources that lead up to this resource in maps',
+				   'comefrom_list' => 'Resources that lead up to this resource in maps',
+				   'clear'      => 'Material presented in clear way',
+				   'depth'      => 'Material covered with sufficient depth',
+				   'helpful'    => 'Material is helpful',
+				   'correct'    => 'Material appears to be correct',
+				   'technical'  => 'Resource is technically correct', 
+				   'avetries'   => 'Average number of tries till solved',
+				   'stdno'      => 'Total number of students who have worked on this problem',
+				   'difficulty' => 'Degree of difficulty'
+				       );
+}
+
+# =========================================== Pretty printing of metadata field
+
+sub prettyprint {
+    my ($type,$value)=@_;
+    unless (defined($value)) { return '&nbsp;'; }
+# Title
+    if ($type eq 'title') {
+	return '<font size="+1" face="arial">'.$value.'</font>';
+    }
+# Dates
+    if (($type eq 'creationdate') ||
+	($type eq 'lastrevisiondate')) {
+	return &Apache::lonlocal::locallocaltime(
+			  &Apache::lonmysql::unsqltime($value));
+    }
+# Language
+    if ($type eq 'language') {
+	return &Apache::loncommon::languagedescription($value);
+    }
+# Copyright
+    if ($type eq 'copyright') {
+	return &Apache::loncommon::copyrightdescription($value);
+    }
+# MIME
+    if ($type eq 'mime') {
+       return '<img src="'.&Apache::loncommon::icon($value).'" />&nbsp;'.
+	   &Apache::loncommon::filedescription($value);
+   }
+# Person
+    if (($type eq 'author') || 
+	($type eq 'owner') ||
+	($type eq 'modifyinguser') ||
+	($type eq 'authorspace')) {
+	$value=~s/(\w+)(\:|\@)(\w+)/&authordisplay($1,$3)/gse;
+	return $value;
+    }
+# Gradelevel
+    if (($type eq 'lowestgradelevel') ||
+	($type eq 'highestgradelevel')) {
+	return &Apache::loncommon::gradeleveldescription($value);
+    }
+# Only for advance users below
+    unless ($ENV{'user.adv'}) { return '<i>- '.&mt('not displayed').' -</i>' };
+# File
+    if (($type eq 'customdistributionfile') ||
+	($type eq 'obsoletereplacement') ||
+	($type eq 'goto_list') ||
+	($type eq 'comefrom_list') ||
+	($type eq 'sequsage_list')) {
+	return join('<br />',map {
+	       &Apache::lonnet::gettitle($_).' ['.
+	       &Apache::lonhtmlcommon::crumbs(&Apache::lonnet::clutter($_),'preview').']';
+	    } split(/\s*\,\s*/,$value));
+    }
+# Evaluations
+    if (($type eq 'clear') ||
+	($type eq 'depth') ||
+	($type eq 'helpful') ||
+	($type eq 'correct') ||
+	($type eq 'technical')) {
+	return &evalgraph($value);
+    }
+# Difficulty
+    if ($type eq 'difficulty') {
+	return &diffgraph($value);
+    }
+# List of courses
+    if ($type=~/\_list/) {
+	return join('<br />',map {
+	    my %courseinfo=&Apache::lonnet::coursedescription($_);  
+	    '<a href="/public/'.
+		$courseinfo{'domain'}.'/'.$courseinfo{'num'}.'/syllabus" target="preview">'.
+		$courseinfo{'description'}.'</a>';
+	} split(/\s*\,\s*/,$value));
+    }
+# No pretty print found
+    return $value;
+}
+# ============================================== Pretty input of metadata field
+
+sub selectbox {
+    my ($name,$value,$functionref,@idlist)=@_;
+    my $selout='<select name="'.$name.'">';
+    foreach (@idlist) {
+        $selout.='<option value=\''.$_.'\'';
+        if ($_ eq $value) {
+	    $selout.=' selected>'.&{$functionref}($_).'</option>';
+	}
+        else {$selout.='>'.&{$functionref}($_).'</option>';}
+    }
+    return $selout.'</select>';
+}
+
+
+sub prettyinput {
+    my ($type,$value,$fieldname,$formname)=@_;
+# Language
+    if ($type eq 'language') {
+	return &selectbox($fieldname,
+			  $value,
+			  \&Apache::loncommon::languagedescription,
+			  (&Apache::loncommon::languageids));
+    }
+# Copyright
+    if ($type eq 'copyright') {
+	return &selectbox($fieldname,
+			  $value,
+			  \&Apache::loncommon::copyrightdescription,
+			  (&Apache::loncommon::copyrightids));
+    }
+# Gradelevels
+    if (($type eq 'lowestgradelevel') ||
+	($type eq 'highestgradelevel')) {
+	return &Apache::loncommon::select_level_form($value,$fieldname);
+    }
+# Obsolete
+    if ($type eq 'obsolete') {
+	return '<input type="checkbox" name="'.$fieldname.'"'.
+	    ($value?' checked="1"':'').' />'; 
+    }
+# Obsolete replacement file
+    if ($type eq 'obsoletereplacement') {
+	return '<input type="text" name="'.$fieldname.
+	    '" size="60" value="'.$value.'" /><a href="javascript:openbrowser'.
+	    "('".$formname."','".$fieldname."'".
+	    ",'')\">".&mt('Select').'</a>'; 
+   }
+# Customdistribution file
+    if ($type eq 'customdistributionfile') {
+	return '<input type="text" name="'.$fieldname.
+	    '" size="60" value="'.$value.'" /><a href="javascript:openbrowser'.
+	    "('".$formname."','".$fieldname."'".
+	    ",'rights')\">".&mt('Select').'</a>'; 
+    }
+# Dates
+    if (($type eq 'creationdate') ||
+	($type eq 'lastrevisiondate')) {
+	return &Apache::lonhtmlcommon::date_setter($formname,
+						   $fieldname,$value);
+    }
+# No pretty input found
+    $value=~s/^\s+//gs;
+    $value=~s/\s+$//gs;
+    $value=~s/\s+/ /gs;
+    $value=~s/\"/\&quod\;/gs;
+    return '<input type="text" name="'.$fieldname.'" size="80" value="'.$value.'" />'; 
+}
+
 # ================================================================ Main Handler
 
 sub handler {
@@ -209,66 +430,56 @@ sub handler {
   foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) {
       $content{$_}=&Apache::lonnet::metadata($uri,$_);
   }
-# ------------------------------------------------------------------ Hide stuff
-
-  unless ($ENV{'user.adv'}) {
-      foreach ('keywords','notes','abstract','subject') {
-          $content{$_}='<i>- '.&mt('not displayed').' -</i>';
-      }
-  }
-
 # --------------------------------------------------------------- Render Output
-  my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);
-my $creationdate=&Apache::lonlocal::locallocaltime(
- &Apache::loncommon::unsqltime($content{'creationdate'}));
-my $lastrevisiondate=&Apache::lonlocal::locallocaltime(
- &Apache::loncommon::unsqltime($content{'lastrevisiondate'}));
-my $language=&Apache::loncommon::languagedescription($content{'language'});
-my $mime=&Apache::loncommon::filedescription($content{'mime'}); 
-my $disuri=&Apache::lonnet::declutter($uri);
-  $disuri=~s/\.meta$//;
-my $currentversion=&Apache::lonnet::getversion($disuri);
-my $author=$content{'author'};
-$author=~s/(\w+)(\:|\@)(\w+)/&authordisplay($1,$3)/gse;
-my $owner=$content{'owner'};
-$owner=~s/(\w+)(\:|\@)(\w+)/&authordisplay($1,$3)/gse;
-my $versiondisplay='';
-if ($thisversion) {
-    $versiondisplay=&mt('Version').': '.$thisversion.
-    ' ('.&mt('most recent version').': '.$currentversion.')';
-} else {
-    $versiondisplay='Version: '.$currentversion;
-}
-my $customdistributionfile='';
-if ($content{'customdistributionfile'}) {
-   $customdistributionfile='<a href="'.$content{'customdistributionfile'}.
-     '"><tt>'.$content{'customdistributionfile'}.'</tt></a>';
-}
-
-my $obsolete=$content{'obsolete'};
-my $obsoletereplace=$content{'obsoletereplacement'};
-my $obsoletewarning='';
-if (($obsolete) && ($ENV{'user.adv'})) {
-    $obsoletewarning='<p><font color="red">'.&mt('This resource has been marked obsolete by the author(s)').'</font></p>';
-}
-
-my %lt=&Apache::lonlocal::texthash(
-				   'au' =>'Author(s)',
-				   'sb' => 'Subject',
-				   'kw' => 'Keyword(s)',
-				   'no' => 'Notes',
-				   'ab' => 'Abstract',
-				   'mi' => 'MIME Type',
-				   'la' => 'Language',
-				   'cd' => 'Creation Date',
-				   'pu' => 'Publisher/Owner',
-                                   'co' => 'Copyright/Distribution',
-				   'cf' => 'Custom Distribution File',
-                                   'ob' => 'Obsolete',
-                                   'or' => 
-                                    'Suggested Replacement for Obsolete File');
-my $bodytag=&Apache::loncommon::bodytag
+# displayed url
+    my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);
+    $uri=~s/\.meta$//;
+    my $disuri=&Apache::lonnet::clutter($uri);
+# version
+    my $currentversion=&Apache::lonnet::getversion($disuri);
+    my $versiondisplay='';
+    if ($thisversion) {
+	$versiondisplay=&mt('Version').': '.$thisversion.
+	    ' ('.&mt('most recent version').': '.
+	    ($currentversion>0?$currentversion:&mt('information not available')).')';
+    } else {
+	$versiondisplay='Version: '.$currentversion;
+    }
+# crumbify displayed URL
+    $disuri=&Apache::lonhtmlcommon::crumbs($disuri);
+# obsolete
+    my $obsolete=$content{'obsolete'};
+    my $obsoletewarning='';
+    if (($obsolete) && ($ENV{'user.adv'})) {
+	$obsoletewarning='<p><font color="red">'.
+	    &mt('This resource has been marked obsolete by the author(s)').'</font></p>';
+    }
+
+    my %lt=&fieldnames();
+    my $table='';
+    my $bodytag=&Apache::loncommon::bodytag
             ('Catalog Information','','','',$resdomain);
+    foreach ('title', 
+	     'author', 
+	     'subject', 
+	     'keywords', 
+	     'notes', 
+	     'abstract', 
+	     'mime', 
+	     'language', 
+	     'creationdate', 
+	     'lastrevisiondate', 
+	     'owner', 
+	     'copyright', 
+	     'customdistributionfile', 
+	     'obsolete', 
+	     'obsoletereplacement') {
+	$table.='<tr><td bgcolor="#AAAAAA">'.$lt{$_}.
+	        '</td><td bgcolor="#CCCCCC">'.
+                &prettyprint($_,$content{$_}).'</td></tr>';
+	delete $content{$_};
+    }
+
   $r->print(<<ENDHEAD);
 <html><head><title>Catalog Information</title></head>
 $bodytag
@@ -277,163 +488,77 @@ $bodytag
 $obsoletewarning
 $versiondisplay<br />
 <table cellspacing=2 border=0>
-<tr><td bgcolor='#AAAAAA'>$lt{'au'}</td>
-<td bgcolor="#CCCCCC">$author&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>$lt{'sb'}</td>
-<td bgcolor="#CCCCCC">$content{'subject'}&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>$lt{'kw'}</td>
-<td bgcolor="#CCCCCC">$content{'keywords'}&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>$lt{'no'}</td>
-<td bgcolor="#CCCCCC">$content{'notes'}&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>$lt{'ab'}</td>
-<td bgcolor="#CCCCCC">$content{'abstract'}&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>$lt{'mi'}</td>
-<td bgcolor="#CCCCCC">$mime ($content{'mime'})&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>$lt{'la'}</td>
-<td bgcolor="#CCCCCC">$language&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>$lt{'cd'}</td>
-<td bgcolor="#CCCCCC">$creationdate&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>
-Last Revision Date</td><td bgcolor="#CCCCCC">$lastrevisiondate&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>$lt{'pu'}</td>
-<td bgcolor="#CCCCCC">$owner&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>$lt{'co'}</td>
-<td bgcolor="#CCCCCC">$content{'copyright'}&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>$lt{'cf'}</td>
-<td bgcolor="#CCCCCC">$customdistributionfile&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>$lt{'ob'}</td>
-<td bgcolor="#CCCCCC">$obsolete&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>$lt{'or'}</td>
-<td bgcolor="#CCCCCC">$obsoletereplace&nbsp;</td></tr>
+$table
 </table>
 ENDHEAD
-  delete($content{'title'});
-  delete($content{'author'});
-  delete($content{'subject'});
-  delete($content{'keywords'});
-  delete($content{'notes'});
-  delete($content{'abstract'});
-  delete($content{'mime'});
-  delete($content{'language'});
-  delete($content{'creationdate'});
-  delete($content{'lastrevisiondate'});
-  delete($content{'owner'});
-  delete($content{'copyright'});
-  delete($content{'customdistributionfile'});
-  delete($content{'obsolete'});
-  delete($content{'obsoletereplacement'});
   if ($ENV{'user.adv'}) {
 # ------------------------------------------------------------ Dynamic Metadata
-   $r->print(
-   '<h3>'.&mt('Dynamic Metadata').' ('.
-	     &mt('updated periodically').')</h3>'.&mt('Processing').
-	     ' ...<br>');
-   $r->rflush();
-    my %items=&Apache::lonlocal::texthash(
- 'count'      => 'Network-wide number of accesses (hits)',
- 'course'     => 'Network-wide number of courses using resource',
- 'usage'      => 'Number of resources using or importing resource',
- 'goto'       => 'Number of resources that follow this resource in maps',
- 'comefrom'   => 'Number of resources that lead up to this resource in maps',
- 'clear'      => 'Material presented in clear way',
- 'depth'      => 'Material covered with sufficient depth',
- 'helpful'    => 'Material is helpful',
- 'correct'    => 'Material appears to be correct',
- 'technical'  => 'Resource is technically correct', 
- 'avetries'   => 'Average number of tries till solved',
- 'stdno'      => 'Total number of students who have worked on this problem',
- 'difficulty' => 'Degree of difficulty');
-   my %dynmeta=&dynamicmeta($uri);
-   $r->print(
-'</table><h4>'.&mt('Access and Usage Statistics').'</h4><table cellspacing=2 border=0>');
-   foreach ('count') {
-       $r->print(
-'<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.
-$dynmeta{$_}."&nbsp;</td></tr>\n");
-   }
-   foreach my $cat ('usage','comefrom','goto') {
-       $r->print(
-'<tr><td bgcolor="#AAAAAA">'.$items{$cat}.'</td><td bgcolor="#CCCCCC">'.
-$dynmeta{$cat}.'<font size="-1"><ul>'.join("\n",
-      map { my $murl=$_; 
- '<li><a href="'.&Apache::lonnet::clutter($murl).'" target="preview">'.
-                        &Apache::lonnet::gettitle($murl).' [<tt>'.$murl
-                        .'</tt>]</a></li>' }
-      split(/\,/,$dynmeta{$cat.'_list'}))."</ul></font></td></tr>\n");
-   }
-   foreach my $cat ('course') {
-       $r->print(
-'<tr><td bgcolor="#AAAAAA">'.$items{$cat}.'</td><td bgcolor="#CCCCCC">'.
-$dynmeta{$cat}.'<font size="-1"><ul>'.join("\n",
-      map { my %courseinfo=&Apache::lonnet::coursedescription($_);  
- '<li><a href="/public/'.
-  $courseinfo{'domain'}.'/'.$courseinfo{'num'}.'/syllabus" target="preview">'.
-  $courseinfo{'description'}.'</a></li>' }
-      split(/\,/,$dynmeta{$cat.'_list'}))."</ul></font></td></tr>\n");
-   }
-       $r->print('</table>');
-   if ($uri=~/\.(problem|exam|quiz|assess|survey|form)\.meta$/) {
       $r->print(
-'<h4>'.&mt('Assessment Statistical Data').'</h4><table cellspacing=2 border=0>');
-      foreach ('stdno','avetries') {
-          $r->print(
-'<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.
-$dynmeta{$_}."&nbsp;</td></tr>\n");
+		'<h3>'.&mt('Dynamic Metadata').' ('.
+		&mt('updated periodically').')</h3>'.&mt('Processing').
+		' ...<br />');
+      $r->rflush();
+      my %items=&fieldnames();
+      my %dynmeta=&dynamicmeta($uri);
+# General Access and Usage Statistics
+      $r->print('<h4>'.&mt('Access and Usage Statistics').'</h4><table cellspacing=2 border=0>');
+      foreach ('count',
+	       'sequsage','sequsage_list',
+	       'comefrom','comefrom_list',
+	       'goto','goto_list',
+	       'course','course_list') {
+	  $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{$_}.'</td><td bgcolor="#CCCCCC">'.
+		    &prettyprint($dynmeta{$_})."</td></tr>\n");
       }
-      foreach ('difficulty') {
-         $r->print(
-'<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.
-&diffgraph($dynmeta{$_})."</td></tr>\n");
+      $r->print('</table>');
+      if ($uri=~/\.(problem|exam|quiz|assess|survey|form)\.meta$/) {
+# This is an assessment, print assessment data
+	  $r->print(
+		    '<h4>'.&mt('Assessment Statistical Data').'</h4><table cellspacing=2 border=0>');
+	  foreach ('stdno','avetries','difficulty') {
+	      $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{$_}.'</td><td bgcolor="#CCCCCC">'.
+			&prettyprint($dynmeta{$_})."</td></tr>\n");
+	  }
+	  $r->print('</table>');    
+      }
+      $r->print('<h4>'.&mt('Evaluation Data').'</h4><table cellspacing=2 border=0>');
+      foreach ('clear','depth','helpful','correct','technical') {
+	  $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{$_}.'</td><td bgcolor="#CCCCCC">'.
+		    &prettyprint($dynmeta{$_})."</td></tr>\n");
+     }    
+      $r->print('</table>');
+      $uri=~/^\/res\/(\w+)\/(\w+)\//; 
+      if ((($ENV{'user.domain'} eq $1) && ($ENV{'user.name'} eq $2))
+	  || ($ENV{'user.role.ca./'.$1.'/'.$2})) {
+	  $r->print('<h4>'.&mt('Evaluation Comments').' ('.
+		    &mt('visible to author and co-authors only').')</h4>'.
+		    '<blockquote>'.$dynmeta{'comments'}.'</blockquote>');
+	  $r->print('<a name="bombs" /><h4>'.&mt('Error Messages').' ('.
+		    &mt('visible to author and co-authors only').')</h4>'.
+		    &Apache::lonmsg::retrieve_author_res_msg($uri));
       }
-      $r->print('</table>');    
-   }
-   $r->print('<h4>'.&mt('Evaluation Data').'</h4><table cellspacing=2 border=0>');
-   foreach ('clear','depth','helpful','correct','technical') {
-       $r->print(
-'<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.
-&evalgraph($dynmeta{$_})."</td></tr>\n");
-   }    
-   $r->print('</table>');
-   $disuri=~/^(\w+)\/(\w+)\//;   
-   if ((($ENV{'user.domain'} eq $1) && ($ENV{'user.name'} eq $2))
-       || ($ENV{'user.role.ca./'.$1.'/'.$2})) {
-      $r->print(
-  '<h4>'.&mt('Evaluation Comments').' ('.&mt('visible to author and co-authors only').')</h4>'.
-      '<blockquote>'.$dynmeta{'comments'}.'</blockquote>');
-      $r->print(
-   '<h4>'.&mt('Error Messages').' ('.
-          &mt('visible to author and co-authors only').')</h4>');
-      my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$1,$2);
-      foreach (keys %errormsgs) {
-	if ($_=~/^\Q$disuri\E\_\d+$/) {
-          my %content=&Apache::lonmsg::unpackagemsg($errormsgs{$_});
-	  $r->print('<b>'.$content{'time'}.'</b>: '.$content{'message'}.
-                    '<br />');
-        }
-      }      
-   }
 # ------------------------------------------------------------- All other stuff
-   $r->print(
- '<h3>'.&mt('Additional Metadata (non-standard, parameters, exports)').'</h3>');
-   foreach (sort keys %content) {
-      my $name=$_;
-      unless ($name=~/\.display$/) {
-	  my $display=&Apache::lonnet::metadata($uri,$name.'.display');
-	  unless ($display) { $display=$name; };
-	  my $otherinfo='';
-	  foreach ('name','part','type','default') {
-	      if (defined(&Apache::lonnet::metadata($uri,$name.'.'.$_))) {
-		  $otherinfo.=' '.$_.'='.
-		      &Apache::lonnet::metadata($uri,$name.'.'.$_).'; ';
+      $r->print(
+		'<h3>'.&mt('Additional Metadata (non-standard, parameters, exports)').'</h3>');
+      foreach (sort keys %content) {
+	  my $name=$_;
+	  unless ($name=~/\.display$/) {
+	      my $display=&Apache::lonnet::metadata($uri,$name.'.display');
+	      unless ($display) { $display=$name; };
+	      my $otherinfo='';
+	      foreach ('name','part','type','default') {
+		  if (defined(&Apache::lonnet::metadata($uri,$name.'.'.$_))) {
+		      $otherinfo.=' '.$_.'='.
+			  &Apache::lonnet::metadata($uri,$name.'.'.$_).'; ';
+		  }
 	      }
+	      $r->print('<b>'.$display.':</b> '.$content{$name});
+	      if ($otherinfo) {
+		  $r->print(' ('.$otherinfo.')');
+	      }
+	      $r->print("<br />\n");
 	  }
-	  $r->print('<b>'.$display.':</b> '.$content{$name});
-	  if ($otherinfo) {
-	      $r->print(' ('.$otherinfo.')');
-	  }
-	  $r->print("<br>\n");
       }
-   }
   }
 # ===================================================== End Resource Space Call
  } else {
@@ -441,89 +566,116 @@ $dynmeta{$_}."&nbsp;</td></tr>\n");
 
 # ----------------------------------------------------------- Set document type
 
-  $r->content_type('text/html');
+  &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;
 
   return OK if $r->header_only;
 # ---------------------------------------------------------------------- Header
-  my $bodytag=&Apache::loncommon::bodytag('Edit Catalog Information');
   my $disuri=$uri;
   my $fn=&Apache::lonnet::filelocation('',$uri);
-  $disuri=~s/^\/\~\w+//;
+  $disuri=~s/^\/\~/\/priv\//;
   $disuri=~s/\.meta$//;
-  my $displayfile='Catalog Information for '.$disuri;
-  if ($disuri=~/\/default$/) {
-      my $dir=$disuri;
-      $dir=~s/default$//;
-      $displayfile=&mt('Default Cataloging Information for Directory').' '.
-	  $dir;
-  }
-  %Apache::lonpublisher::metadatafields=();
-  %Apache::lonpublisher::metadatakeys=();
-  &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile($fn));
-  $r->print(<<ENDEDIT);
+  my $target=$uri;
+  $target=~s/^\/\~/\/res\/$ENV{'request.role.domain'}\//;
+  $target=~s/\.meta$//;
+  my $bombs=&Apache::lonmsg::retrieve_author_res_msg($target);
+  if ($bombs) {
+      if ($ENV{'form.delmsg'}) {
+	  if (&Apache::lonmsg::del_url_author_res_msg($target) eq 'ok') {
+	      $bombs=&mt('Messages deleted.');
+	  } else {
+	      $bombs=&mt('Error deleting messages');
+	  }
+      }
+      my $bodytag=&Apache::loncommon::bodytag('Error Messages');
+      my $del=&mt('Delete Messages');
+      $r->print(<<ENDBOMBS);
+<html><head><title>Edit Catalog Information</title></head>
+$bodytag
+<h1>$disuri</h1>
+<form method="post" name="defaultmeta">
+<input type="submit" name="delmsg" value="$del" />
+<br />$bombs
+</form>
+</body>
+</html>
+ENDBOMBS
+  } else {
+      my $displayfile='Catalog Information for '.$disuri;
+      if ($disuri=~/\/default$/) {
+	  my $dir=$disuri;
+	  $dir=~s/default$//;
+	  $displayfile=&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">
+<form method="post" name="defaultmeta">
 ENDEDIT
-   foreach ('author','title','subject','keywords','abstract','notes',
-            'copyright','customdistributionfile','language',
-            'obsolete','obsoletereplacement') {
-       if ($ENV{'form.new_'.$_}) {
-	   $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_};
-       }
-       if (m/copyright/) {
-	   $r->print(&Apache::lonpublisher::selectbox($_,'new_'.$_,
-			       $Apache::lonpublisher::metadatafields{$_},
-			       \&Apache::loncommon::copyrightdescription,
-			       (&Apache::loncommon::copyrightids)));
-       } elsif (m/language/) {
-	   $r->print(&Apache::lonpublisher::selectbox($_,'new_'.$_,
-			      $Apache::lonpublisher::metadatafields{$_},
-			      \&Apache::loncommon::languagedescription,
-			      (&Apache::loncommon::languageids)));
-       } else {
-	   $r->print(&Apache::lonpublisher::textfield($_,'new_'.$_,
-			     $Apache::lonpublisher::metadatafields{$_}));
-       }
-   }
-   if ($ENV{'form.store'}) {
-      my $mfh;
-      unless ($mfh=Apache::File->new('>'.$fn)) {
-            $r->print(
-            '<p><font color=red>'.&mt('Could not write metadata').', '.
-		      &mt('FAIL').'</font>');
-      } else {
-          foreach (sort keys %Apache::lonpublisher::metadatafields) {
-            unless ($_=~/\./) {
-                my $unikey=$_;
-                $unikey=~/^([A-Za-z]+)/;
-                my $tag=$1;
-                $tag=~tr/A-Z/a-z/;
-                print $mfh "\n\<$tag";
-                foreach 
-                  (split(/\,/,$Apache::lonpublisher::metadatakeys{$unikey})) {
-                    my $value=
-                       $Apache::lonpublisher::metadatafields{$unikey.'.'.$_};
-                    $value=~s/\"/\'\'/g;
-                    print $mfh ' '.$_.'="'.$value.'"';
-                }
-                print $mfh '>'.
-        &HTML::Entities::encode($Apache::lonpublisher::metadatafields{$unikey})
-                        .'</'.$tag.'>';
-            }
+      $r->print('<script language="JavaScript">'.
+		&Apache::loncommon::browser_and_searcher_javascript.
+		'</script>');
+      my %lt=&fieldnames();
+      foreach ('author','title','subject','keywords','abstract','notes',
+	       'copyright','customdistributionfile','language','standards',
+	       'lowestgradelevel','highestgradelevel',
+	       'obsolete','obsoletereplacement') {
+	  $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_};
+	  unless ($Apache::lonpublisher::metadatafields{'copyright'}) {
+	      $Apache::lonpublisher::metadatafields{'copyright'}='default';
 	  }
-          $r->print('<p>'.&mt('Wrote Metadata'));
+	  $r->print('<p>'.$lt{$_}.': '.&prettyinput($_,
+						    $Apache::lonpublisher::metadatafields{$_},
+						    'new_'.$_,'defaultmeta').'</p>');
       }
-    }
-    $r->print(
- '<br /><input type="submit" name="store" value="'.
-&mt('Store Catalog Information').'"></form></body></html>');
-    return OK;
+      if ($ENV{'form.store'}) {
+	  my $mfh;
+	  unless ($mfh=Apache::File->new('>'.$fn)) {
+	      $r->print(
+			'<p><font color=red>'.&mt('Could not write metadata').', '.
+			&mt('FAIL').'</font>');
+	  } else {
+	      foreach (sort keys %Apache::lonpublisher::metadatafields) {
+		  unless ($_=~/\./) {
+		      my $unikey=$_;
+		      $unikey=~/^([A-Za-z]+)/;
+		      my $tag=$1;
+		      $tag=~tr/A-Z/a-z/;
+		      print $mfh "\n\<$tag";
+		      foreach 
+			  (split(/\,/,$Apache::lonpublisher::metadatakeys{$unikey})) {
+			      my $value=
+				  $Apache::lonpublisher::metadatafields{$unikey.'.'.$_};
+			      $value=~s/\"/\'\'/g;
+			      print $mfh ' '.$_.'="'.$value.'"';
+			  }
+		      print $mfh '>'.
+			  &HTML::Entities::encode($Apache::lonpublisher::metadatafields{$unikey})
+			  .'</'.$tag.'>';
+		  }
+	      }
+	      $r->print('<p>'.&mt('Wrote Metadata'));
+	  }
+      }
+      $r->print(
+		'<br /><input type="submit" name="store" value="'.
+		&mt('Store Catalog Information').'"></form></body></html>');
   }
+    return OK;
+ }
 }
 
+# ================================================================= BEGIN Block
+BEGIN {
+# Get columns of MySQL metadata table
+    @columns=&Apache::lonmysql::col_order('metadata');
+}
 1;
 __END__