--- loncom/publisher/lonpublisher.pm	2003/11/01 17:09:52	1.141
+++ 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.141 2003/11/01 17:09:52 www Exp $
+# $Id: lonpublisher.pm,v 1.158 2003/12/29 21:17:00 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,24 +25,6 @@
 #
 # http://www.lon-capa.org/
 #
-# 
-# (TeX Content Handler
-#
-# 05/29/00,05/30,10/11 Gerd Kortemeyer)
-#
-# 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
-# 03/23 Guy Albertelli
-# 03/24,03/29,04/03 Gerd Kortemeyer
-# 05/03,05/05,05/07 Gerd Kortemeyer
-# 06/23,08/07,08/11,8/13,8/17,8/18,8/24,9/26,10/16 Gerd Kortemeyer
-# 12/04,12/05 Guy Albertelli
-# 12/05 Gerd Kortemeyer
-# 12/05 Guy Albertelli
-# 12/06,12/07 Gerd Kortemeyer
-# 12/25 Gerd Kortemeyer
-# YEAR=2002
-# 1/17 Gerd Kortemeyer
-#
 ###
 
 ###############################################################################
@@ -143,6 +125,8 @@ use Apache::lonnet();
 use Apache::loncommon();
 use Apache::lonmysql;
 use Apache::lonlocal;
+use Apache::loncfile;
+use Apache::lonmeta;
 use vars qw(%metadatafields %metadatakeys);
 
 my %addid;
@@ -180,6 +164,10 @@ nothing
 
 #########################################
 #########################################
+#
+# Modifies global %metadatafields %metadatakeys 
+#
+
 sub metaeval {
     my ($metastring,$prefix)=@_;
    
@@ -214,14 +202,8 @@ sub metaeval {
 		$newentry=~s/^\s*//;
 		if ($newentry !~m|^/res|) { $newentry=$prefix.$newentry; }
 	    }
-	    if ($metadatafields{$unikey}) {
-		unless (($metadatafields{$unikey}=~/\Q$newentry\E/) ||
-			($newentry eq '')) {
-		    $metadatafields{$unikey}.=', '.$newentry;
-		}
-	    } else {
-		$metadatafields{$unikey}=$newentry;
-	    }
+# actually store
+	    $metadatafields{$unikey}=$newentry;
 	}
     }
 }
@@ -267,7 +249,8 @@ sub metaread {
     my ($logfile,$fn,$prefix)=@_;
     unless (-e $fn) {
 	print($logfile 'No file '.$fn."\n");
-        return '<br /><b>No file:</b> <tt>'.$fn.'</tt>';
+        return '<br /><b>'.&mt('No file').':</b> <tt>'.
+	    &Apache::loncfile::display($fn).'</tt>';
     }
     print($logfile 'Processing '.$fn."\n");
     my $metastring;
@@ -276,7 +259,8 @@ sub metaread {
 	$metastring=join('',<$metafh>);
     }
     &metaeval($metastring,$prefix);
-    return '<br /><b>Processed file:</b> <tt>'.$fn.'</tt>';
+    return '<br /><b>'.&mt('Processed file').':</b> <tt>'.
+	&Apache::loncfile::display($fn).'</tt>';
 }
 
 #########################################
@@ -333,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.'" />';
 }
