--- loncom/interface/lonmeta.pm	2002/10/25 13:50:48	1.24
+++ loncom/interface/lonmeta.pm	2003/12/29 17:11:53	1.46
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.24 2002/10/25 13:50:48 www Exp $
+# $Id: lonmeta.pm,v 1.46 2003/12/29 17:11:53 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,8 +32,15 @@ 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;
+
+# MySQL table columns
+
+my @columns;
 
 # ----------------------------------------- Fetch and evaluate dynamic metadata
 
@@ -51,10 +53,13 @@ sub dynamicmeta {
     $regexp='___'.$regexp.'___';
     my %evaldata=&Apache::lonnet::dump('nohist_resevaldata',$adomain,
 				       $aauthor,$regexp);
-    my %sum;
-    my %cnt;
-    my %listitems=('count'        => 'add',
+    my %sum=();
+    my %cnt=();
+    my %concat=();
+    my %listitems=(
                    'course'       => 'add',
+                   'goto'         => 'add',
+                   'comefrom'     => 'add',
                    'avetries'     => 'avg',
                    'stdno'        => 'add',
                    'difficulty'   => 'avg',
@@ -66,27 +71,30 @@ sub dynamicmeta {
                    'comments'     => 'app',
                    'usage'        => 'cnt'
                    );
-    foreach (keys %evaldata) {
-	$_=~/___(\w+)$/;
-        if (defined($cnt{$1})) { $cnt{$1}++; } else { $cnt{$1}=1; }
-        unless ($listitems{$1} eq 'app') {
-            if (defined($sum{$1})) {
-               $sum{$1}+=$evaldata{$_};
+    while ($_=each(%evaldata)) {
+	my ($item,$purl,$cat)=split(/___/,$_);
+	### Apache->request->print("\n".$_.' - '.$item.'<br />');
+	if (defined($cnt{$cat})) { $cnt{$cat}++; } else { $cnt{$cat}=1; }
+        unless ($listitems{$cat} eq 'app') {
+            if (defined($sum{$cat})) {
+               $sum{$cat}+=$evaldata{$_};
+               $concat{$cat}.=','.$item;
 	    } else {
-               $sum{$1}=$evaldata{$_};
+               $sum{$cat}=$evaldata{$_};
+               $concat{$cat}=$item;
 	    }
         } else {
-            if (defined($sum{$1})) {
+            if (defined($sum{$cat})) {
                if ($evaldata{$_}) {
-                  $sum{$1}.='<hr>'.$evaldata{$_};
+                  $sum{$cat}.='<hr />'.$evaldata{$_};
 	       }
  	    } else {
-	       $sum{$1}=''.$evaldata{$_};
+	       $sum{$cat}=''.$evaldata{$_};
 	    }
 	}
     }
     my %returnhash=();
-    foreach (keys %cnt) {
+    while ($_=each(%cnt)) {
        if ($listitems{$_} eq 'avg') {
 	   $returnhash{$_}=int(($sum{$_}/$cnt{$_})*100.0+0.5)/100.0;
        } elsif ($listitems{$_} eq 'cnt') {
@@ -94,10 +102,53 @@ sub dynamicmeta {
        } else {
            $returnhash{$_}=$sum{$_};
        }
+       $returnhash{$_.'_list'}=$concat{$_};
+       ### Apache->request->print("\n<hr />".$_.': '.$returnhash{$_}.'<br />'.$returnhash{$_.'_list'});
     }
+    #
+    # Deal with 'count' separately
+    $returnhash{'count'} = &access_count($url,$aauthor,$adomain);
+
     return %returnhash;
 }
 
+sub access_count {
+    my ($src,$author,$adomain) = @_;
+    my %countdata=&Apache::lonnet::dump('nohist_accesscount',$adomain,
+                                        $author,$src);
+    if (! exists($countdata{$src})) {
+        return 'Not Available';
+    } else {
+        return $countdata{$src};
+    }
+}
+
+# ------------------------------------- Try to make an alt tag if there is none
+
+sub alttag {
+    my ($base,$src)=@_;
+    my $fullpath=&Apache::lonnet::hreflocation($base,$src);
+    my $alttag=&Apache::lonnet::metadata($fullpath,'title').' '.
+               &Apache::lonnet::metadata($fullpath,'subject').' '.
+               &Apache::lonnet::metadata($fullpath,'abstract');
+    $alttag=~s/\s+/ /gs;
+    $alttag=~s/\"//gs;
+    $alttag=~s/\'//gs;
+    $alttag=~s/\s+$//gs;
+    $alttag=~s/^\s+//gs;
+    if ($alttag) { return $alttag; } else 
+                 { return 'No information available'; }
+}
+
+# -------------------------------------------------------------- Author display
+
+sub authordisplay {
+    my ($aname,$adom)=@_;
+    return &Apache::loncommon::aboutmewrapper(
+                &Apache::loncommon::plainname($aname,$adom),
+                    $aname,$adom,'preview').' <tt>['.$aname.'@'.$adom.']</tt>';
+}
+
 # -------------------------------------------------------------- Pretty display
 
 sub evalgraph {
@@ -140,6 +191,132 @@ 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',
+				   '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'
+				       );
+}
+
+# =========================================== 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;
+    }
+# 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 prettyinput {
+    my ($type,$value,$fieldname)=@_;
+}
+
 # ================================================================ Main Handler
 
 sub handler {
@@ -165,7 +342,7 @@ sub handler {
 
 # ----------------------------------------------------------- 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;
@@ -178,102 +355,109 @@ sub handler {
 
   unless ($ENV{'user.adv'}) {
       foreach ('keywords','notes','abstract','subject') {
-          $content{$_}='<i>- not displayed -</i>';
+          $content{$_}='<i>- '.&mt('not displayed').' -</i>';
       }
   }
 
 # --------------------------------------------------------------- Render Output
-  my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);
-my $creationdate=localtime(
- &Apache::loncommon::unsqltime($content{'creationdate'}));
-my $lastrevisiondate=localtime(
- &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 $versiondisplay='';
-if ($thisversion) {
-    $versiondisplay='Version: '.$thisversion.
-    ' (most recent version: '.$currentversion.')';
-} else {
-    $versiondisplay='Version: '.$currentversion;
-}
-my $bodytag=&Apache::loncommon::bodytag
+# displayed url
+    my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);
+    my $disuri=&Apache::lonnet::clutter($uri);
+    $disuri=~s/\.meta$//;
+    $disuri=&Apache::lonhtmlcommon::crumbs($disuri);
+# version
+    my $currentversion=&Apache::lonnet::getversion($disuri);
+    my $versiondisplay='';
+    if ($thisversion) {
+	$versiondisplay=&mt('Version').': '.$thisversion.
+	    ' ('.&mt('most recent version').': '.$currentversion.')';
+    } else {
+	$versiondisplay='Version: '.$currentversion;
+    }
+# 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
 <h2>$content{'title'}</h2>
 <h3><tt>$disuri</tt></h3>
+$obsoletewarning
 $versiondisplay<br />
 <table cellspacing=2 border=0>
-<tr><td bgcolor='#AAAAAA'>Author(s)</td>
-<td bgcolor="#CCCCCC">$content{'author'}&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>Subject</td>
-<td bgcolor="#CCCCCC">$content{'subject'}&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>Keyword(s)</td>
-<td bgcolor="#CCCCCC">$content{'keywords'}&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>Notes</td>
-<td bgcolor="#CCCCCC">$content{'notes'}&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>Abstract</td>
-<td bgcolor="#CCCCCC">$content{'abstract'}&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>MIME Type</td>
-<td bgcolor="#CCCCCC">$mime ($content{'mime'})&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>Language</td>
-<td bgcolor="#CCCCCC">$language&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>Creation Date</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'>Publisher/Owner</td>
-<td bgcolor="#CCCCCC">$content{'owner'}&nbsp;</td></tr>
-<tr><td bgcolor='#AAAAAA'>Copyright/Distribution</td>
-<td bgcolor="#CCCCCC">$content{'copyright'}
+$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'});
   if ($ENV{'user.adv'}) {
 # ------------------------------------------------------------ Dynamic Metadata
    $r->print(
-   '<h3>Dynamic Metadata (updated periodically)</h3>Processing ...<br>');
+   '<h3>'.&mt('Dynamic Metadata').' ('.
+	     &mt('updated periodically').')</h3>'.&mt('Processing').
+	     ' ...<br>');
    $r->rflush();
-    my %items=(
- 'count'      => 'Network-wide number of accesses (hits)',
- 'course'     => 'Network-wide number of courses using resource',
- 'usage'      => 'Number of resources using or importing resource',
- '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 %items=&fieldnames();
    my %dynmeta=&dynamicmeta($uri);
    $r->print(
-'</table><h4>Access and Usage Statistics</h4><table cellspacing=2 border=0>');
-   foreach ('count','usage','course') {
+'</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>Assessment Statistical Data</h4><table cellspacing=2 border=0>');
+'<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">'.
@@ -286,7 +470,7 @@ $dynmeta{$_}."&nbsp;</td></tr>\n");
       }
       $r->print('</table>');    
    }
-   $r->print('<h4>Evaluation Data</h4><table cellspacing=2 border=0>');
+   $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">'.
@@ -297,13 +481,14 @@ $dynmeta{$_}."&nbsp;</td></tr>\n");
    if ((($ENV{'user.domain'} eq $1) && ($ENV{'user.name'} eq $2))
        || ($ENV{'user.role.ca./'.$1.'/'.$2})) {
       $r->print(
-  '<h4>Evaluation Comments (visible to author and co-authors only)</h4>'.
+  '<h4>'.&mt('Evaluation Comments').' ('.&mt('visible to author and co-authors only').')</h4>'.
       '<blockquote>'.$dynmeta{'comments'}.'</blockquote>');
       $r->print(
-   '<h4>Error Messages (visible to author and co-authors only)</h4>');
+   '<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 ($_=~/^$disuri\_\d+$/) {
+	if ($_=~/^\Q$disuri\E\_\d+$/) {
           my %content=&Apache::lonmsg::unpackagemsg($errormsgs{$_});
 	  $r->print('<b>'.$content{'time'}.'</b>: '.$content{'message'}.
                     '<br />');
@@ -312,23 +497,25 @@ $dynmeta{$_}."&nbsp;</td></tr>\n");
    }
 # ------------------------------------------------------------- All other stuff
    $r->print(
- '<h3>Additional Metadata (non-standard, parameters, exports)</h3>');
+ '<h3>'.&mt('Additional Metadata (non-standard, parameters, exports)').'</h3>');
    foreach (sort keys %content) {
       my $name=$_;
-      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.')');
+      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("<br>\n");
    }
   }
 # ===================================================== End Resource Space Call
@@ -337,7 +524,7 @@ $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;
@@ -351,7 +538,8 @@ $dynmeta{$_}."&nbsp;</td></tr>\n");
   if ($disuri=~/\/default$/) {
       my $dir=$disuri;
       $dir=~s/default$//;
-      $displayfile='Default Cataloging Information for Directory '.$dir;
+      $displayfile=&mt('Default Cataloging Information for Directory').' '.
+	  $dir;
   }
   %Apache::lonpublisher::metadatafields=();
   %Apache::lonpublisher::metadatakeys=();
