--- loncom/publisher/lonpublisher.pm	2005/05/17 00:46:36	1.193
+++ loncom/publisher/lonpublisher.pm	2005/05/30 16:56:46	1.196
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.193 2005/05/17 00:46:36 www Exp $
+# $Id: lonpublisher.pm,v 1.196 2005/05/30 16:56:46 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -355,7 +355,7 @@ sub hiddenfield {
 
 sub checkbox {
     my ($name,$text)=@_;
-    return "\n<br /><input type='checkbox' name='$name' /> $text";
+    return "\n<br /><input type='checkbox' name='$name' /> ".&mt($text);
 }
 
 sub selectbox {
@@ -1020,7 +1020,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 +1070,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{$_};
+	}
    }
 
        
@@ -1151,16 +1159,17 @@ sub publish {
 
     my $intr_scrout.=
 	'<form name="pubform" action="/adm/publish" method="post">'.
-	'<p><input type="submit" value="'.&mt('Finalize Publication').'" /></p>'.
+	'<p>'.($env{'form.makeobsolete'}?'':'<input type="submit" value="'.&mt('Finalize Publication').'" />').'</p>'.
 	&hiddenfield('phase','two').
 	&hiddenfield('filename',$env{'form.filename'}).
 	&hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).
-	&hiddenfield('dependencies',join(',',keys %allow)).
+	&hiddenfield('dependencies',join(',',keys %allow));
+    unless ($env{'form.makeobsolete'}) {
+       $intr_scrout.=
 	&textfield('Title','title',$metadatafields{'title'}).
 	&textfield('Author(s)','author',$metadatafields{'author'}).
 	&textfield('Subject','subject',$metadatafields{'subject'});
-
-# --------------------------------------------------- Scan content for keywords
+ # --------------------------------------------------- Scan content for keywords
 
     my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords");
     my $KEYWORDS=&mt('Keywords');
@@ -1315,9 +1324,33 @@ END
     } else {
 	$intr_scrout.=&hiddenfield('copyright','private');
     }
+   } else {
+       $intr_scrout.=
+	&hiddenfield('title',$metadatafields{'title'}).
+	&hiddenfield('author',$metadatafields{'author'}).
+	&hiddenfield('subject',$metadatafields{'subject'}).
+	&hiddenfield('keywords',$metadatafields{'keywords'}).
+	&hiddenfield('abstract',$metadatafields{'abstract'}).
+	&hiddenfield('notes',$metadatafields{'notes'}).
+	&hiddenfield('mime',$metadatafields{'mime'}).
+	&hiddenfield('creationdate',$metadatafields{'creationdate'}).
+	&hiddenfield('lastrevisiondate',time).
+	&hiddenfield('owner',$metadatafields{'owner'}).
+	&hiddenfield('lowestgradelevel',$metadatafields{'lowestgradelevel'}).
+	&hiddenfield('standards',$metadatafields{'standards'}).
+	&hiddenfield('highestgradelevel',$metadatafields{'highestgradelevel'}).
+	&hiddenfield('language',$metadatafields{'language'}).
+	&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'});
+   }
     if (!$batch) {
 	$scrout.=$intr_scrout.'<p><input type="submit" value="'.
-	    &mt('Finalize Publication').'" /></p></form>';
+	    &mt($env{'form.makeobsolete'}?'Make Obsolete':'Finalize Publication').'" /></p></form>';
     }
     return($scrout,0);
 }
@@ -1365,13 +1398,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')) {
@@ -1714,8 +1763,10 @@ sub publishdirectory {
 		  &hiddenfield('phase','two').
 		  &hiddenfield('filename',$env{'form.filename'}).
 		  &checkbox('pubrec','include subdirectories').
-		  &checkbox('forcerepub','force republication of previously published files'));
-        $r->print('<input type="submit" value="'.&mt('Publish Directory').'" /></form>');
+		  &checkbox('forcerepub','force republication of previously published files').
+                  &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);