@@ -347,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=\''.$_.'\'';
@@ -626,7 +608,7 @@ sub fix_ids_and_indices {
 			   join(', ',@duplicatedids));
     if ($duplicateids) {
 	print $logfile "Duplicate ID(s) exist, ".join(', ',@duplicatedids)."\n";
-	my $outstring='<font color="red">Unable to publish file, it contains duplicated ID(s), ID(s) need to be unique. The duplicated ID(s) are: '.join(', ',@duplicatedids).'</font>';
+	my $outstring='<font color="red">'.&mt('Unable to publish file, it contains duplicated ID(s), ID(s) need to be unique. The duplicated ID(s) are').': '.join(', ',@duplicatedids).'</font>';
 	return ($outstring,1);
     }
     if ($needsfixup) {
@@ -691,8 +673,15 @@ sub fix_ids_and_indices {
 		}
 		if ($lctag eq 'applet') {
 		    my $codebase='';
-		    if (defined($parms{'codebase'})) {
-			my $oldcodebase=$parms{'codebase'};
+		    my $havecodebase=0;
+		    foreach my $key (keys(%parms)) {
+			if (lc($key) eq 'codebase') { 
+			    $codebase=$parms{$key};
+			    $havecodebase=1; 
+			}
+		    }
+		    if ($havecodebase) {
+			my $oldcodebase=$codebase;
 			unless ($oldcodebase=~/\/$/) {
 			    $oldcodebase.='/';
 			}
@@ -706,14 +695,13 @@ sub fix_ids_and_indices {
 			}
 			$allow{&absoluteurl($codebase,$target).'/*'}=1;
 		    } else {
-			foreach ('archive','code','object') {
-			    if (defined($parms{$_})) {
-				my $oldurl=$parms{$_};
+			foreach my $key (keys(%parms)) {
+			    if ($key =~ /(archive|code|object)/i) {
+				my $oldurl=$parms{$key};
 				my $newurl=&urlfixup($oldurl,$target);
 				$newurl=~s/\/[^\/]+$/\/\*/;
-				print $logfile 'Allow: applet '.$_.':'.
-				    $oldurl.' allows '.
-					$newurl."\n";
+				print $logfile 'Allow: applet '.lc($key).':'.
+				    $oldurl.' allows '.$newurl."\n";
 				$allow{&absoluteurl($newurl,$target)}=1;
 			    }
 			}
@@ -778,7 +766,7 @@ Returns: (error,status).  error is undef
 #########################################
 #########################################
 sub store_metadata {
-    my %metadata = %{shift()};
+    my %metadata = @_;
     my $error;
     # Determine if the table exists
     my $status = &Apache::lonmysql::check_table('metadata');
@@ -795,17 +783,45 @@ sub store_metadata {
         &Apache::lonnet::logthis($error);
         return ($error,undef);
     }
-    # Remove old value from table
-    $status = &Apache::lonmysql::remove_from_table
-        ('metadata','url',$metadata{'url'});
-    if (! defined($status)) {
-        $error = '<font color="red">Error when removing old values from '.
-            'metadata table in LON-CAPA database.</font>';
-        &Apache::lonnet::logthis($error);
-        return ($error,undef);
+    if (($metadata{'obsolete'}) || ($metadata{'copyright'} eq 'priv') ||
+	($metadata{'copyright'} eq 'custom')) {
+# remove this entry
+	$status=&Apache::lonmysql::remove_from_table
+	    ('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'});
+	$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);
     }
-    # Store data in table.
-    $status = &Apache::lonmysql::store_row('metadata',\%metadata);
     if (! defined($status)) {
         $error='<font color="red">Error occured storing new values in '.
             'metadata table in LON-CAPA database</font>';
@@ -815,6 +831,26 @@ sub store_metadata {
     return (undef,$status);
 }
 
+
+# ============================================== Parse file itself for metadata
+#
+# parses a file with target meta, sets global %metadatafields %metadatakeys 
+
+sub parseformeta {
+    my ($source,$style)=@_;
+    my $allmeta='';
+    if (($style eq 'ssi') || ($style eq 'prv')) {
+	my $dir=$source;
+	$dir=~s-/[^/]*$--;
+	my $file=$source;
+	$file=(split('/',$file))[-1];
+        $source=&Apache::lonnet::hreflocation($dir,$file);
+	$allmeta=&Apache::lonnet::ssi_body($source,('grade_target' => 'meta'));
+        &metaeval($allmeta);
+    }
+    return $allmeta;
+}
+
 #########################################
 #########################################
 
@@ -846,7 +882,7 @@ sub publish {
     my %allow=();
 
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
-	return ('<font color="red">No write permission to user directory, FAIL</font>',1);
+	return ('<font color="red">'.&mt('No write permission to user directory, FAIL').'</font>',1);
     }
     print $logfile 
 "\n\n================= Publish ".localtime()." Phase One  ================\n".$ENV{'user.name'}.'@'.$ENV{'user.domain'}."\n";
@@ -870,7 +906,7 @@ sub publish {
 	if ($error) { return ($outstring,$error); }
 # ------------------------------------------------------------ Construct Allows
     
-	$scrout.='<h3>Dependencies</h3>';
+	$scrout.='<h3>'.&mt('Dependencies').'</h3>';
         my $allowstr='';
         foreach (sort(keys(%allow))) {
 	   my $thisdep=$_;
@@ -888,7 +924,7 @@ sub publish {
                if (
        &Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'.
                                             $thisdep.'.meta') eq '-1') {
-		   $scrout.= ' - <font color="red">Currently not available'.
+		   $scrout.= ' - <font color="red">'.&mt('Currently not available').
 		       '</font>';
                } else {
                    my %temphash=(&Apache::lonnet::declutter($target).'___'.
@@ -927,7 +963,8 @@ sub publish {
 # -------------------------------------------- Initial step done, now metadata.
 
 # --------------------------------------- Storage for metadata keys and fields.
-
+# these are globals
+#
      %metadatafields=();
      %metadatakeys=();
      
@@ -948,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
 
@@ -968,6 +1002,10 @@ sub publish {
             $scrout.=&metaread($logfile,$currentpath.'default.meta',$prefix);
 	    $prefix=~s|^\.\./||;
         }
+# ----------------------------------------------------------- Parse file itself
+# read %metadatafields from file itself
+ 
+	$allmeta=&parseformeta($source,$style);
 
 # ------------------- Clear out parameters and stores (there should not be any)
 
@@ -988,20 +1026,12 @@ sub publish {
 		delete $metadatafields{$_};
             }
         }
-        
-    }
-
-# -------------------------------------------------- Parse content for metadata
-    if (($style eq 'ssi') || ($style eq 'prv')) {
-	my $dir=$source;
-	$dir=~s-/[^/]*$--;
-	my $file=$source;
-	$file=(split('/',$file))[-1];
-        $source=&Apache::lonnet::hreflocation($dir,$file);
-	$allmeta=&Apache::lonnet::ssi_body($source,('grade_target' => 'meta'));
+# ------------------------------------------ See if anything new in file itself
+ 
+	$allmeta=&parseformeta($source,$style);
+   }
 
-        &metaeval($allmeta);
-    }
+       
 # ---------------- Find and document discrepancies in the parameters and stores
 
     my $chparms='';
@@ -1032,7 +1062,9 @@ sub publish {
     }
     if ($chparms) {
 	$scrout.='<p><b>'.&mt('Obsolete parameters or stored values').':</b> '.
-	    $chparms.'</p>';
+	    $chparms.'</p><h1><font color="red">'.&mt('Warning!').
+	    '</font></h1><p><font color="red" size="+1">'.
+	    &mt('If this resource is in active use, student performance data from the previous version may become inaccessible.').'</font></p><hr />';
     }
 
 # ------------------------------------------------------- Now have all metadata
@@ -1066,7 +1098,7 @@ sub publish {
     unless ($batch) {
         $scrout.=
 	    '<form name="pubform" action="/adm/publish" method="post">'.
-            '<p><input type="submit" value="Finalize Publication" /></p>'.
+            '<p><input type="submit" value="'.&mt('Finalize Publication').'" /></p>'.
             &hiddenfield('phase','two').
             &hiddenfield('filename',$ENV{'form.filename'}).
 	    &hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).
@@ -1078,6 +1110,9 @@ sub publish {
 # --------------------------------------------------- Scan content for keywords
 
         my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords");
+        my $KEYWORDS=&mt('Keywords');
+	my $CheckAll=&mt('check all');
+	my $UncheckAll=&mt('uncheck all');
 	my $keywordout=<<"END";
 <script>
 function checkAll(field) {
@@ -1090,10 +1125,10 @@ function uncheckAll(field) {
         field[i].checked = false ;
 }
 </script>
-<p><font color="#800000" face="helvetica"><b>KEYWORDS:</b></font>
+<p><font color="#800000" face="helvetica"><b>$KEYWORDS:</b></font>
  $keywords_help</b>
-<input type="button" value="check all" onclick="javascript:checkAll(document.pubform.keywords)" /> 
-<input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.pubform.keywords)" /> 
+<input type="button" value="$CheckAll" onclick="javascript:checkAll(document.pubform.keywords)" /> 
+<input type="button" value="$UncheckAll" onclick="javascript:uncheckAll(document.pubform.keywords)" /> 
 </p>
 <br />
 END
@@ -1126,13 +1161,28 @@ END
 	$scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
 
 	$scrout.=
-	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>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>';
 
 	$source=~/\.(\w+)$/;
 
+
+	$scrout.=
+	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>".
+	    &mt('Lowest Grade Level').':'.
+           "</b></font></p><br />".
+	   &Apache::loncommon::select_level_form($metadatafields{'lowestgradelevel'},'lowestgradelevel').
+	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>".
+	    &mt('Highest Grade Level').':'.
+           "</b></font></p><br />".
+	   &Apache::loncommon::select_level_form($metadatafields{'highestgradelevel'},'highestgradelevel').
+           &textfield('Standards','standards',$metadatafields{'standards'});
+
+
+
+
 	$scrout.=&hiddenfield('mime',$1);
 
 	my $defaultlanguage=$metadatafields{'language'};
@@ -1150,7 +1200,7 @@ END
 	    $metadatafields{'creationdate'}=time;
 	}
 	$scrout.=&hiddenfield('creationdate',
-			      &Apache::loncommon::unsqltime($metadatafields{'creationdate'}));
+			      &Apache::lonmysql::unsqltime($metadatafields{'creationdate'}));
 
 	$scrout.=&hiddenfield('lastrevisiondate',time);
 
@@ -1184,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" ';
@@ -1308,12 +1358,18 @@ sub phasetwo {
     $metadatafields{'lastrevisiondate'}=$ENV{'form.lastrevisiondate'};
     $metadatafields{'owner'}=$ENV{'form.owner'};
     $metadatafields{'copyright'}=$ENV{'form.copyright'};
+    $metadatafields{'standards'}=$ENV{'form.standards'};
+    $metadatafields{'lowestgradelevel'}=$ENV{'form.lowestgradelevel'};
+    $metadatafields{'highestgradelevel'}=$ENV{'form.highestgradelevel'};
     $metadatafields{'customdistributionfile'}=
                                  $ENV{'form.customdistributionfile'};
     $metadatafields{'obsolete'}=$ENV{'form.obsolete'};
     $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'})) {
@@ -1327,6 +1383,15 @@ sub phasetwo {
     $allkeywords=~s/^\,//;
     $metadatafields{'keywords'}=$allkeywords;
     
+# check if custom distribution file is specified
+    if ($metadatafields{'copyright'} eq 'custom') {
+	my $file=$metadatafields{'customdistributionfile'};
+	unless ($file=~/\.rights$/) {
+            return 
+                '<font color="red">'.&mt('No valid custom distribution rights file specified, FAIL').
+		'</font>';
+        }
+    }
     {
         print $logfile "\nWrite metadata file for ".$source;
         my $mfh;
@@ -1360,21 +1425,16 @@ sub phasetwo {
 
     $metadatafields{'url'} = $distarget;
     $metadatafields{'version'} = 'current';
-    unless ($metadatafields{'copyright'} eq 'priv') {
-        my ($error,$success) = &store_metadata(\%metadatafields);
-        if ($success) {
-            $r->print('<p>'.&mt('Synchronized SQL metadata database').'</p>');
-            print $logfile "\nSynchronized SQL metadata database";
-        } else {
-            $r->print($error);
-            print $logfile "\n".$error;
-        }
+
+    my ($error,$success) = &store_metadata(%metadatafields);
+    if ($success) {
+	$r->print('<p>'.&mt('Synchronized SQL metadata database').'</p>');
+	print $logfile "\nSynchronized SQL metadata database";
     } else {
-        $r->print('<p>'.
-	     &mt('Private Publication - did not synchronize database').'</p>');
-        print $logfile "\nPrivate: Did not synchronize data into ".
-            "SQL metadata database";
+	$r->print($error);
+	print $logfile "\n".$error;
     }
+
 # ----------------------------------------------------------- Copy old versions
    
     if (-e $target) {
@@ -1532,6 +1592,7 @@ sub phasetwo {
                    '"><font size="+2">'.
 		  &mt('Back to Source Directory').'</font></a></p>');
     }
+    return '<p><font color="green">'.&mt('Done').'</font></p>';
 }
 
 #########################################
@@ -1586,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.
 
@@ -1625,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();
 	}
@@ -1831,8 +1892,8 @@ ENDDIFF
 	    my ($outstring,$error)=&publish($thisfn,$thistarget,$thisembstyle);
 	    $r->print('<hr />'.$outstring);
 	} else {
-	    $r->print('<hr />');
-	    &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget); 
+	    $r->print('<hr />'.
+	    &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget)); 
 	}
     }
     $r->print('</body></html>');