loncom/xml/lonxml.pm - diff

Return to lonxml.pm CVS log

Up to [LON-CAPA] / loncom / xml

-version 1.487, 2008/10/24 18:23:22
+version 1.489, 2008/11/24 17:17:52
  Line 37
  # to any other parties under any circumstances.
  #
+ =pod
+ =head1 NAME
+ Apache::lonxml
+ =head1 SYNOPSIS
+ XML Parsing Module
+ This is part of the LearningOnline Network with CAPA project
+ described at http://www.lon-capa.org.
+ =head1 SUBROUTINES
+ =cut
  package Apache::lonxml;
  use vars
- Line 505  sub inner_xmlparse {
+ Line 524  sub inner_xmlparse {
  	  if (!$Apache::lonxml::usestyle) {
  	      $extras=$Apache::lonxml::style_values;
  	  }
-           if ($token->[1] ne 'translated') {
+ 	  if ( $#$parstack > -1 ) {
- 	      if ( $#$parstack > -1 ) {
+ 	      $result=&Apache::run::evaluate($result,$safeeval,$extras.$$parstack[-1]);
- 	          $result=&Apache::run::evaluate($result,$safeeval,$extras.$$parstack[-1]);
+ 	  } else {
- 	      } else {
+ 	      $result= &Apache::run::evaluate($result,$safeeval,$extras);
- 	          $result= &Apache::run::evaluate($result,$safeeval,$extras);
- 	      }
            }
        }
        $Apache::lonxml::post_evaluate=1;