--- loncom/publisher/lonpublisher.pm	2009/11/24 00:59:48	1.249.2.2
+++ loncom/publisher/lonpublisher.pm	2009/02/11 11:49:22	1.251
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.249.2.2 2009/11/24 00:59:48 raeburn Exp $
+# $Id: lonpublisher.pm,v 1.251 2009/02/11 11:49:22 schafran Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1640,8 +1640,7 @@ sub phasetwo {
         my $srcf=$2;
         my $srct=$3;
         my $srcd=$1;
-        my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};
-        unless ($srcd=~/^\Q$docroot\E\/res/) {
+        unless ($srcd=~/^\/home\/httpd\/html\/res/) {
             print $logfile "\nPANIC: Target dir is ".$srcd;
             $r->print(
 	 "<span class=\"LC_error\">".&mt('Invalid target directory, FAIL')."</span>");
@@ -1653,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;
                 }
             }
@@ -1879,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 {
@@ -1950,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;
@@ -1985,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;
 }