version 1.42, 2001/01/03 00:13:22
|
version 1.43, 2001/01/04 19:16:16
|
Line 104 sub xmlparse {
|
Line 104 sub xmlparse {
|
#if ($target eq 'meta') {$Apache::lonxml::textredirection = 0;} |
#if ($target eq 'meta') {$Apache::lonxml::textredirection = 0;} |
#clear out any tags that didn't end |
#clear out any tags that didn't end |
while ($token->[1] ne $stack[$#stack] |
while ($token->[1] ne $stack[$#stack] |
&& ($#stack > -1)) {pop @stack;pop @parstack;&decreasedepth($token);} |
&& ($#stack > -1)) { |
|
&Apache::lonxml::error("Unbalanced tags in resource $stack['-1']"); |
|
pop @stack;pop @parstack;&decreasedepth($token); |
|
} |
|
|
if (exists $style_for_target{'/'."$token->[1]"}) { |
if (exists $style_for_target{'/'."$token->[1]"}) { |
|
|
Line 175 sub recurse {
|
Line 178 sub recurse {
|
} elsif ($tokenpat->[0] eq 'E') { |
} elsif ($tokenpat->[0] eq 'E') { |
#clear out any tags that didn't end |
#clear out any tags that didn't end |
while ($tokenpat->[1] ne $innerstack[$#innerstack] |
while ($tokenpat->[1] ne $innerstack[$#innerstack] |
&& ($#innerstack > -1)) {pop @innerstack;pop @innerparstack; |
&& ($#innerstack > -1)) { |
&decreasedepth($tokenpat);} |
&Apache::lonxml::error("Unbalanced tags in resource $innerstack['-1']"); |
|
pop @innerstack;pop @innerparstack;&decreasedepth($tokenpat); |
|
} |
$partstring = &callsub("end_$tokenpat->[1]", |
$partstring = &callsub("end_$tokenpat->[1]", |
$target, $tokenpat, \@innerparstack, |
$target, $tokenpat, \@innerparstack, |
\@pat, $safeeval, $style_for_target); |
\@pat, $safeeval, $style_for_target); |
Line 249 sub increasedepth {
|
Line 254 sub increasedepth {
|
} |
} |
my $curdepth=join('_',@Apache::lonxml::depthcounter); |
my $curdepth=join('_',@Apache::lonxml::depthcounter); |
&Apache::lonxml::debug("s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n"); |
&Apache::lonxml::debug("s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n"); |
|
#print "<br>s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n"; |
} |
} |
|
|
sub decreasedepth { |
sub decreasedepth { |
Line 258 sub decreasedepth {
|
Line 264 sub decreasedepth {
|
$#Apache::lonxml::depthcounter--; |
$#Apache::lonxml::depthcounter--; |
$Apache::lonxml::olddepth=$Apache::lonxml::depth+1; |
$Apache::lonxml::olddepth=$Apache::lonxml::depth+1; |
} |
} |
|
if ( $Apache::lonxml::depth < -1) { |
|
&Apache::lonxml::error("Unbalanced tags in resource"); |
|
$Apache::lonxml::depth='-1'; |
|
} |
my $curdepth=join('_',@Apache::lonxml::depthcounter); |
my $curdepth=join('_',@Apache::lonxml::depthcounter); |
&Apache::lonxml::debug("e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n"); |
&Apache::lonxml::debug("e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n"); |
|
#print "<br>e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n"; |
} |
} |
|
|
sub get_all_text { |
sub get_all_text { |
Line 327 sub handler {
|
Line 338 sub handler {
|
my $request=shift; |
my $request=shift; |
|
|
my $target='web'; |
my $target='web'; |
$Apache::lonxml::debug=1; |
# $Apache::lonxml::debug=1; |
if ($ENV{'browser.mathml'}) { |
if ($ENV{'browser.mathml'}) { |
$request->content_type('text/xml'); |
$request->content_type('text/xml'); |
} else { |
} else { |