--- loncom/publisher/lonpublisher.pm	2003/08/21 17:01:07	1.130
+++ loncom/publisher/lonpublisher.pm	2003/09/25 20:13:19	1.137
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.130 2003/08/21 17:01:07 albertel Exp $
+# $Id: lonpublisher.pm,v 1.137 2003/09/25 20:13:19 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -142,6 +142,7 @@ use DBI;
 use Apache::lonnet();
 use Apache::loncommon();
 use Apache::lonmysql;
+use Apache::lonlocal;
 use vars qw(%metadatafields %metadatakeys);
 
 my %addid;
@@ -324,6 +325,7 @@ string which presents the form field (fo
 #########################################
 sub textfield {
     my ($title,$name,$value)=@_;
+    $title=&mt($title);
     my $uctitle=uc($title);
     return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
            "</b></font></p><br />".
@@ -337,6 +339,7 @@ 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:".
@@ -667,7 +670,10 @@ sub fix_ids_and_indices {
 		    }
 		}
 		# probably a <randomlabel> image type <label>
-		if ($lctag eq 'label' && defined($parms{'description'})) {
+		# or a <image> tag inside <imageresponse>
+		if (($lctag eq 'label' && defined($parms{'description'}))
+		    ||
+		    ($lctag eq 'image')) {
 		    my $next_token=$parser[-1]->get_token();
 		    if ($next_token->[0] eq 'T') {
 			$next_token->[1]=&set_allow(\%allow,$logfile,
@@ -719,7 +725,7 @@ sub fix_ids_and_indices {
 		if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }
 		$outstring.='<'.$tag.$newparmstring.$endtag.'>';
 		if ($lctag eq 'm' || $lctag eq 'script' 
-                    || $lctag eq 'display') {
+                    || $lctag eq 'display' || $lctag eq 'tex') {
 		    $outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser);
 		}
 	    } elsif ($token->[0] eq 'E') {
@@ -891,16 +897,20 @@ sub publish {
         }
         $outstring=~s/\n*(\<\/[^\>]+\>)\s*$/$allowstr\n$1\n/s;
 
+### FIXME: is this really what we want?
+# I dont' think so, to will corrupt any UTF-8 resources at least, 
+# and any encoding other than ISO-8859-1 will probably break
 	#Encode any High ASCII characters
-	$outstring=&HTML::Entities::encode($outstring,"\200-\377");
+	#$outstring=&HTML::Entities::encode($outstring,"\200-\377");
 # ------------------------------------------------------------- Write modified.
 
         {
           my $org;
           unless ($org=Apache::File->new('>'.$source)) {
              print $logfile "No write permit to $source\n";
-             return ('<font color="red">No write permission to '.$source.
-		     ', FAIL</font>',1);
+             return ('<font color="red">'.&mt('No write permission to').
+		     ' '.$source.
+		     ', '.&mt('FAIL').'</font>',1);
 	  }
           print($org $outstring);
         }
@@ -917,7 +927,7 @@ sub publish {
      my %oldparmstores=();
      
     unless ($batch) {
-     $scrout.='<h3>Metadata Information ' .
+     $scrout.='<h3>'.&mt('Metadata Information').' ' .
        Apache::loncommon::help_open_topic("Metadata_Description")
        . '</h3>';
     }
@@ -974,11 +984,12 @@ sub publish {
 
 # -------------------------------------------------- Parse content for metadata
     if (($style eq 'ssi') || ($style eq 'prv')) {
-        my $oldenv=$ENV{'request.uri'};
-
-        $ENV{'request.uri'}=$target;
-        $allmeta=Apache::lonxml::xmlparse(undef,'meta',$content);
-        $ENV{'request.uri'}=$oldenv;
+	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);
     }
@@ -996,7 +1007,8 @@ sub publish {
 	}
     }
     if ($chparms) {
-	$scrout.='<p><b>New parameters or stored values:</b> '.$chparms.'</p>';
+	$scrout.='<p><b>'.&mt('New parameters or stored values').
+	    ':</b> '.$chparms.'</p>';
     }
 
     $chparms='';
@@ -1010,7 +1022,7 @@ sub publish {
 	}
     }
     if ($chparms) {
-	$scrout.='<p><b>Obsolete parameters or stored values:</b> '.
+	$scrout.='<p><b>'.&mt('Obsolete parameters or stored values').':</b> '.
 	    $chparms.'</p>';
     }
 
@@ -1163,10 +1175,22 @@ END
 	    $scrout.=&textfield('Custom Distribution File','customdistributionfile',
 				$metadatafields{'customdistributionfile'}).
 				    $copyright_help;
+	    my $uctitle=uc(&mt('Obsolete'));
+            $scrout.=
+		"\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
+		'</b></font> <input type="checkbox" name="obsolete" ';
+	    if ($metadatafields{'obsolete'}) {
+		$scrout.=' checked="1" ';
+	    }
+	    $scrout.='/ ></p>'.
+		&textfield('Suggested Replacement for Obsolete File',
+				    'obsoletereplacement',
+				    $metadatafields{'obsoletereplacement'});
 	} else {
 	    $scrout.=&hiddenfield('copyright','private');
 	}
-	return ($scrout.'<p><input type="submit" value="Finalize Publication" /></p></form>',0);
+	return ($scrout.'<p><input type="submit" value="'.
+		&mt('Finalize Publication').'" /></p></form>',0);
 # =============================================================================
 # BATCH MODE
 #
@@ -1244,14 +1268,16 @@ sub phasetwo {
 
     if ($target=~/\_\_\_/) {
 	$r->print(
- '<font color="red">Unsupported character combination "<tt>___</tt>" in filename, FAIL</font>');
+ '<font color="red">'.&mt('Unsupported character combination').
+		  ' "<tt>___</tt>" '.&mt('in filename, FAIL').'</font>');
         return 0;
     }
     $distarget=~s/\/+/\//g;
     my $logfile;
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
 	$r->print(
-        '<font color="red">No write permission to user directory, FAIL</font>');
+        '<font color="red">'.
+		&mt('No write permission to user directory, FAIL').'</font>');
         return 0;
     }
     print $logfile 
