--- loncom/publisher/lonpublisher.pm	2007/07/13 19:23:33	1.226
+++ loncom/publisher/lonpublisher.pm	2008/02/13 14:18:59	1.230
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.226 2007/07/13 19:23:33 albertel Exp $
+# $Id: lonpublisher.pm,v 1.230 2008/02/13 14:18:59 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -344,8 +344,8 @@ sub text_with_browse_field {
     return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".
            "</b></font></p><br />".
            '<input type="text" name="'.$name.'" size=80 value="'.$value.'" />'.
-	   '<a href="javascript:openbrowser(\'pubform\',\''.$name.'\',\''.$restriction.'\');">Select</a>&nbsp;'.
-	   '<a href="javascript:opensearcher(\'pubform\',\''.$name.'\');">Search</a>';
+	   '<a href="javascript:openbrowser(\'pubform\',\''.$name.'\',\''.$restriction.'\');">'.&mt('Select').'</a>&nbsp;'.
+	   '<a href="javascript:opensearcher(\'pubform\',\''.$name.'\');">'.&mt('Search').'</a>';
 	   
 }
 
@@ -841,8 +841,9 @@ sub store_metadata {
     if (($metadata{'obsolete'}) || ($metadata{'copyright'} eq 'priv') ||
 	($metadata{'copyright'} eq 'custom')) {
         # remove this entry
-	$status=&LONCAPA::lonmetadata::delete_metadata($dbh,undef,
-                                                       $metadata{'url'});
+	my $delitem = 'url = '.$dbh->quote($metadata{'url'});
+	$status = &LONCAPA::lonmetadata::delete_metadata($dbh,undef,$delitem);
+                                                       
     } else {
         $status = &LONCAPA::lonmetadata::update_metadata($dbh,undef,undef,
                                                          \%metadata);
@@ -1130,6 +1131,11 @@ sub publish {
 	    '</span></h1><p><span class="LC_warning">'.
 	    &mt('If this resource is in active use, student performance data from the previous version may become inaccessible.').'</span></p><hr />';
     }
+    if ($metadatafields{'copyright'} eq 'priv') {
+        $scrout.='</p><h1><span class="LC_warning">'.&mt('Warning!').
+            '</span></h1><p><span class="LC_warning">'.
+            &mt('Copyright/distribution option "Private" is no longer supported. Select another option from below. Consider "Custom Rights" for maximum control over the usage of your resource.').'</span></p><hr />';
+    }
 
 # ------------------------------------------------------- Now have all metadata
 
@@ -1289,6 +1295,9 @@ END
 	$metadatafields{'copyright'}='default';
 	$metadatafields{'sourceavail'}='open';
     }
+    if ($metadatafields{'copyright'} eq 'priv') {
+        $metadatafields{'copyright'}='domain';
+    }
 # ------------------------------------------------ Dial in reasonable defaults
     my $defaultoption=$metadatafields{'copyright'};
     unless ($defaultoption) { $defaultoption='default'; }
@@ -1305,12 +1314,12 @@ END
 	    $intr_scrout.=&selectbox('Copyright/Distribution','copyright',
 				     $defaultoption,
 				     \&Apache::loncommon::copyrightdescription,
-				    (grep !/^public$/,(&Apache::loncommon::copyrightids)));
+				    (grep !/^(public|priv)$/,(&Apache::loncommon::copyrightids)));
 	} else {
 	    $intr_scrout.=&selectbox('Copyright/Distribution','copyright',
 				     $defaultoption,
 				     \&Apache::loncommon::copyrightdescription,
-				     (&Apache::loncommon::copyrightids));
+				     (grep !/^priv$/,(&Apache::loncommon::copyrightids)));
 	}
 	my $copyright_help =
 	    Apache::loncommon::help_open_topic('Publishing_Copyright');
@@ -1440,6 +1449,11 @@ sub phasetwo {
 		&mt('No write permission to user directory, FAIL').'</span>');
         return 0;
     }
+    
+    if ($source =~ /\.rights$/) {
+	$r->print('<p><span class="LC_warning">'.&mt('Warning: It can take up to 1 hour for rights changes to fully propagate.').'</span></p>');
+    }
+
     print $logfile 
         "\n================= Publish ".localtime()." Phase Two  ================\n".$env{'user.name'}.':'.$env{'user.domain'}."\n";