--- loncom/interface/lonmeta.pm	2003/12/29 21:17:00	1.48
+++ loncom/interface/lonmeta.pm	2003/12/31 15:34:32	1.53
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.48 2003/12/29 21:17:00 www Exp $
+# $Id: lonmeta.pm,v 1.53 2003/12/31 15:34:32 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,7 @@ use Apache::lonmsg;
 use Apache::lonpublisher;
 use Apache::lonlocal;
 use Apache::lonmysql;
+use Apache::lonmsg;
 
 # MySQL table columns
 
@@ -297,8 +298,9 @@ sub prettyprint {
 	($type eq 'comefrom_list') ||
 	($type eq 'sequsage_list')) {
 	return join('<br />',map {
-	       &Apache::lonnet::gettitle($_).' ['.
-	       &Apache::lonhtmlcommon::crumbs(&Apache::lonnet::clutter($_),'preview').']';
+	       my $url=&Apache::lonnet::clutter($_);
+	       '<br /><b>'.&Apache::lonnet::gettitle($url).'</b>'.
+	       &Apache::lonhtmlcommon::crumbs($url,'preview','');
 	    } split(/\s*\,\s*/,$value));
     }
 # Evaluations
@@ -432,9 +434,8 @@ sub handler {
 # --------------------------------------------------------------- Render Output
 # displayed url
     my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);
+    $uri=~s/\.meta$//;
     my $disuri=&Apache::lonnet::clutter($uri);
-    $disuri=~s/\.meta$//;
-    $disuri=&Apache::lonhtmlcommon::crumbs($disuri);
 # version
     my $currentversion=&Apache::lonnet::getversion($disuri);
     my $versiondisplay='';
@@ -445,6 +446,8 @@ sub handler {
     } else {
 	$versiondisplay='Version: '.$currentversion;
     }
+# crumbify displayed URL
+    $disuri=&Apache::lonhtmlcommon::crumbs($disuri);
 # obsolete
     my $obsolete=$content{'obsolete'};
     my $obsoletewarning='';
@@ -462,7 +465,10 @@ sub handler {
 	     'subject', 
 	     'keywords', 
 	     'notes', 
-	     'abstract', 
+	     'abstract',
+	     'lowestgradelevel',
+	     'highestgradelevel',
+	     'standards', 
 	     'mime', 
 	     'language', 
 	     'creationdate', 
@@ -525,22 +531,15 @@ ENDHEAD
 		    &prettyprint($dynmeta{$_})."</td></tr>\n");
      }    
       $r->print('</table>');
-      $disuri=~/^(\w+)\/(\w+)\//;   
+      $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>'.
+	  $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 />');
-	      }
-	  }      
+	  $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));
       }
 # ------------------------------------------------------------- All other stuff
       $r->print(
@@ -576,77 +575,104 @@ ENDHEAD
 
   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" name="defaultmeta">
 ENDEDIT
-  $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>'.$lt{$_}.': '.&prettyinput($_,
-				  $Apache::lonpublisher::metadatafields{$_},
-				  'new_'.$_,'defaultmeta').'</p>');
-   }
-   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