--- loncom/publisher/lonpublisher.pm	2004/06/18 16:02:18	1.173
+++ loncom/publisher/lonpublisher.pm	2004/06/18 16:52:19	1.174
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.173 2004/06/18 16:02:18 www Exp $
+# $Id: lonpublisher.pm,v 1.174 2004/06/18 16:52:19 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -199,7 +199,8 @@ sub metaeval {
 		}
 	    }
 	    my $newentry=$parser->get_text('/'.$entry);
-	    if ($entry eq 'customdistributionfile') {
+	    if (($entry eq 'customdistributionfile') ||
+		($entry eq 'sourcerights')) {
 		$newentry=~s/^\s*//;
 		if ($newentry !~m|^/res|) { $newentry=$prefix.$newentry; }
 	    }
@@ -1210,11 +1211,15 @@ END
 	$metadatafields{'copyright'}='default';
 	$metadatafields{'sourceavail'}='open';
     }
-# -------------------------------------------------- Correct copyright for rat.
+# ------------------------------------------------ Dial in reasonable defaults
     my $defaultoption=$metadatafields{'copyright'};
     unless ($defaultoption) { $defaultoption='default'; }
+    my $defaultsourceoption=$metadatafields{'sourceavail'};
+    unless ($defaultsourceoption) { $defaultsourceoption='closed'; }
     unless ($style eq 'prv') {
+# -------------------------------------------------- Correct copyright for rat.
 	if ($style eq 'rat') {
+# -------------------------------------- Retrofix for non-applicable copyright
 	    if ($metadatafields{'copyright'} eq 'public') { 
 		delete $metadatafields{'copyright'};
 		$defaultoption='default';
@@ -1223,39 +1228,38 @@ END
 				     $defaultoption,
 				     \&Apache::loncommon::copyrightdescription,
 				    (grep !/^public$/,(&Apache::loncommon::copyrightids)));
-	    } else {
-		$intr_scrout.=&selectbox('Copyright/Distribution','copyright',
-				    $defaultoption,
-				    \&Apache::loncommon::copyrightdescription,
-				    (&Apache::loncommon::copyrightids));
-	    }
-    
-	    my $copyright_help =
-		Apache::loncommon::help_open_topic('Publishing_Copyright');
-	    $intr_scrout =~ s/DISTRIBUTION:/'DISTRIBUTION: ' . $copyright_help/ge;
-	    $intr_scrout.=&textfield('Custom Distribution File','customdistributionfile',
-				$metadatafields{'customdistributionfile'}).
-				    $copyright_help;
-	    $intr_scrout.=&selectbox('Source Distribution','sourceavail',
-				    $defaultoption,
-				    \&Apache::loncommon::source_copyrightdescription,
-				    (&Apache::loncommon::source_copyrightids));
-		 $intr_scrout.=&textfield('Source Custom Distribution File','sourcerights',
-				$metadatafields{'sourcerights'});
-	    my $uctitle=&mt('Obsolete');
-            $intr_scrout.=
-		"\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
-		'</b></font> <input type="checkbox" name="obsolete" ';
-	    if ($metadatafields{'obsolete'}) {
-		$intr_scrout.=' checked="1" ';
-	    }
-	    $intr_scrout.='/ ></p>'.
-		&textfield('Suggested Replacement for Obsolete File',
-				    'obsoletereplacement',
-				    $metadatafields{'obsoletereplacement'});
 	} else {
-	    $intr_scrout.=&hiddenfield('copyright','private');
+	    $intr_scrout.=&selectbox('Copyright/Distribution','copyright',
+				     $defaultoption,
+				     \&Apache::loncommon::copyrightdescription,
+				     (&Apache::loncommon::copyrightids));
 	}
+	my $copyright_help =
+	    Apache::loncommon::help_open_topic('Publishing_Copyright');
+	$intr_scrout =~ s/DISTRIBUTION:/'DISTRIBUTION: ' . $copyright_help/ge;
+	$intr_scrout.=&textfield('Custom Distribution File','customdistributionfile',
+				 $metadatafields{'customdistributionfile'}).
+				     $copyright_help;
+	$intr_scrout.=&selectbox('Source Distribution','sourceavail',
+				 $defaultsourceoption,
+				 \&Apache::loncommon::source_copyrightdescription,
+				 (&Apache::loncommon::source_copyrightids));
+		 $intr_scrout.=&textfield('Source Custom Distribution File','sourcerights',
+					  $metadatafields{'sourcerights'});
+	my $uctitle=&mt('Obsolete');
+	$intr_scrout.=
+	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
+	    '</b></font> <input type="checkbox" name="obsolete" ';
+	if ($metadatafields{'obsolete'}) {
+	    $intr_scrout.=' checked="1" ';
+	}
+	$intr_scrout.='/ ></p>'.
+	    &textfield('Suggested Replacement for Obsolete File',
+		       'obsoletereplacement',
+		       $metadatafields{'obsoletereplacement'});
+    } else {
+	$intr_scrout.=&hiddenfield('copyright','private');
+    }
     if (!$batch) {
 	$scrout.=$intr_scrout.'<p><input type="submit" value="'.
 	    &mt('Finalize Publication').'" /></p></form>';