--- loncom/publisher/lonpublisher.pm	2006/09/27 21:04:13	1.214
+++ loncom/publisher/lonpublisher.pm	2006/12/06 22:22:39	1.215
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.214 2006/09/27 21:04:13 albertel Exp $
+# $Id: lonpublisher.pm,v 1.215 2006/12/06 22:22:39 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -129,8 +129,7 @@ use Apache::loncfile;
 use LONCAPA::lonmetadata;
 use Apache::lonmsg;
 use vars qw(%metadatafields %metadatakeys);
-use lib '/home/httpd/lib/perl/';
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
  
 
 my %addid;
@@ -281,9 +280,8 @@ sub metaread {
 sub coursedependencies {
     my $url=&Apache::lonnet::declutter(shift);
     $url=~s/\.meta$//;
-    my ($adomain,$aauthor)=($url=~/^(\w+)\/(\w+)\//);
-    my $regexp=$url;
-    $regexp=~s/(\W)/\\$1/g;
+    my ($adomain,$aauthor)=($url=~ m{^($match_domain)/($match_username)/});
+    my $regexp=quotemeta($url);
     $regexp='___'.$regexp.'___course';
     my %evaldata=&Apache::lonnet::dump('nohist_resevaldata',$adomain,
 				       $aauthor,$regexp);
@@ -987,7 +985,7 @@ sub publish {
                    my %temphash=(&Apache::lonnet::declutter($target).'___'.
                              &Apache::lonnet::declutter($thisdep).'___usage'
                                  => time);
-                   $thisdep=~/^\/res\/(\w+)\/(\w+)\//;
+                   $thisdep=~m{^/res/($match_domain)/($match_username)/};
                    if ((defined($1)) && (defined($2))) {
                       &Apache::lonnet::put('nohist_resevaldata',\%temphash,
 					   $1,$2);
@@ -1669,7 +1667,7 @@ sub phasetwo {
     unless ($batch) {
         
         my $thissrc=$source;
-        $thissrc=~s/^\/home\/(\w+)\/public_html/\/priv\/$1/;
+        $thissrc=~s{^/home/($match_username)/public_html}{/priv/$1};
         
         my $thissrcdir=$thissrc;
         $thissrcdir=~s/\/[^\/]+$/\//;
@@ -1994,8 +1992,8 @@ sub handler {
 	return HTTP_NOT_ACCEPTABLE;
     }
 
-    $fn=~s/^http\:\/\/[^\/]+//;
-    $fn=~s/^\/\~(\w+)/\/home\/$1\/public_html/;
+    $fn=~s{^http://[^/]+}{};
+    $fn=~s{^/~($match_username)}{/home/$1/public_html};
 
     my $targetdir='';
     $docroot=$r->dir_config('lonDocRoot');