version 1.257, 2003/05/22 21:05:01
|
version 1.258, 2003/05/28 21:05:33
|
Line 494 sub inner_xmlparse {
|
Line 494 sub inner_xmlparse {
|
my $finaloutput = ''; |
my $finaloutput = ''; |
my $result; |
my $result; |
my $token; |
my $token; |
|
my $dontpop=0; |
while ( $#$pars > -1 ) { |
while ( $#$pars > -1 ) { |
while ($token = $$pars['-1']->get_token) { |
while ($token = $$pars['-1']->get_token) { |
if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) { |
if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) { |
Line 527 sub inner_xmlparse {
|
Line 528 sub inner_xmlparse {
|
$parstack, $pars, $safeeval, $style_for_target); |
$parstack, $pars, $safeeval, $style_for_target); |
} |
} |
} elsif ($token->[0] eq 'E') { |
} elsif ($token->[0] eq 'E') { |
#clear out any tags that didn't end |
|
while ($token->[1] ne $$stack['-1'] && ($#$stack > -1)) { |
|
my $lasttag=$$stack[-1]; |
|
if ($token->[1] =~ /^$lasttag$/i) { |
|
&Apache::lonxml::warning('Using tag </'.$token->[1].'> on line '.$token->[3].' as end tag to <'.$$stack[-1].'>'); |
|
last; |
|
} else { |
|
&Apache::lonxml::warning('Found tag </'.$token->[1].'> on line '.$token->[3].' when looking for </'.$$stack[-1].'> in file'); |
|
&end_tag($stack,$parstack,$token); |
|
} |
|
} |
|
|
|
if ($Apache::lonxml::usestyle && |
if ($Apache::lonxml::usestyle && |
exists($$style_for_target{'/'."$token->[1]"})) { |
exists($$style_for_target{'/'."$token->[1]"})) { |
$Apache::lonxml::usestyle=0; |
$Apache::lonxml::usestyle=0; |
my $string=$$style_for_target{'/'.$token->[1]}. |
my $string=$$style_for_target{'/'.$token->[1]}. |
'<LONCAPA_INTERNAL_TURN_STYLE_ON />'; |
'<LONCAPA_INTERNAL_TURN_STYLE_ON end="'.$token->[1].'" />'; |
&Apache::lonxml::newparser($pars,\$string); |
&Apache::lonxml::newparser($pars,\$string); |
$Apache::lonxml::style_values=$$parstack[-1]; |
$Apache::lonxml::style_values=$$parstack[-1]; |
|
$dontpop=1; |
} else { |
} else { |
$result = &callsub("end_$token->[1]", $target, $token, $stack, |
#clear out any tags that didn't end |
$parstack, $pars,$safeeval, $style_for_target); |
while ($token->[1] ne $$stack['-1'] && ($#$stack > -1)) { |
|
my $lasttag=$$stack[-1]; |
|
if ($token->[1] =~ /^$lasttag$/i) { |
|
&Apache::lonxml::warning('Using tag </'.$token->[1].'> on line '.$token->[3].' as end tag to <'.$$stack[-1].'>'); |
|
last; |
|
} else { |
|
&Apache::lonxml::warning('Found tag </'.$token->[1].'> on line '.$token->[3].' when looking for </'.$$stack[-1].'> in file'); |
|
&end_tag($stack,$parstack,$token); |
|
} |
|
} |
|
$result = &callsub("end_$token->[1]", $target, $token, $stack, |
|
$parstack, $pars,$safeeval, $style_for_target); |
} |
} |
} else { |
} else { |
&Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:"); |
&Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:"); |
Line 583 sub inner_xmlparse {
|
Line 584 sub inner_xmlparse {
|
} |
} |
$result = ''; |
$result = ''; |
|
|
if ($token->[0] eq 'E') { |
if ($token->[0] eq 'E' && !$dontpop) { |
&end_tag($stack,$parstack,$token); |
&end_tag($stack,$parstack,$token); |
} |
} |
|
$dontpop=0; |
} |
} |
if ($#$pars > -1) { |
if ($#$pars > -1) { |
pop @$pars; |
pop @$pars; |
Line 1023 sub newparser {
|
Line 1025 sub newparser {
|
} else { |
} else { |
push (@Apache::lonxml::pwd, $dir); |
push (@Apache::lonxml::pwd, $dir); |
} |
} |
# &Apache::lonxml::debug("pwd:$#Apache::lonxml::pwd"); |
|
# &Apache::lonxml::debug("pwd:$Apache::lonxml::pwd[$#Apache::lonxml::pwd]"); |
|
} |
} |
|
|
sub parstring { |
sub parstring { |
Line 1192 sub handler {
|
Line 1192 sub handler {
|
|
|
my $target=&get_target(); |
my $target=&get_target(); |
|
|
$Apache::lonxml::debug=0; |
$Apache::lonxml::debug=$ENV{'user.debug'}; |
|
|
if ($ENV{'browser.mathml'}) { |
if ($ENV{'browser.mathml'}) { |
$request->content_type('text/xml'); |
$request->content_type('text/xml'); |