--- loncom/publisher/lonpublisher.pm	2003/12/27 16:58:36	1.155
+++ loncom/publisher/lonpublisher.pm	2003/12/29 19:13:23	1.157
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.155 2003/12/27 16:58:36 www Exp $
+# $Id: lonpublisher.pm,v 1.157 2003/12/29 19:13:23 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -126,6 +126,7 @@ use Apache::loncommon();
 use Apache::lonmysql;
 use Apache::lonlocal;
 use Apache::loncfile;
+use Apache::lonmeta;
 use vars qw(%metadatafields %metadatakeys);
 
 my %addid;
@@ -316,8 +317,7 @@ sub textfield {
     $value=~s/\s+$//gs;
     $value=~s/\s+/ /gs;
     $title=&mt($title);
-    my $uctitle=uc($title);
-    return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
+    return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".
            "</b></font></p><br />".
            '<input type="text" name="'.$name.'" size=80 value="'.$value.'" />';
 }
@@ -330,9 +330,8 @@ sub hiddenfield {
 sub selectbox {
     my ($title,$name,$value,$functionref,@idlist)=@_;
     $title=&mt($title);
-    my $uctitle=uc($title);
     $value=(split(/\s*,\s*/,$value))[-1];
-    my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
+    my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".
 	'</b></font></p><br /><select name="'.$name.'">';
     foreach (@idlist) {
         $selout.='<option value=\''.$_.'\'';
@@ -799,17 +798,13 @@ sub store_metadata {
 	$metadata{'sequsage'}=$metadata{'usage'};
 	$metadata{'sequsage_list'}=$metadata{'usage_list'};
 	my %newmetadata=();
-# retrieve current database column names
-	my @columns=&Apache::lonmysql::col_order('metadata');
 # see if we have old entries
 	my @oldmeta=&Apache::lonmysql::get_rows('metadata',
 						"url LIKE BINARY '".
 						$metadata{'url'}."'");
 	if ($#oldmeta==0) {
-# there is an old value
-	    for (my $i=0; $i<=$#columns; $i++) {
-		$newmetadata{$columns[$i]}=$oldmeta[0]->[$i];
-	    }
+# yes, there is one old entry, transfer to newmetadata
+	    %newmetadata=&Apache::lonmeta::metadata_col_to_hash(@{$oldmeta[0]});
 # remove old entry
 	    $status=&Apache::lonmysql::remove_from_table
 		('metadata','url',$metadata{'url'});
@@ -1115,7 +1110,7 @@ sub publish {
 # --------------------------------------------------- Scan content for keywords
 
         my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords");
-        my $KEYWORDS=&mt('KEYWORDS');
+        my $KEYWORDS=&mt('Keywords');
 	my $CheckAll=&mt('check all');
 	my $UncheckAll=&mt('uncheck all');
 	my $keywordout=<<"END";
@@ -1166,7 +1161,7 @@ END
 	$scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
 
 	$scrout.=
-	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>".&mt('ABSTRACT').":".
+	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>".&mt('Abstract').":".
 	    "</b></font></p><br />".
 	    '<textarea cols="80" rows="5" name="abstract">'.
 	    $metadatafields{'abstract'}.'</textarea></p>';
@@ -1176,11 +1171,11 @@ END
 
 	$scrout.=
 	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>".
-	    uc(&mt('Lowest Grade Level:')).
+	    &mt('Lowest Grade Level').':'.
            "</b></font></p><br />".
 	   &Apache::loncommon::select_level_form($metadatafields{'lowestgradelevel'},'lowestgradelevel').
 	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>".
-	    uc(&mt('Highest Grade Level:')).
+	    &mt('Highest Grade Level').':'.
            "</b></font></p><br />".
 	   &Apache::loncommon::select_level_form($metadatafields{'highestgradelevel'},'highestgradelevel').
            &textfield('Standards','standards',$metadatafields{'standards'});
@@ -1652,8 +1647,8 @@ sub publishdirectory {
     my $resdir=
 	$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'.
 	$thisdisfn;
-    $r->print('<h1>Directory <tt>'.$thisdisfn.'</tt></h1>'.
-	      'Target: <tt>'.$resdir.'</tt><br />');
+    $r->print('<h1>'.&mt('Directory').' <tt>'.$thisdisfn.'</tt></h1>'.
+	      &mt('Target').': <tt>'.$resdir.'</tt><br />');
 
     my $dirptr=16384;		# Mask indicating a directory in stat.cmode.
 
@@ -1691,7 +1686,7 @@ sub publishdirectory {
 	    if ($publishthis) {
                 &batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename);
 	    } else {
-		$r->print('<br />Skipping '.$filename.'<br />');
+		$r->print('<br />'.&mt('Skipping').' '.$filename.'<br />');
 	    }
 	    $r->rflush();
 	}