--- loncom/publisher/lonpublisher.pm	2008/08/27 13:07:41	1.247
+++ loncom/publisher/lonpublisher.pm	2009/03/09 20:10:55	1.252
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.247 2008/08/27 13:07:41 raeburn Exp $
+# $Id: lonpublisher.pm,v 1.252 2009/03/09 20:10:55 raeburn 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}; }
@@ -873,7 +874,7 @@ sub store_metadata {
     }
     if (defined($status) && $status ne '') {
         $error='<span class="LC_error">'
-              .&mt('Error occured saving new values in metadata table in LON-CAPA database!')
+              .&mt('Error occurred saving new values in metadata table in LON-CAPA database!')
               .'</span>';
         &Apache::lonnet::logthis($error);
         &Apache::lonnet::logthis($status);
@@ -947,7 +948,7 @@ backup copies, performs any automatic pr
 especially for rat and ssi files),
 
 Returns a 2 element array, the first is the string to be shown to the
-user, the second is an error code, either 1 (an error occured) or 0
+user, the second is an error code, either 1 (an error occurred) or 0
 (no error occurred)
 
 I<Additional documentation needed.>
@@ -1651,7 +1652,7 @@ 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;
                 }
             }
@@ -1877,7 +1878,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 +1949,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;
@@ -1983,7 +1984,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;
 }