--- loncom/publisher/lonpublisher.pm	2003/12/26 21:17:37	1.153
+++ loncom/publisher/lonpublisher.pm	2003/12/29 21:17:00	1.158
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.153 2003/12/26 21:17:37 www Exp $
+# $Id: lonpublisher.pm,v 1.158 2003/12/29 21:17:00 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=\''.$_.'\'';
@@ -791,11 +790,37 @@ sub store_metadata {
 	    ('metadata','url',$metadata{'url'});
     } else {
 # store new data
+# adjust some values to metadatadatabase (e.g., "usage" is a reserved word)
 	$metadata{'creationdate'}=
 	    &Apache::lonmysql::sqltime($metadata{'creationdate'}); 
 	$metadata{'lastrevisiondate'}=
-	    &Apache::lonmysql::sqltime($metadata{'lastrevisiondate'}); 
-	$status = &Apache::lonmysql::store_row('metadata',\%metadata);
+	    &Apache::lonmysql::sqltime($metadata{'lastrevisiondate'});
+	$metadata{'sequsage'}=$metadata{'usage'};
+	$metadata{'sequsage_list'}=$metadata{'usage_list'};
+	my %newmetadata=();
+# see if we have old entries
+	my @oldmeta=&Apache::lonmysql::get_rows('metadata',
+						"url LIKE BINARY '".
+						$metadata{'url'}."'");
+	if ($#oldmeta==0) {
+# 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'});
+	} elsif ($#oldmeta>0) {
+# more than one entry fit - how did that happen?
+	    $error='<font color="red">Error occured retrieving old values in '.
+	      'metadata table in LON-CAPA database: '.$#oldmeta.
+	      ' matches</font>';
+	    &Apache::lonnet::logthis($error);
+	    return ($error,undef);
+	}
+# store new data on top of it
+	foreach (keys %metadata) {
+	    $newmetadata{$_}=$metadata{$_};
+	}
+	$status = &Apache::lonmysql::store_row('metadata',\%newmetadata);
     }
     if (! defined($status)) {
         $error='<font color="red">Error occured storing new values in '.
@@ -960,9 +985,6 @@ sub publish {
         $metadatafields{'author'}=~s/\s+/ /g;
         $metadatafields{'author'}=~s/\s+$//;
         $metadatafields{'owner'}=$cuname.'@'.$cudom;
-	$metadatafields{'modifyinguser'}=$ENV{'user.name'}.'@'.
-	                                 $ENV{'user.domain'};
-	$metadatafields{'authorspace'}=$cuname.'@'.$cudom;
 
 # ------------------------------------------------ Check out directory hierachy
 
@@ -1088,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";
@@ -1139,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>';
@@ -1149,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'});
@@ -1212,7 +1234,7 @@ END
 	    $scrout.=&textfield('Custom Distribution File','customdistributionfile',
 				$metadatafields{'customdistributionfile'}).
 				    $copyright_help;
-	    my $uctitle=uc(&mt('Obsolete'));
+	    my $uctitle=&mt('Obsolete');
             $scrout.=
 		"\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
 		'</b></font> <input type="checkbox" name="obsolete" ';
@@ -1345,6 +1367,9 @@ sub phasetwo {
     $metadatafields{'obsoletereplacement'}=
 	                        $ENV{'form.obsoletereplacement'};
     $metadatafields{'dependencies'}=$ENV{'form.dependencies'};
+    $metadatafields{'modifyinguser'}=$ENV{'user.name'}.'@'.
+	                                 $ENV{'user.domain'};
+    $metadatafields{'authorspace'}=$cuname.'@'.$cudom;
     
     my $allkeywords=$ENV{'form.addkey'};
     if (exists($ENV{'form.keywords'})) {
@@ -1622,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.
 
@@ -1661,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();
 	}