--- loncom/publisher/lonpublisher.pm	2003/03/29 05:58:12	1.120
+++ loncom/publisher/lonpublisher.pm	2003/09/24 19:40:14	1.126.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.120 2003/03/29 05:58:12 albertel Exp $
+# $Id: lonpublisher.pm,v 1.126.2.2 2003/09/24 19:40:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -190,7 +190,7 @@ sub metaeval {
               }
               if ($metadatafields{$unikey}) {
 		  my $newentry=$parser->get_text('/'.$entry);
-                  unless (($metadatafields{$unikey}=~/$newentry/) ||
+                  unless (($metadatafields{$unikey}=~/\Q$newentry\E/) ||
                           ($newentry eq '')) {
                      $metadatafields{$unikey}.=', '.$newentry;
 		  }
@@ -304,7 +304,9 @@ string which presents the form field (fo
 #########################################
 sub textfield {
     my ($title,$name,$value)=@_;
-    return "\n<p><b>$title:</b></p><br />".
+    my $uctitle=uc($title);
+    return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
+           "</b></font></p><br />".
            '<input type="text" name="'.$name.'" size=80 value="'.$value.'" />';
 }
 
@@ -316,8 +318,9 @@ sub hiddenfield {
 sub selectbox {
     my ($title,$name,$value,$functionref,@idlist)=@_;
     my $uctitle=uc($title);
+    $value=(split(/\s*,\s*/,$value))[-1];
     my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
-	"</b></font></p><br />".'<select name="'.$name.'">';
+	'</b></font></p><br /><select name="'.$name.'">';
     foreach (@idlist) {
         $selout.='<option value=\''.$_.'\'';
         if ($_ eq $value) {
@@ -644,7 +647,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,
@@ -695,8 +701,9 @@ sub fix_ids_and_indices {
 		}
 		if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }
 		$outstring.='<'.$tag.$newparmstring.$endtag.'>';
-		if ($lctag eq 'm') {
-		    $outstring.=&get_all_text_unbalanced('/m',\@parser);
+		if ($lctag eq 'm' || $lctag eq 'script' 
+                    || $lctag eq 'display' || $lctag eq 'tex') {
+		    $outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser);
 		}
 	    } elsif ($token->[0] eq 'E') {
 		if ($token->[2]) {
@@ -812,7 +819,7 @@ sub publish {
 	return ('<font color="red">No write permission to user directory, FAIL</font>',1);
     }
     print $logfile 
-"\n\n================= Publish ".localtime()." Phase One  ================\n";
+"\n\n================= Publish ".localtime()." Phase One  ================\n".$ENV{'user.name'}.'@'.$ENV{'user.domain'}."\n";
 
     if (($style eq 'ssi') || ($style eq 'rat') || ($style eq 'prv')) {
 # ------------------------------------------------------- This needs processing
@@ -907,11 +914,14 @@ 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
 
         my $thisdisfn=$source;
-        $thisdisfn=~s/^\/home\/$cuname\///;
+        $thisdisfn=~s/^\/home\/\Q$cuname\E\///;
 
         my @urlparts=split(/\//,$thisdisfn);
         $#urlparts--;
@@ -1042,7 +1052,8 @@ function uncheckAll(field) {
         field[i].checked = false ;
 }
 </script>
-<p><b>Keywords: $keywords_help</b> 
+<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)" /> 
 </p>
@@ -1054,7 +1065,7 @@ END
 	foreach (sort keys %keywords) {
 	    $keywordout.='<td><input type="checkbox" name="keywords" value="'.$_.'"';
 	    if ($metadatafields{'keywords'}) {
-		if ($metadatafields{'keywords'}=~/$_/) {
+		if ($metadatafields{'keywords'}=~/\Q$_\E/) {
 		    $keywordout.=' checked="on"';
 		}
 	    } elsif (&Apache::loncommon::keyword($_)) {
@@ -1077,15 +1088,22 @@ END
 	$scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
 
 	$scrout.=
-	    '<p><b>Abstract:</b><br /><textarea cols="80" rows="5" name="abstract">'.
+	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>ABSTRACT:".
+	    "</b></font></p><br />".
+	    '<textarea cols="80" rows="5" name="abstract">'.
 	    $metadatafields{'abstract'}.'</textarea></p>';
 
 	$source=~/\.(\w+)$/;
 
 	$scrout.=&hiddenfield('mime',$1);
 
+	my $defaultlanguage=$metadatafields{'language'};
+	$defaultlanguage =~ s/\s*notset\s*//g;
+	$defaultlanguage =~ s/^,\s*//g;
+	$defaultlanguage =~ s/,\s*$//g;
+
 	$scrout.=&selectbox('Language','language',
-			    $metadatafields{'language'},
+			    $defaultlanguage,
 			    \&Apache::loncommon::languagedescription,
 			    (&Apache::loncommon::languageids),
 			   );
@@ -1103,18 +1121,21 @@ END
 			    $metadatafields{'owner'});
 
 # -------------------------------------------------- Correct copyright for rat.
+        my $defaultoption=$metadatafields{'copyright'};
+        unless ($defaultoption) { $defaultoption='default'; }
 	unless ($style eq 'prv') {
 	    if ($style eq 'rat') {
 		if ($metadatafields{'copyright'} eq 'public') { 
 		    delete $metadatafields{'copyright'};
+                    $defaultoption='default';
 		}
 		$scrout.=&selectbox('Copyright/Distribution','copyright',
-				    $metadatafields{'copyright'},
+				    $defaultoption,
 				    \&Apache::loncommon::copyrightdescription,
 				    (grep !/^public$/,(&Apache::loncommon::copyrightids)));
 	    } else {
 		$scrout.=&selectbox('Copyright/Distribution','copyright',
-				    $metadatafields{'copyright'},
+				    $defaultoption,
 				    \&Apache::loncommon::copyrightdescription,
 				    (&Apache::loncommon::copyrightids));
 	    }
@@ -1141,7 +1162,7 @@ END
 	$ENV{'form.keywords'}='';
 	foreach (keys %keywords) {
 	    if ($metadatafields{'keywords'}) {
-		if ($metadatafields{'keywords'}=~/$_/) { 
+		if ($metadatafields{'keywords'}=~/\Q$_\E/) { 
 		    $ENV{'form.keywords'}.=$_.','; 
 		}
 	    } elsif (&Apache::loncommon::keyword($_)) {
@@ -1217,7 +1238,7 @@ sub phasetwo {
         return 0;
     }
     print $logfile 
-        "\n================= Publish ".localtime()." Phase Two  ================\n";
+        "\n================= Publish ".localtime()." Phase Two  ================\n".$ENV{'user.name'}.'@'.$ENV{'user.domain'}."\n";
     
     %metadatafields=();
     %metadatakeys=();
@@ -1324,7 +1345,7 @@ sub phasetwo {
         closedir(DIR);
         $maxversion++;
         $r->print('<p>Creating old version '.$maxversion.'</p>');
-        print $logfile "\nCreating old version ".$maxversion;
+        print $logfile "\nCreating old version ".$maxversion."\n";
         
         my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct;
         
@@ -1432,7 +1453,7 @@ sub phasetwo {
 # ------------------------------------------------ Provide link to new resource
     unless ($batch) {
         my $thisdistarget=$target;
-        $thisdistarget=~s/^$docroot//;
+        $thisdistarget=~s/^\Q$docroot\E//;
         
         my $thissrc=$source;
         $thissrc=~s/^\/home\/(\w+)\/public_html/\/priv\/$1/;
@@ -1462,7 +1483,7 @@ sub batchpublish {
 
     my $docroot=$r->dir_config('lonDocRoot');
     my $thisdistarget=$targetfile;
-    $thisdistarget=~s/^$docroot//;
+    $thisdistarget=~s/^\Q$docroot\E//;
 
 
     undef %metadatafields;
@@ -1529,7 +1550,7 @@ sub publishdirectory {
 	        $ruid,$rgid,$rrdev,$rsize,
 	        $ratime,$rmtime,$rctime,
 	        $rblksize,$rblocks)=stat($resdir.'/'.$filename);
-	        if ($rmtime<$cmtime) {
+	        if (($rmtime<$cmtime) || ($ENV{'form.forcerepub'})) {
 # previously published, modified now
 		    $publishthis=1;
                 }
@@ -1699,10 +1720,10 @@ unless ($ENV{'form.phase'} eq 'two') {
   $thistarget=~s/\/public\_html//;
 
   my $thisdistarget=$thistarget;
-  $thisdistarget=~s/^$docroot//;
+  $thisdistarget=~s/^\Q$docroot\E//;
 
   my $thisdisfn=$thisfn;
-  $thisdisfn=~s/^\/home\/$cuname\/public_html\///;
+  $thisdisfn=~s/^\/home\/\Q$cuname\E\/public_html\///;
 
   if ($fn=~/\/$/) {
 # -------------------------------------------------------- This is a directory
@@ -1752,5 +1773,7 @@ __END__
 
 =back
 
+=back
+
 =cut