--- loncom/xml/lonxml.pm 2008/03/07 20:49:17 1.472 +++ loncom/xml/lonxml.pm 2008/05/02 22:00:12 1.477 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.472 2008/03/07 20:49:17 www Exp $ +# $Id: lonxml.pm,v 1.477 2008/05/02 22:00:12 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -379,6 +379,10 @@ sub xmlparse { } &init_state(); if ($env{'form.return_only_error_and_warning_counts'}) { + if ($env{'request.filename'}=~/\.(html|htm|xml)$/i) { + my $error=&verify_html($content_file_string); + if ($error) { $errorcount++; } + } return "$errorcount:$warningcount"; } return $finaloutput; @@ -1076,6 +1080,7 @@ Optional Arguments: sub increment_counter { my ($increment, $part_response) = @_; + if ($env{'form.grade_target'} eq 'analyze') { return; } if (!defined($increment) || $increment le 0) { $increment = 1; } @@ -1117,7 +1122,7 @@ sub init_counter { } sub store_counter { - &Apache::lonnet::appenv(('form.counter' => $Apache::lonxml::counter)); + &Apache::lonnet::appenv({'form.counter' => $Apache::lonxml::counter}); $Apache::lonxml::counter_changed=0; return ''; } @@ -1138,7 +1143,7 @@ sub store_counter { sub restore_problem_counter { if (defined($state)) { - &Apache::lonnet::appenv(('form.counter' => $state)); + &Apache::lonnet::appenv({'form.counter' => $state}); } } sub get_problem_counter { @@ -1375,7 +1380,7 @@ sub writeallows { &Apache::lonnet::hreflocation($thisdir,&unescape($_))}=$thisurl; } @extlinks=(); - &Apache::lonnet::appenv(%httpref); + &Apache::lonnet::appenv(\%httpref); } sub register_ssi { @@ -1555,7 +1560,7 @@ FULLPAGE my $form_events = &Apache::edit::form_change_detection(); my $htmlerror=&verify_html($filecontents); if ($htmlerror) { - $htmlerror=''.$htmlerror.'
'; + $htmlerror=''.$htmlerror.''; } my $editfooter=(<