--- loncom/xml/lonxml.pm 2008/10/24 19:36:40 1.484.2.2 +++ loncom/xml/lonxml.pm 2008/12/11 22:19:45 1.484.4.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.484.2.2 2008/10/24 19:36:40 raeburn Exp $ +# $Id: lonxml.pm,v 1.484.4.1 2008/12/11 22:19:45 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -505,13 +505,11 @@ sub inner_xmlparse { if (!$Apache::lonxml::usestyle) { $extras=$Apache::lonxml::style_values; } - if ($token->[1] ne 'translated') { - if ( $#$parstack > -1 ) { - $result=&Apache::run::evaluate($result,$safeeval,$extras.$$parstack[-1]); - } else { - $result=&Apache::run::evaluate($result,$safeeval,$extras); - } - } + if ( $#$parstack > -1 ) { + $result=&Apache::run::evaluate($result,$safeeval,$extras.$$parstack[-1]); + } else { + $result= &Apache::run::evaluate($result,$safeeval,$extras); + } } $Apache::lonxml::post_evaluate=1; @@ -660,6 +658,7 @@ sub setup_globals { $Apache::lonxml::request=$request; $errorcount=0; $warningcount=0; + $Apache::lonxml::internal_error=0; $Apache::lonxml::default_homework_loaded=0; $Apache::lonxml::usestyle=1; &init_counter(); @@ -1830,6 +1829,8 @@ sub error { $errorcount++; + $Apache::lonxml::internal_error=1; + if (defined($Apache::inputtags::part)) { if ( @Apache::inputtags::response ) { push(@errors,