--- loncom/publisher/lonpublisher.pm	2008/02/14 21:29:08	1.231
+++ 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.231 2008/02/14 21:29:08 www 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>
@@ -964,14 +966,13 @@ 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]. '.
-                           'You likely need to explicitly allow access to all possible dependencies using the [_2]-tag',
-                           '<tt>'.$thisdep.'</tt>','<tt>&lt;allow&gt;</tt>').'</span>'; 
+              $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.'" />';
@@ -1745,6 +1746,7 @@ sub notify {
 	print $logfile "\n============ Done ============\n";
 	$logfile->close();
     }
+    if ($lock) { &Apache::lonnet::remove_lock($lock); }
     return OK;
 }
 
@@ -1814,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));