@@ -362,20 +550,35 @@ $bodytag
 <h1>$displayfile</h1>
 <form method="post">
 ENDEDIT
+   my %lt=&fieldnames();
    foreach ('author','title','subject','keywords','abstract','notes',
-            'copyright','language') {
+            'copyright','customdistributionfile','language',
+            'obsolete','obsoletereplacement') {
        if ($ENV{'form.new_'.$_}) {
 	   $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_};
        }
-       $r->print(
-         &Apache::lonpublisher::textfield($_,'new_'.$_,
-                                 $Apache::lonpublisher::metadatafields{$_}));
+       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{$_}));
+       }
    }
    if ($ENV{'form.store'}) {
       my $mfh;
       unless ($mfh=Apache::File->new('>'.$fn)) {
             $r->print(
-            '<p><font color=red>Could not write metadata, FAIL</font>');
+            '<p><font color=red>'.&mt('Could not write metadata').', '.
+		      &mt('FAIL').'</font>');
       } else {
           foreach (sort keys %Apache::lonpublisher::metadatafields) {
             unless ($_=~/\./) {
@@ -396,15 +599,21 @@ ENDEDIT
                         .'</'.$tag.'>';
             }
 	  }
-          $r->print('<p>Wrote Metadata');
+          $r->print('<p>'.&mt('Wrote Metadata'));
       }
     }
     $r->print(
- '<br /><input type="submit" name="store" value="Store Catalog Information"></form></body></html>');
+ '<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__