--- loncom/publisher/lonpublisher.pm	2003/03/07 17:52:37	1.113
+++ loncom/publisher/lonpublisher.pm	2003/03/14 02:26:12	1.115
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.113 2003/03/07 17:52:37 albertel Exp $
+# $Id: lonpublisher.pm,v 1.115 2003/03/14 02:26:12 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -809,7 +809,7 @@ sub publish {
     my %allow=();
 
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
-	return ('<font color=red>No write permission to user directory, FAIL</font>',1);
+	return ('<font color="red">No write permission to user directory, FAIL</font>',1);
     }
     print $logfile 
 "\n\n================= Publish ".localtime()." Phase One  ================\n";
@@ -823,7 +823,7 @@ sub publish {
 	    print $logfile "Copied original file to ".$copyfile."\n";
         } else {
 	    print $logfile "Unable to write backup ".$copyfile.':'.$!."\n";
-	    return ("<font color=red>Failed to write backup copy, $!,FAIL</font>",1);
+	    return ("<font color=\"red\">Failed to write backup copy, $!,FAIL</font>",1);
         }
 # ------------------------------------------------------------- IDs and indices
 	
@@ -1105,7 +1105,8 @@ END
                             $metadatafields{'owner'});
 
 # -------------------------------------------------- Correct copyright for rat.
-    if ($style eq 'rat') {
+   unless ($style eq 'prv') {
+     if ($style eq 'rat') {
 	if ($metadatafields{'copyright'} eq 'public') { 
 	    delete $metadatafields{'copyright'};
 	}
@@ -1113,17 +1114,22 @@ END
                             $metadatafields{'copyright'},
 			    \&Apache::loncommon::copyrightdescription,
 		     (grep !/^public$/,(&Apache::loncommon::copyrightids)));
-    }
-    else {
+     } else {
         $scrout.=&selectbox('Copyright/Distribution','copyright',
                             $metadatafields{'copyright'},
 			    \&Apache::loncommon::copyrightdescription,
-			     (&Apache::loncommon::copyrightids));
-    }
+			    (&Apache::loncommon::copyrightids));
+     }
 
-    my $copyright_help =
+     my $copyright_help =
         Apache::loncommon::help_open_topic('Publishing_Copyright');
-    $scrout =~ s/DISTRIBUTION:/'DISTRIBUTION: ' . $copyright_help/ge;
+     $scrout =~ s/DISTRIBUTION:/'DISTRIBUTION: ' . $copyright_help/ge;
+     $scrout.=&textfield('Custom Distribution File','customdistributionfile',
+                     $metadatafields{'customdistributionfile'}).
+                $copyright_help;
+    } else {
+     $scrout.=&hiddenfield('copyright','private');
+    }
     return ($scrout.'<p><input type="submit" value="Finalize Publication" /></p></form>',0);
 # =============================================================================
 # BATCH MODE
@@ -1202,14 +1208,14 @@ sub phasetwo {
 
     if ($target=~/\_\_\_/) {
 	$r->print(
- '<font color=red>Unsupported character combination "<tt>___</tt>" in filename, FAIL</font>');
+ '<font color="red">Unsupported character combination "<tt>___</tt>" 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">No write permission to user directory, FAIL</font>');
         return 0;
     }
     print $logfile 
@@ -1231,6 +1237,8 @@ sub phasetwo {
     $metadatafields{'lastrevisiondate'}=$ENV{'form.lastrevisiondate'};
     $metadatafields{'owner'}=$ENV{'form.owner'};
     $metadatafields{'copyright'}=$ENV{'form.copyright'};
+    $metadatafields{'customdistributionfile'}=
+                                 $ENV{'form.customdistributionfile'};
     $metadatafields{'dependencies'}=$ENV{'form.dependencies'};
     
     my $allkeywords=$ENV{'form.addkey'};
@@ -1250,7 +1258,7 @@ sub phasetwo {
         my $mfh;
         unless ($mfh=Apache::File->new('>'.$source.'.meta')) {
             return 
-                '<font color=red>Could not write metadata, FAIL</font>';
+                '<font color="red">Could not write metadata, FAIL</font>';
         }
         foreach (sort keys %metadatafields) {
             unless ($_=~/\./) {
@@ -1302,7 +1310,7 @@ 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>";
+            return "<font color=\"red\">Invalid target directory, FAIL</font>";
         }
         opendir(DIR,$srcd);
         while ($filename=readdir(DIR)) {
@@ -1327,7 +1335,7 @@ sub phasetwo {
             $r->print('<p>Copied old target file');
         } else {
 	    print $logfile "Unable to write ".$copyfile.':'.$!."\n";
-            return "<font color=red>Failed to copy old target, $!, FAIL</font>";
+            return "<font color=\"red\">Failed to copy old target, $!, FAIL</font>";
         }
         
 # --------------------------------------------------------------- Copy Metadata
@@ -1341,7 +1349,7 @@ sub phasetwo {
 	    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\">Failed to write old metadata copy, $!, FAIL</font>";
 	    }
         }
         
@@ -1372,7 +1380,7 @@ sub phasetwo {
         $r->print('<p>Copied source file');
     } else {
         print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
-        return "<font color=red>Failed to copy source, $!, FAIL</font>";
+        return "<font color=\"red\">Failed to copy source, $!, FAIL</font>";
     }
     
 # --------------------------------------------------------------- Copy Metadata
@@ -1385,7 +1393,7 @@ sub phasetwo {
     } else {
         print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";
         return 
-            "<font color=red>Failed to write metadata copy, $!, FAIL</font>";
+            "<font color=\"red\">Failed to write metadata copy, $!, FAIL</font>";
     }
     $r->rflush;
 # --------------------------------------------------- Send update notifications