--- loncom/publisher/lonpublisher.pm	2003/11/04 16:15:56	1.143
+++ loncom/publisher/lonpublisher.pm	2003/12/08 18:26:01	1.146
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.143 2003/11/04 16:15:56 www Exp $
+# $Id: lonpublisher.pm,v 1.146 2003/12/08 18:26:01 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -143,6 +143,7 @@ use Apache::lonnet();
 use Apache::loncommon();
 use Apache::lonmysql;
 use Apache::lonlocal;
+use Apache::loncfile;
 use vars qw(%metadatafields %metadatakeys);
 
 my %addid;
@@ -180,6 +181,10 @@ nothing
 
 #########################################
 #########################################
+#
+# Modifies global %metadatafields %metadatakeys 
+#
+
 sub metaeval {
     my ($metastring,$prefix)=@_;
    
@@ -262,7 +267,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;
@@ -271,7 +277,8 @@ sub metaread {
 	$metastring=join('',<$metafh>);
     }
     &metaeval($metastring,$prefix);
-    return '<br /><b>Processed file:</b> <tt>'.$fn.'</tt>';
+    return '<br /><b>Processed file:</b> <tt>'.
+	&Apache::loncfile::display($fn).'</tt>';
 }
 
 #########################################
@@ -812,7 +819,8 @@ sub store_metadata {
 
 
 # ============================================== Parse file itself for metadata
-
+#
+# parses a file with target meta, sets global %metadatafields %metadatakeys 
 
 sub parseformeta {
     my ($source,$style)=@_;
@@ -884,7 +892,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=$_;
@@ -941,7 +949,8 @@ sub publish {
 # -------------------------------------------- Initial step done, now metadata.
 
 # --------------------------------------- Storage for metadata keys and fields.
-
+# these are globals
+#
      %metadatafields=();
      %metadatakeys=();
      
@@ -967,8 +976,9 @@ sub publish {
 	$metadatafields{'authorspace'}=$cuname.'@'.$cudom;
 
 # ----------------------------------------------------------- Parse file itself
-
-	&parseformeta($source,$style);
+# read %metadatafields from file itself
+ 
+	$allmeta=&parseformeta($source,$style);
 # ------------------------------------------------ Check out directory hierachy
 
         my $thisdisfn=$source;
@@ -1005,12 +1015,12 @@ sub publish {
 		delete $metadatafields{$_};
             }
         }
-        
-    }
 # ------------------------------------------ See if anything new in file itself
  
-    $allmeta=&parseformeta($source,$style);
+	$allmeta=&parseformeta($source,$style);
+   }
 
+       
 # ---------------- Find and document discrepancies in the parameters and stores
 
     my $chparms='';
@@ -1041,7 +1051,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
@@ -1075,7 +1087,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)).
@@ -1087,6 +1099,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) {
@@ -1099,10 +1114,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
@@ -1135,7 +1150,7 @@ 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>';