@@ -1294,7 +1320,8 @@ sub phasetwo {
         my $mfh;
         unless ($mfh=Apache::File->new('>'.$source.'.meta')) {
             return 
-                '<font color="red">Could not write metadata, FAIL</font>';
+                '<font color="red">'.&mt('Could not write metadata, FAIL').
+		'</font>';
         }
         foreach (sort keys %metadatafields) {
             unless ($_=~/\./) {
@@ -1313,7 +1340,7 @@ sub phasetwo {
                         .'</'.$tag.'>';
             }
         }
-        $r->print('<p>Wrote Metadata</p>');
+        $r->print('<p>'.&mt('Wrote Metadata').'</p>');
         print $logfile "\nWrote metadata";
     }
     
@@ -1331,7 +1358,8 @@ sub phasetwo {
             print $logfile "\n".$error;
         }
     } else {
-        $r->print('<p>Private Publication - did not synchronize database</p>');
+        $r->print('<p>'.
+	     &mt('Private Publication - did not synchronize database').'</p>');
         print $logfile "\nPrivate: Did not synchronize data into ".
             "SQL metadata database";
     }
@@ -1368,10 +1396,11 @@ sub phasetwo {
         
         if (copy($target,$copyfile)) {
 	    print $logfile "Copied old target to ".$copyfile."\n";
-            $r->print('<p>Copied old target file</p>');
+            $r->print('<p>'.&mt('Copied old target file').'</p>');
         } else {
 	    print $logfile "Unable to write ".$copyfile.':'.$!."\n";
-            return "<font color=\"red\">Failed to copy old target, $!, FAIL</font>";
+            return "<font color=\"red\">".&mt('Failed to copy old target').
+		", $!, ".&mt('FAIL')."</font>";
         }
         
 # --------------------------------------------------------------- Copy Metadata
@@ -1380,12 +1409,13 @@ sub phasetwo {
         
         if (copy($target.'.meta',$copyfile)) {
 	    print $logfile "Copied old target metadata to ".$copyfile."\n";
-            $r->print('<p>Copied old metadata</p>')
+            $r->print('<p>'.&mt('Copied old metadata').'</p>')
         } else {
 	    print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
             if (-e $target.'.meta') {
                 return 
-                    "<font color=\"red\">Failed to write old metadata copy, $!, FAIL</font>";
+                    "<font color=\"red\">".
+&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</font>";
 	    }
         }
         
@@ -1406,17 +1436,18 @@ sub phasetwo {
         $path.="/$parts[$count]";
         if ((-e $path)!=1) {
             print $logfile "\nCreating directory ".$path;
-            $r->print('<p>Created directory '.$parts[$count].'</p>');
+            $r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>');
             mkdir($path,0777);
         }
     }
     
     if (copy($source,$copyfile)) {
         print $logfile "\nCopied original source to ".$copyfile."\n";
-        $r->print('<p>Copied source file</p>');
+        $r->print('<p>'.&mt('Copied source file').'</p>');
     } else {
         print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
-        return "<font color=\"red\">Failed to copy source, $!, FAIL</font>";
+        return "<font color=\"red\">".
+	    &mt('Failed to copy source').", $!, ".&mt('FAIL')."</font>";
     }
     
 # --------------------------------------------------------------- Copy Metadata
@@ -1425,18 +1456,18 @@ sub phasetwo {
     
     if (copy($source.'.meta',$copyfile)) {
         print $logfile "\nCopied original metadata to ".$copyfile."\n";
-        $r->print('<p>Copied metadata</p>');
+        $r->print('<p>'.&mt('Copied metadata').'</p>');
     } else {
         print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";
         return 
-            "<font color=\"red\">Failed to write metadata copy, $!, FAIL</font>";
+            "<font color=\"red\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</font>";
     }
     $r->rflush;
 # --------------------------------------------------- Send update notifications
 
     my @subscribed=&get_subscribed_hosts($target);
     foreach my $subhost (@subscribed) {
-	$r->print('<p>Notifying host '.$subhost.':');$r->rflush;
+	$r->print('<p>'.&mt('Notifying host').' '.$subhost.':');$r->rflush;
 	print $logfile "\nNotifying host ".$subhost.':';
 	my $reply=&Apache::lonnet::critical('update:'.$target,$subhost);
 	$r->print($reply.'</p><br />');$r->rflush;
@@ -1447,7 +1478,8 @@ sub phasetwo {
 
     my @subscribedmeta=&get_subscribed_hosts("$target.meta");
     foreach my $subhost (@subscribedmeta) {
-	$r->print('<p>Notifying host for metadata only '.$subhost.':');$r->rflush;
+	$r->print('<p>'.
+&mt('Notifying host for metadata only').' '.$subhost.':');$r->rflush;
 	print $logfile "\nNotifying host for metadata only ".$subhost.':';
 	my $reply=&Apache::lonnet::critical('update:'.$target.'.meta',
 					    $subhost);
@@ -1459,7 +1491,7 @@ sub phasetwo {
     my %courses=&coursedependencies($target);
     my $now=time;
     foreach (keys %courses) {
-	$r->print('<p>Notifying course '.$_.':');$r->rflush;
+	$r->print('<p>'.&mt('Notifying course').' '.$_.':');$r->rflush;
 	print $logfile "\nNotifying host ".$_.':';
         my ($cdom,$cname)=split(/\_/,$_);
 	my $reply=&Apache::lonnet::cput
@@ -1492,6 +1524,8 @@ sub phasetwo {
 
 sub batchpublish {
     my ($r,$srcfile,$targetfile)=@_;
+    #publication pollutes %ENV with form.* values
+    my %oldENV=%ENV;
     $srcfile=~s/\/+/\//g;
     $targetfile=~s/\/+/\//g;
     my $thisdisfn=$srcfile;
@@ -1527,6 +1561,7 @@ sub batchpublish {
 	&phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1);
 	$r->print('</p>');
     }
+    %ENV=%oldENV;
     return '';
 }
 
@@ -1629,7 +1664,7 @@ sub handler {
   my $r=shift;
 
   if ($r->header_only) {
-     $r->content_type('text/html');
+     &Apache::loncommon::content_type($r,'text/html');
      $r->send_http_header;
      return OK;
   }
@@ -1722,7 +1757,7 @@ unless ($ENV{'form.phase'} eq 'two') {
 
 # ---------------------------------------------------------- Start page output.
 
-  $r->content_type('text/html');
+  &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;
 
   $r->print('<html><head><title>LON-CAPA Publishing</title></head>');
@@ -1745,9 +1780,9 @@ unless ($ENV{'form.phase'} eq 'two') {
   if ($fn=~/\/$/) {
 # -------------------------------------------------------- This is a directory
       &publishdirectory($r,$fn,$thisdisfn);
-      $r->print('<hr><font size="+2">Done</font><br><a href="/priv/'
+      $r->print('<hr><font size="+2">'.&mt('Done').'</font><br><a href="/priv/'
 		.$cuname.'/'.$thisdisfn
-		.'">Return to Directory</a>');
+		.'">'.&mt('Return to Directory').'</a>');
 
 
   } else {
@@ -1755,7 +1790,7 @@ unless ($ENV{'form.phase'} eq 'two') {
       $thisfn=~/\.(\w+)$/;
       my $thistype=$1;
       my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
-      $r->print('<h2>Publishing '.
+      $r->print('<h2>'.&mt('Publishing').' '.
 		&Apache::loncommon::filedescription($thistype).' <tt>');
 
       $r->print(<<ENDCAPTION);
@@ -1763,18 +1798,19 @@ unless ($ENV{'form.phase'} eq 'two') {
 $thisdisfn</a>
 ENDCAPTION
       $r->print(
-        '</tt></h2><b>Target:</b> <tt>'.$thisdistarget.'</tt><br />');
+        '</tt></h2><b>'.&mt('Target').':</b> <tt>'.$thisdistarget.'</tt><br />');
    
       if (($cuname ne $ENV{'user.name'}) || ($cudom ne $ENV{'user.domain'})) {
-          $r->print('<h3><font color="red">Co-Author: '.$cuname.' at '.$cudom.
+          $r->print('<h3><font color="red">'.&mt('Co-Author').': '.$cuname.&mt(' at ').$cudom.
 		    '</font></h3>');
       }
 
       if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') {
           $r->print(<<ENDDIFF);
 <br />
-<a href='javascript:void(window.open("/adm/diff?filename=/~$cuname/$thisdisfn&versiontwo=priv","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>Diffs with Current Version</a><br />
+<a href='javascript:void(window.open("/adm/diff?filename=/~$cuname/$thisdisfn&versiontwo=priv","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>
 ENDDIFF
+          $r->print(&mt('Diffs with Current Version').'</a><br />');
       }
   
 # ------------------ Publishing from $thisfn to $thistarget with $thisembstyle.