--- loncom/publisher/lonpublisher.pm 2005/03/10 03:50:49 1.188 +++ loncom/publisher/lonpublisher.pm 2005/04/04 23:55:17 1.191 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Publication Handler # -# $Id: lonpublisher.pm,v 1.188 2005/03/10 03:50:49 www Exp $ +# $Id: lonpublisher.pm,v 1.191 2005/04/04 23:55:17 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -852,9 +852,10 @@ sub checkonthis { my ($r,$source)=@_; my $uri=&Apache::lonnet::hreflocation($source); $uri=~s/\/$//; - my ($errorcount,$warningcount)=split(/:/, - &Apache::lonnet::ssi_body($uri, - ('return_only_error_and_warning_counts' => 1))); + my $result=&Apache::lonnet::ssi_body($uri, + ('grade_target'=>'web', + 'return_only_error_and_warning_counts' => 1)); + my ($errorcount,$warningcount)=split(':',$result); if (($errorcount) || ($warningcount)) { $r->print('
'.$uri.': '); if ($errorcount) { @@ -868,7 +869,7 @@ sub checkonthis { &mt('warning(s)').''); } } else { - $r->print(''.&mt('ok').''); + #$r->print(''.&mt('ok').''); } $r->rflush(); return ($warningcount,$errorcount); @@ -2012,14 +2013,17 @@ ENDDIFF unless ($ENV{'form.phase'} eq 'two') { # ---------------------------------------------------------- Parse for problems - my ($warningcount,$errorcount)=&checkonthis($r,$thisfn); - unless ($errorcount) { + my ($warningcount,$errorcount); + if ($thisembstyle eq 'ssi') { + ($warningcount,$errorcount)=&checkonthis($r,$thisfn); + } + unless ($errorcount) { my ($outstring,$error)= &publish($thisfn,$thistarget,$thisembstyle); $r->print('
'.$outstring); } else { - $r->print('

'. - &mt('The document contains errors and cannot be published.'). + $r->print('

'. + &mt('The document contains errors and cannot be published.'). '

'); } } else {