--- loncom/xml/lonxml.pm 2002/03/25 20:06:08 1.162 +++ loncom/xml/lonxml.pm 2002/03/29 18:32:46 1.163 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.162 2002/03/25 20:06:08 matthew Exp $ +# $Id: lonxml.pm,v 1.163 2002/03/29 18:32:46 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -630,7 +630,7 @@ sub inner_xmlparse { $finaloutput .= &Apache::run::evaluate($result,$safeeval,''); } $result = ''; - } + } if ($token->[0] eq 'E') { &end_tag($stack,$parstack,$token); } @@ -814,6 +814,11 @@ sub setup_globals { $Apache::lonxml::metamode = 0; $Apache::lonxml::evaluate = 0; $Apache::lonxml::import = 0; + } elsif ($target eq 'analyze') { + $Apache::lonxml::redirection = 0; + $Apache::lonxml::metamode = 0; + $Apache::lonxml::evaluate = 1; + $Apache::lonxml::import = 1; } else { $Apache::lonxml::redirection = 0; $Apache::lonxml::metamode = 0; @@ -989,6 +994,7 @@ sub newparser { my ($parser,$contentref,$dir) = @_; push (@$parser,HTML::TokeParser->new($contentref)); $$parser['-1']->xml_mode('1'); +# $$parser['-1']->attr_encoded('1'); if ( $dir eq '' ) { push (@Apache::lonxml::pwd, $Apache::lonxml::pwd[$#Apache::lonxml::pwd]); } else {