loncom/xml/lonxml.pm - diff

Return to lonxml.pm CVS log

Up to [LON-CAPA] / loncom / xml

version 1.516, 2010/09/29 15:53:07	version 1.518, 2010/09/29 16:09:20
Line 1437 sub verify_html {	Line 1437 sub verify_html {
my ($is_html,$is_xml);	my ($is_html,$is_xml);
if ($filecontents =~/(?:\<\|\&lt\;)\?xml[^\<]*\?(?:\>\|\&gt\;)/is) {	if ($filecontents =~/(?:\<\|\&lt\;)\?xml[^\<]*\?(?:\>\|\&gt\;)/is) {
$is_xml = 1;	$is_xml = 1;
} elsif ($filecontents =~/(?:\<\|\&lt\;)html(?:\s+[^\<]+\|\s)[^\<](?:\>\|\&gt\;)/is) {	} elsif ($filecontents =~/(?:\<\|\&lt\;)html(?:\s+[^\<]+\|\s*)(?:\>\|\&gt\;)/is) {
$is_html = 1;	$is_html = 1;
}	}
unless ($is_xml \|\| $is_html) {	unless ($is_xml \|\| $is_html) {
Line 1721 ENDNOTFOUND	Line 1721 ENDNOTFOUND
$result = &Apache::lontexconvert::converted(\$filecontents,	$result = &Apache::lontexconvert::converted(\$filecontents,
$env{'form.texengine'});	$env{'form.texengine'});
if ($env{'form.return_only_error_and_warning_counts'}) {	if ($env{'form.return_only_error_and_warning_counts'}) {
if (&verify_html('<html><body>'.$result.'</body></html>')) {
$errorcount++;
}
$result = "$errorcount:$warningcount";	$result = "$errorcount:$warningcount";
}	}
} else {	} else {