--- loncom/publisher/lonpublisher.pm	2003/02/03 18:03:53	1.108
+++ loncom/publisher/lonpublisher.pm	2003/02/18 23:13:54	1.111
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.108 2003/02/03 18:03:53 harris41 Exp $
+# $Id: lonpublisher.pm,v 1.111 2003/02/18 23:13:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -117,7 +117,6 @@ use File::Copy;
 use Apache::Constants qw(:common :http :methods);
 use HTML::LCParser;
 use Apache::lonxml;
-use Apache::lonhomework;
 use Apache::loncacc;
 use DBI;
 use Apache::lonnet();
@@ -949,7 +948,9 @@ sub publish {
         my $oldenv=$ENV{'request.uri'};
 
         $ENV{'request.uri'}=$target;
+	$Apache::lonxml::debug=1;
         $allmeta=Apache::lonxml::xmlparse(undef,'meta',$content);
+	$Apache::lonxml::debug=0;
         $ENV{'request.uri'}=$oldenv;
 
         &metaeval($allmeta);
@@ -1199,11 +1200,18 @@ sub phasetwo {
     my ($r,$source,$target,$style,$distarget,$batch)=@_;
     $source=~s/\/+/\//g;
     $target=~s/\/+/\//g;
+
+    if ($target=~/\_\_\_/) {
+	$r->print(
+ '<font color=red>Unsupported character combination "<tt>___</tt>" in filename, FAIL</font>');
+        return 0;
+    }
     $distarget=~s/\/+/\//g;
     my $logfile;
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
-	return 
-            '<font color=red>No write permission to user directory, FAIL</font>';
+	$r->print(
+        '<font color=red>No write permission to user directory, FAIL</font>');
+        return 0;
     }
     print $logfile 
         "\n================= Publish ".localtime()." Phase Two  ================\n";