--- loncom/publisher/lonpublisher.pm	2005/05/19 03:22:04	1.194
+++ loncom/publisher/lonpublisher.pm	2005/08/30 15:34:07	1.202
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.194 2005/05/19 03:22:04 www Exp $
+# $Id: lonpublisher.pm,v 1.202 2005/08/30 15:34:07 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -355,7 +355,8 @@ sub hiddenfield {
 
 sub checkbox {
     my ($name,$text)=@_;
-    return "\n<br /><input type='checkbox' name='$name' /> ".&mt($text);
+    return "\n<br /><label><input type='checkbox' name='$name' /> ".
+	&mt($text)."</label>";
 }
 
 sub selectbox {
@@ -676,6 +677,7 @@ sub fix_ids_and_indices {
 		    $allow{$token->[2]->{'src'}}=1;
 		    next;
 		}
+		if ($lctag eq 'base') { next; }
 		my %parms=%{$token->[2]};
 		$counter=$addid{$tag};
 		if (!$counter) { $counter=$addid{$lctag}; }
@@ -1020,7 +1022,7 @@ sub publish {
     }
 
 # ------------------------------------------------ First, check out environment
-     unless (-e $source.'.meta') {
+     if ((!(-e $source.'.meta')) || ($env{'form.forceoverride'})) {
         $metadatafields{'author'}=$env{'environment.firstname'}.' '.
 	                          $env{'environment.middlename'}.' '.
 		                  $env{'environment.lastname'}.' '.
@@ -1070,10 +1072,18 @@ sub publish {
 		delete $metadatafields{$_};
             }
         }
+# ------------------------------------------------------------- Save some stuff
+        my %savemeta=();
+        foreach ('title') {
+            $savemeta{$_}=$metadatafields{$_};
+	}
 # ------------------------------------------ See if anything new in file itself
  
 	$allmeta=&parseformeta($source,$style);
-
+# ----------------------------------------------------------- Restore the stuff
+        foreach (keys %savemeta) {
+	    $metadatafields{$_}=$savemeta{$_};
+	}
    }
 
        
@@ -1301,15 +1311,15 @@ END
 				 $defaultsourceoption,
 				 \&Apache::loncommon::source_copyrightdescription,
 				 (&Apache::loncommon::source_copyrightids));
-	$intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights');
+#	$intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights');
 	my $uctitle=&mt('Obsolete');
 	$intr_scrout.=
-	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
+	    "\n<p><label><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
 	    '</b></font> <input type="checkbox" name="obsolete" ';
 	if ($metadatafields{'obsolete'}) {
 	    $intr_scrout.=' checked="1" ';
 	}
-	$intr_scrout.='/ ></p>'.
+	$intr_scrout.='/ ></label></p>'.
 	    &text_with_browse_field('Suggested Replacement for Obsolete File',
 				    'obsoletereplacement',
 				    $metadatafields{'obsoletereplacement'});
@@ -1335,6 +1345,7 @@ END
 	&hiddenfield('copyright',$metadatafields{'copyright'}).
 	&hiddenfield('sourceavail',$metadatafields{'sourceavail'}).
 	&hiddenfield('customdistributionfile',$metadatafields{'customdistributionfile'}).
+	&hiddenfield('obsolete',1).
 	&text_with_browse_field('Suggested Replacement for Obsolete File',
 				    'obsoletereplacement',
 				    $metadatafields{'obsoletereplacement'});
@@ -1374,10 +1385,10 @@ Returns:
 
 =over 4
 
-=item Scalar string
+=item integer
 
-String contains status (errors and warnings) and information associated with
-the server's attempts at publication.     
+0: fail
+1: success
 
 =cut
 
