--- loncom/publisher/lonpublisher.pm 2003/02/18 13:20:13 1.109 +++ 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.109 2003/02/18 13:20:13 www 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); @@ -1201,14 +1202,16 @@ sub phasetwo { $target=~s/\/+/\//g; if ($target=~/\_\_\_/) { - return - 'Unsupported character combination "___" in filename, FAIL'; + $r->print( + 'Unsupported character combination "___" in filename, FAIL'); + return 0; } $distarget=~s/\/+/\//g; my $logfile; unless ($logfile=Apache::File->new('>>'.$source.'.log')) { - return - 'No write permission to user directory, FAIL'; + $r->print( + 'No write permission to user directory, FAIL'); + return 0; } print $logfile "\n================= Publish ".localtime()." Phase Two ================\n";