--- loncom/publisher/lonpublisher.pm	2008/08/27 13:08:36	1.248
+++ loncom/publisher/lonpublisher.pm	2009/04/03 16:41:13	1.255
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.248 2008/08/27 13:08:36 raeburn Exp $
+# $Id: lonpublisher.pm,v 1.255 2009/04/03 16:41:13 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -695,6 +695,7 @@ sub fix_ids_and_indices {
                     $responsecounter=0;
                 }
                 if ($lctag=~/response$/) { $responsecounter++; }
+                if ($lctag eq 'import') { $responsecounter++; }
 		my %parms=%{$token->[2]};
 		$counter=$addid{$tag};
 		if (!$counter) { $counter=$addid{$lctag}; }
@@ -1061,7 +1062,7 @@ sub publish {
      my %oldparmstores=();
      
     unless ($batch) {
-     $scrout.='<h3>'.&mt('Metadata Information').' ' .
+     $scrout.='<h3>'.&mt('Metadata').' ' .
        &Apache::loncommon::help_open_topic("Metadata_Description")
        . '</h3>';
     }
@@ -1281,11 +1282,11 @@ END
         $keywordout.='<label><input type="checkbox" name="keywords" value="'.$word.'"';
         if ($metadatafields{'keywords'}) {
             if ($metadatafields{'keywords'}=~/\Q$word\E/) {
-                $keywordout.=' checked="on"';
+                $keywordout.=' checked="checked"';
                 $env{'form.keywords'}.=$word.',';
             }
         } elsif (&Apache::loncommon::keyword($word)) {
-            $keywordout.=' checked="on"';
+            $keywordout.=' checked="checked"';
             $env{'form.keywords'}.=$word.',';
         }
         $keywordout.=' />'.$word.'</label></td>';
@@ -1503,7 +1504,7 @@ sub phasetwo {
 	    return 0;
 	}
 	if ($target=~/\.(\d+)\.(\w+)$/) {
-	    $r->print('<span class="LC_error">'.&mt('Cannot publish versioned resource, FAIL').'</span>');
+	    $r->print('<span class="LC_error">'.&mt('Filename of resource contains internal version number. Cannot publish such resources, FAIL').'</span>');
 	    return 0;
 	}
     }
@@ -1651,14 +1652,14 @@ sub phasetwo {
                 unlink($srcd.'/'.$filename);
                 unlink($srcd.'/'.$filename.'.meta');
             } else {
-                if ($filename=~/\Q$srcf\E\.(\d+)\.\Q$srct\E$/) {
+                if ($filename=~/^\Q$srcf\E\.(\d+)\.\Q$srct\E$/) {
                     $maxversion=($1>$maxversion)?$1:$maxversion;
                 }
             }
         }
         closedir(DIR);
         $maxversion++;
-        $r->print('<p>Creating old version '.$maxversion.'</p>');
+        $r->print('<p>'.&mt('Creating old version [_1]',$maxversion).'</p>');
         print $logfile "\nCreating old version ".$maxversion."\n";
         
         my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct;
@@ -1707,8 +1708,12 @@ sub phasetwo {
         $path.="/$parts[$count]";
         if ((-e $path)!=1) {
             print $logfile "\nCreating directory ".$path;
-            $r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>');
             mkdir($path,0777);
+            $r->print('<p>'
+                     .&mt('Created directory [_1]'
+                         ,'<span class="LC_filename">'.$parts[$count].'</span>')
+                     .'</p>'
+            );
         }
     }
     
@@ -1751,9 +1756,12 @@ sub phasetwo {
     &Apache::lonnet::devalidate_cache_new('meta',
 			 &Apache::lonnet::declutter($thisdistarget));
 
+# ------------------------------------------------------------- Everything done
+    $logfile->close();
+    $r->print('<p class="LC_success">'.&mt('Done').'</p>');
+
 # ------------------------------------------------ Provide link to new resource
     unless ($batch) {
-        
         my $thissrc=$source;
         $thissrc=~s{^/home/($match_username)/public_html}{/priv/$1};
         
@@ -1770,8 +1778,6 @@ sub phasetwo {
                    '"><font size="+2">'.
 		  &mt('Back to Source Directory').'</font></a></p>');
     }
-    $logfile->close();
-    $r->print('<p><font color="green">'.&mt('Done').'</font></p>');
     return 1;
 }
 
@@ -1838,7 +1844,11 @@ sub batchpublish {
 
     my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
      
-    $r->print('<h2>'.&mt('Publishing').' <tt>'.$thisdisfn.'</tt></h2>');
+    $r->print('<h2>'
+             .&mt('Publishing [_1]'
+                 ,'<span class="LC_filename">'.$thisdisfn.'</span>')
+             .'</h2>'
+    );
 
 # phase one takes
 #  my ($source,$target,$style,$batch)=@_;
@@ -1877,7 +1887,7 @@ sub publishdirectory {
 		  &checkbox('pubrec','include subdirectories').
 		  &checkbox('forcerepub','force republication of previously published files').
                   &checkbox('obsolete','make file(s) obsolete').
-		  &checkbox('forceoverride','force directory level catalog information over existing').
+		  &checkbox('forceoverride','force directory level metadata over existing').
 		  '<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>');
         $lock=0;
     } else {
@@ -1948,7 +1958,7 @@ sub defaultmetapublish {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
-    $r->print(&Apache::loncommon::start_page('Catalog Information Publication'));
+    $r->print(&Apache::loncommon::start_page('Metadata Publication'));
 
 # ---------------------------------------------------------------- Write Source
     my $copyfile=$target;
@@ -1960,8 +1970,12 @@ sub defaultmetapublish {
     for ($count=5;$count<$#parts;$count++) {
         $path.="/$parts[$count]";
         if ((-e $path)!=1) {
-            $r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>');
             mkdir($path,0777);
+            $r->print('<p>'
+                     .&mt('Created directory [_1]'
+                         ,'<span class="LC_filename">'.$parts[$count].'</span>')
+                     .'</p>'
+            );
         }
     }
     
@@ -1983,7 +1997,7 @@ sub defaultmetapublish {
 # ------------------------------------------------------------------- Link back
     my $link=$fn;
     $link=~s/^\/home\/$cuname\/public_html\//\/priv\/$cuname\//;
-    $r->print("<a href='$link'>".&mt('Back to Catalog Information').'</a>');
+    $r->print("<a href='$link'>".&mt('Back to Metadata').'</a>');
     $r->print(&Apache::loncommon::end_page());
     return OK;
 }
@@ -2168,7 +2182,11 @@ sub handler {
 	my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
         if ($thistype eq 'page') {  $thisembstyle = 'rat'; }
 
-	$r->print('<h2>'.&mt('Publishing [_1]','<tt>'.$thisdisfn.'</tt>').'</h2>');
+        $r->print('<h2>'
+                 .&mt('Publishing [_1]'
+                     ,'<span class="LC_filename">'.$thisdisfn.'</span>')
+                 .'</h2>'
+        );
 
         $r->print('<h3>'.&mt('Resource Details').'</h3>');