@@ -1389,13 +1400,29 @@ sub phasetwo {
     my ($r,$source,$target,$style,$distarget,$batch)=@_;
     $source=~s/\/+/\//g;
     $target=~s/\/+/\//g;
-
-    if ($target=~/\_\_\_/) {
-	$r->print(
- '<font color="red">'.&mt('Unsupported character combination').
-		  ' "<tt>___</tt>" '.&mt('in filename, FAIL').'</font>');
-        return 0;
+#
+# Unless trying to get rid of something, check name validity
+#
+    unless ($env{'form.obsolete'}) {
+	if ($target=~/(\_\_\_|\&\&\&|\:\:\:)/) {
+	    $r->print(
+		      '<font color="red">'.&mt('Unsupported character combination').
+		      ' "<tt>'.$1.'</tt>" '.&mt('in filename, FAIL').'</font>');
+	    return 0;
+	}
+	unless ($target=~/\.(\w+)$/) {
+	    $r->print('<font color="red">'.&mt('No valid extension found in filename, FAIL').'</font>');
+	    return 0;
+	}
+	if ($target=~/\.(\d+)\.(\w+)$/) {
+	    $r->print('<font color="red">'.&mt('Cannot publish versioned resource, FAIL').'</font>');
+	    return 0;
+	}
     }
+
+#
+# End name check
+#
     $distarget=~s/\/+/\//g;
     my $logfile;
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
@@ -1456,18 +1483,20 @@ sub phasetwo {
     if ($metadatafields{'copyright'} eq 'custom') {
 	my $file=$metadatafields{'customdistributionfile'};
 	unless ($file=~/\.rights$/) {
-            return 
+            $r->print(
                 '<font color="red">'.&mt('No valid custom distribution rights file specified, FAIL').
-		'</font>';
+		'</font>');
+	    return 0;
         }
     }
     {
         print $logfile "\nWrite metadata file for ".$source;
         my $mfh;
         unless ($mfh=Apache::File->new('>'.$source.'.meta')) {
-            return 
+            $r->print( 
                 '<font color="red">'.&mt('Could not write metadata, FAIL').
-		'</font>';
+		'</font>');
+	    return 0;
         }
         foreach (sort keys %metadatafields) {
             unless ($_=~/\./) {
@@ -1518,7 +1547,9 @@ sub phasetwo {
         my $srcd=$1;
         unless ($srcd=~/^\/home\/httpd\/html\/res/) {
             print $logfile "\nPANIC: Target dir is ".$srcd;
-            return "<font color=\"red\">Invalid target directory, FAIL</font>";
+            $r->print(
+	 "<font color=\"red\">Invalid target directory, FAIL</font>");
+	    return 0;
         }
         opendir(DIR,$srcd);
         while ($filename=readdir(DIR)) {
@@ -1543,8 +1574,9 @@ sub phasetwo {
             $r->print('<p>'.&mt('Copied old target file').'</p>');
         } else {
 	    print $logfile "Unable to write ".$copyfile.':'.$!."\n";
-            return "<font color=\"red\">".&mt('Failed to copy old target').
-		", $!, ".&mt('FAIL')."</font>";
+            $r->print("<font color=\"red\">".&mt('Failed to copy old target').
+		", $!, ".&mt('FAIL')."</font>");
+	    return 0;
         }
         
 # --------------------------------------------------------------- Copy Metadata
@@ -1557,9 +1589,10 @@ sub phasetwo {
         } else {
 	    print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
             if (-e $target.'.meta') {
-                return 
+                $r->print( 
                     "<font color=\"red\">".
-&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</font>";
+&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</font>");
+		return 0;
 	    }
         }
         
@@ -1590,8 +1623,9 @@ sub phasetwo {
         $r->print('<p>'.&mt('Copied source file').'</p>');
     } else {
         print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
-        return "<font color=\"red\">".
-	    &mt('Failed to copy source').", $!, ".&mt('FAIL')."</font>";
+        $r->print("<font color=\"red\">".
+	    &mt('Failed to copy source').", $!, ".&mt('FAIL')."</font>");
+	return 0;
     }
     
 # --------------------------------------------------------------- Copy Metadata
@@ -1603,8 +1637,9 @@ sub phasetwo {
         $r->print('<p>'.&mt('Copied metadata').'</p>');
     } else {
         print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";
-        return 
-            "<font color=\"red\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</font>";
+        $r->print(
+            "<font color=\"red\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</font>");
+	return 0;
     }
     $r->rflush;
 
@@ -1614,10 +1649,16 @@ sub phasetwo {
 	$r->register_cleanup(\&notify);
 	$registered_cleanup=1;
     }
+
+# ---------------------------------------------------------- Clear local caches
+    my $thisdistarget=$target;
+    $thisdistarget=~s/^\Q$docroot\E//;
+    &Apache::lonnet::devalidate_cache_new('resversion',$target);
+    &Apache::lonnet::devalidate_cache_new('meta',
+			 &Apache::lonnet::declutter($thisdistarget));
+
 # ------------------------------------------------ Provide link to new resource
     unless ($batch) {
-        my $thisdistarget=$target;
-        $thisdistarget=~s/^\Q$docroot\E//;
         
         my $thissrc=$source;
         $thissrc=~s/^\/home\/(\w+)\/public_html/\/priv\/$1/;
@@ -1636,7 +1677,8 @@ sub phasetwo {
 		  &mt('Back to Source Directory').'</font></a></p>');
     }
     $logfile->close();
-    return '<p><font color="green">'.&mt('Done').'</font></p>';
+    $r->print('<p><font color="green">'.&mt('Done').'</font></p>');
+    return 1;
 }
 
 # =============================================================== Notifications
@@ -1739,17 +1781,9 @@ sub publishdirectory {
 		  &hiddenfield('filename',$env{'form.filename'}).
 		  &checkbox('pubrec','include subdirectories').
 		  &checkbox('forcerepub','force republication of previously published files').
-                  &checkbox('forceobsolete','make file(s) obsolete'));
-        my %allcopyrights=('keep','Keep current copyright');
-        my %ratcopyrights=%allcopyrights;
-        foreach (&Apache::loncommon::copyrightids) {
-            $allcopyrights{$_}=&Apache::loncommon::copyrightdescription($_);
-            unless ($_ eq 'public') { $ratcopyrights{$_}=$allcopyrights{$_}; }
-	}
-        $r->print('<br >'.&mt('Copyright for all files:').&Apache::loncommon::select_form('keep','forceallcopy',%allcopyrights));
-        $r->print('<br >'.&mt('Copyright for pages/sequences:').&Apache::loncommon::select_form('keep','forceratcopy',%ratcopyrights));
-	$r->print(&text_with_browse_field('Custom Distribution File','forcecustomfile'));
-        $r->print('<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>');
+                  &checkbox('forceobsolete','make file(s) obsolete').
+		  &checkbox('forceoverride','force directory level catalog information over existing').
+		  '<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>');
     } else {
 # actually publish things
 	opendir(DIR,$fn);
@@ -2035,6 +2069,7 @@ sub handler {
 	$thisfn=~/\.(\w+)$/;
 	my $thistype=$1;
 	my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
+        if ($thistype eq 'page') {  $thisembstyle = 'rat'; }
 	$r->print('<h2>'.&mt('Publishing').' '.
 		  &Apache::loncommon::filedescription($thistype).' <tt>');
 
@@ -2076,8 +2111,8 @@ ENDDIFF
 			  '</h3>');
 	    }
 	} else {
-	    $r->print('<hr />'.
-	    &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget)); 
+	    &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget); 
+	    $r->print('<hr />');
 	}
     }
     $r->print('</body></html>');