--- loncom/xml/lonxml.pm 2010/09/29 15:53:07 1.516 +++ loncom/xml/lonxml.pm 2010/09/29 16:09:20 1.518 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.516 2010/09/29 15:53:07 raeburn Exp $ +# $Id: lonxml.pm,v 1.518 2010/09/29 16:09:20 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1437,7 +1437,7 @@ sub verify_html { my ($is_html,$is_xml); if ($filecontents =~/(?:\<|\<\;)\?xml[^\<]*\?(?:\>|\>\;)/is) { $is_xml = 1; - } elsif ($filecontents =~/(?:\<|\<\;)html(?:\s+[^\<]+|\s*)[^\<]*(?:\>|\>\;)/is) { + } elsif ($filecontents =~/(?:\<|\<\;)html(?:\s+[^\<]+|\s*)(?:\>|\>\;)/is) { $is_html = 1; } unless ($is_xml || $is_html) { @@ -1721,9 +1721,6 @@ ENDNOTFOUND $result = &Apache::lontexconvert::converted(\$filecontents, $env{'form.texengine'}); if ($env{'form.return_only_error_and_warning_counts'}) { - if (&verify_html(''.$result.'')) { - $errorcount++; - } $result = "$errorcount:$warningcount"; } } else {