[LON-CAPA-cvs] cvs: loncom /publisher lonpublisher.pm

[www]

www		Tue Apr  1 21:17:10 2003 EDT

  Modified files:              
    /loncom/publisher	lonpublisher.pm 
  Log:
  Bug #1346 - default copyright should be "default", not "custom"
  
  
Index: loncom/publisher/lonpublisher.pm
diff -u loncom/publisher/lonpublisher.pm:1.120 loncom/publisher/lonpublisher.pm:1.121
--- loncom/publisher/lonpublisher.pm:1.120	Sat Mar 29 00:58:12 2003
+++ loncom/publisher/lonpublisher.pm	Tue Apr  1 21:17:10 2003
@@ -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.121 2003/04/02 02:17:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1103,18 +1103,21 @@
 			    $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));
 	    }