--- loncom/interface/lonmeta.pm	2003/12/29 17:11:53	1.46
+++ loncom/interface/lonmeta.pm	2003/12/30 14:57:49	1.49
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.46 2003/12/29 17:11:53 www Exp $
+# $Id: lonmeta.pm,v 1.49 2003/12/30 14:57:49 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
 
@@ -108,6 +109,9 @@ sub dynamicmeta {
     #
     # 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;
 }
@@ -117,7 +121,7 @@ sub access_count {
     my %countdata=&Apache::lonnet::dump('nohist_accesscount',$adomain,
                                         $author,$src);
     if (! exists($countdata{$src})) {
-        return 'Not Available';
+        return &mt('Not Available');
     } else {
         return $countdata{$src};
     }
@@ -137,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
@@ -226,9 +230,13 @@ sub fieldnames {
 				   'obsoletereplacement' => 'Suggested Replacement for Obsolete File',
 				   'count'      => 'Network-wide number of accesses (hits)',
 				   'course'     => 'Network-wide number of courses using resource',
-				   'usage'      => 'Number of resources using or importing 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',
@@ -276,6 +284,13 @@ sub prettyprint {
 	$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') ||
@@ -313,8 +328,72 @@ sub prettyprint {
 }
 # ============================================== 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)=@_;
+    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
@@ -351,14 +430,6 @@ 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
 # displayed url
     my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);
@@ -370,7 +441,8 @@ sub handler {
     my $versiondisplay='';
     if ($thisversion) {
 	$versiondisplay=&mt('Version').': '.$thisversion.
-	    ' ('.&mt('most recent version').': '.$currentversion.')';
+	    ' ('.&mt('most recent version').': '.
+	    ($currentversion>0?$currentversion:&mt('information not available')).')';
     } else {
 	$versiondisplay='Version: '.$currentversion;
     }
@@ -420,103 +492,73 @@ $table
 ENDHEAD
   if ($ENV{'user.adv'}) {
 # ------------------------------------------------------------ Dynamic Metadata
-   $r->print(
-   '<h3>'.&mt('Dynamic Metadata').' ('.
-	     &mt('updated periodically').')</h3>'.&mt('Processing').
-	     ' ...<br>');
-   $r->rflush();
-   my %items=&fieldnames();
-   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>');
+      $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>'.
+		    &Apache::lonmsg::retrieve_author_res_msg($2,$1,$disuri));
       }
-      $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 {
@@ -548,30 +590,23 @@ $dynmeta{$_}."&nbsp;</td></tr>\n");
 <html><head><title>Edit Catalog Information</title></head>
 $bodytag
 <h1>$displayfile</h1>
-<form method="post">
+<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',
+            'copyright','customdistributionfile','language','standards',
+	    'lowestgradelevel','highestgradelevel',
             'obsolete','obsoletereplacement') {
-       if ($ENV{'form.new_'.$_}) {
-	   $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_};
-       }
-       if (m/copyright/) {
-	   $r->print(&Apache::lonpublisher::selectbox($lt{$_},'new_'.$_,
-			       ($Apache::lonpublisher::metadatafields{$_}?
-				$Apache::lonpublisher::metadatafields{$_}:'default'),
-			       \&Apache::loncommon::copyrightdescription,
-			       (&Apache::loncommon::copyrightids)));
-       } elsif (m/language/) {
-	   $r->print(&Apache::lonpublisher::selectbox($lt{$_},'new_'.$_,
-			      $Apache::lonpublisher::metadatafields{$_},
-			      \&Apache::loncommon::languagedescription,
-			      (&Apache::loncommon::languageids)));
-       } else {
-	   $r->print(&Apache::lonpublisher::textfield($lt{$_},'new_'.$_,
-			     $Apache::lonpublisher::metadatafields{$_}));
+       $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;