--- loncom/publisher/lonpublisher.pm	2007/08/07 01:52:44	1.228
+++ loncom/publisher/lonpublisher.pm	2008/05/12 23:47:49	1.234
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.228 2007/08/07 01:52:44 albertel Exp $
+# $Id: lonpublisher.pm,v 1.234 2008/05/12 23:47:49 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -143,6 +143,8 @@ my $cudom;
 my $registered_cleanup;
 my $modified_urls;
 
+my $lock;
+
 =pod
 
 =item B<metaeval>
@@ -344,8 +346,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>';
 	   
 }
 
@@ -964,18 +966,23 @@ sub publish {
     
 	$scrout.='<h3>'.&mt('Dependencies').'</h3>';
         my $allowstr='';
-        foreach (sort(keys(%allow))) {
-	   my $thisdep=$_;
+        foreach my $thisdep (sort(keys(%allow))) {
 	   if ($thisdep !~ /[^\s]/) { next; }
+           if ($thisdep =~/\$/) {
+              $scrout.='<br /><span class="LC_warning">'
+                       .&mt('The resource depends on another resource with variable filename, i.e., [_1].','<tt>'.$thisdep.'</tt>').'<br />'
+                       .&mt('You likely need to explicitly allow access to all possible dependencies using the [_1]-tag.','<tt>&lt;allow&gt;</tt>')
+                       .'</span><br />';
+           }
            unless ($style eq 'rat') { 
               $allowstr.="\n".'<allow src="'.$thisdep.'" />';
 	   }
            $scrout.='<br />';
-           if ($thisdep!~/\*/ && $thisdep!~m|^/adm/|) {
+           if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) {
 	       $scrout.='<a href="'.$thisdep.'">';
            }
            $scrout.='<tt>'.$thisdep.'</tt>';
-           if ($thisdep!~/\*/ && $thisdep!~m|^/adm/|) {
+           if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) {
 	       $scrout.='</a>';
                if (
        &Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'.
@@ -1131,6 +1138,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
 
@@ -1290,6 +1302,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'; }
@@ -1306,12 +1321,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');
@@ -1731,6 +1746,7 @@ sub notify {
 	print $logfile "\n============ Done ============\n";
 	$logfile->close();
     }
+    if ($lock) { &Apache::lonnet::remove_lock($lock); }
     return OK;
 }
 
@@ -1800,7 +1816,9 @@ sub publishdirectory {
                   &checkbox('obsolete','make file(s) obsolete').
 		  &checkbox('forceoverride','force directory level catalog information over existing').
 		  '<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>');
+        $lock=0;
     } else {
+        unless ($lock) { $lock=&Apache::lonnet::set_lock(&mt('Publishing [_1]',$fn)); }
 # actually publish things
 	opendir(DIR,$fn);
 	my @files=sort(readdir(DIR));