--- loncom/xml/lonxml.pm 2000/11/14 22:24:38 1.38 +++ loncom/xml/lonxml.pm 2001/01/06 16:22:55 1.46 @@ -3,6 +3,7 @@ # # last modified 06/26/00 by Alexander Sakharuk # 11/6 Gerd Kortemeyer +# 6/1/1 Gerd Kortemeyer package Apache::lonxml; use vars @@ -10,7 +11,9 @@ qw(@pwd $outputstack $redirection $textr use strict; use HTML::TokeParser; use Safe; +use Safe::Hole; use Opcode; +use Apache::Constants qw(:common); sub register { my $space; @@ -38,9 +41,12 @@ $on_offimport = 0; sub xmlparse { my ($target,$content_file_string,$safeinit,%style_for_target) = @_; - if ($target eq 'meta') - {$Apache::lonxml::textredirection = 0; - $Apache::lonxml::on_offimport = 1; + if ($target eq 'meta') { + $Apache::lonxml::textredirection = 0; + $Apache::lonxml::on_offimport = 1; + } else { + $Apache::lonxml::textredirection = 1; + $Apache::lonxml::on_offimport = 0; } my @pars = (); @Apache::lonxml::pwd=(); @@ -53,14 +59,15 @@ sub xmlparse { my $result; my $safeeval = new Safe; + my $safehole = new Safe::Hole; $safeeval->permit("entereval"); $safeeval->permit(":base_math"); $safeeval->deny(":base_io"); + $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT'); #need to inspect this class of ops # $safeeval->deny(":base_orig"); $safeinit .= ';$external::target='.$target.';'; $safeinit .= ';$external::randomseed='.&Apache::lonnet::rndseed().';'; - $safeinit .= &Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_xml.lcpm'); &Apache::run::run($safeinit,$safeeval); #-------------------- Redefinition of the target in the case of compound target @@ -73,36 +80,39 @@ sub xmlparse { while ( $#pars > -1 ) { while ($token = $pars[$#pars]->get_token) { if ($token->[0] eq 'T') { - if ($Apache::lonxml::textredirection == 1) {$result=$token->[1];} -# $finaloutput .= &Apache::run::evaluate($token->[1],$safeeval,''); + if ($Apache::lonxml::textredirection == 1) {$result=$token->[1];} + # $finaloutput .= &Apache::run::evaluate($token->[1],$safeeval,''); } elsif ($token->[0] eq 'S') { -# if ($target eq 'meta' and $token->[2]->{metaout} eq 'ON') {$Apache::lonxml::textredirection = 1;} + # if ($target eq 'meta' and $token->[2]->{metaout} eq 'ON') {$Apache::lonxml::textredirection = 1;} # add tag to stack push (@stack,$token->[1]); # add parameters list to another stack push (@parstack,&parstring($token)); &increasedepth($token); if (exists $style_for_target{$token->[1]}) { - - if ($Apache::lonxml::redirection == 1) { - $finaloutput .= &recurse($style_for_target{$token->[1]}, - $target,$safeeval,\%style_for_target, - @parstack); - } else { - $Apache::lonxml::outputstack .= &recurse($style_for_target{$token->[1]}, - $target,$safeeval,\%style_for_target, - @parstack); - } - + + if ($Apache::lonxml::redirection == 1) { + $finaloutput .= &recurse($style_for_target{$token->[1]}, + $target,$safeeval,\%style_for_target, + @parstack); + } else { + $Apache::lonxml::outputstack .= &recurse($style_for_target{$token->[1]}, + $target,$safeeval,\%style_for_target, + @parstack); + } + } else { $result = &callsub("start_$token->[1]", $target, $token,\@parstack, - \@pars, $safeeval, \%style_for_target); + \@pars, $safeeval, \%style_for_target); } } elsif ($token->[0] eq 'E') { -# if ($target eq 'meta') {$Apache::lonxml::textredirection = 0;} + #if ($target eq 'meta') {$Apache::lonxml::textredirection = 0;} #clear out any tags that didn't end 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]"}) { @@ -173,8 +183,10 @@ sub recurse { } elsif ($tokenpat->[0] eq 'E') { #clear out any tags that didn't end while ($tokenpat->[1] ne $innerstack[$#innerstack] - && ($#innerstack > -1)) {pop @innerstack;pop @innerparstack; - &decreasedepth($tokenpat);} + && ($#innerstack > -1)) { + &Apache::lonxml::error("Unbalanced tags in resource $innerstack['-1']"); + pop @innerstack;pop @innerparstack;&decreasedepth($tokenpat); + } $partstring = &callsub("end_$tokenpat->[1]", $target, $tokenpat, \@innerparstack, \@pat, $safeeval, $style_for_target); @@ -245,8 +257,9 @@ sub increasedepth { if ($Apache::lonxml::depthcounter[$Apache::lonxml::depth]==1) { $Apache::lonxml::olddepth=$Apache::lonxml::depth; } -# my $curdepth=join('_',@Apache::lonxml::depthcounter); -# print "
s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]
\n"; + my $curdepth=join('_',@Apache::lonxml::depthcounter); + &Apache::lonxml::debug("s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n"); +#print "
s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n"; } sub decreasedepth { @@ -256,8 +269,13 @@ sub decreasedepth { $#Apache::lonxml::depthcounter--; $Apache::lonxml::olddepth=$Apache::lonxml::depth+1; } -# my $curdepth=join('_',@Apache::lonxml::depthcounter); -# print "
e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth
\n"; + if ( $Apache::lonxml::depth < -1) { + &Apache::lonxml::error("Unbalanced tags in resource"); + $Apache::lonxml::depth='-1'; + } + my $curdepth=join('_',@Apache::lonxml::depthcounter); + &Apache::lonxml::debug("e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n"); +#print "
e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n"; } sub get_all_text { @@ -302,7 +320,9 @@ sub parstring { my $temp=''; map { unless ($_=~/\W/) { - $temp .= "my \$$_=\"$token->[2]->{$_}\";" + my $val=$token->[2]->{$_}; + if ($val =~ m/^[\%\@]/) { $val="\\".$val; } + $temp .= "my \$$_=\"$val\";" } } @{$token->[3]}; return $temp; @@ -321,9 +341,9 @@ sub writeallows { sub handler { my $request=shift; - + my $target='web'; - $Apache::lonxml::debug=1; +# $Apache::lonxml::debug=1; if ($ENV{'browser.mathml'}) { $request->content_type('text/xml'); } else { @@ -340,7 +360,7 @@ sub handler { # &Apache::lonhomework::send_header($request); $request->send_http_header; - return 'OK' if $request->header_only; + return OK if $request->header_only; $request->print(&Apache::lontexconvert::header()); @@ -355,7 +375,7 @@ sub handler { $request->print(''); $request->print(&Apache::lontexconvert::footer()); writeallows($request->uri); - return 'OK'; + return OK; } $Apache::lonxml::debug=0; @@ -365,7 +385,7 @@ sub debug { } } sub error { - print "ERROR:".$_[0]."
\n"; +# print "ERROR:".$_[0]."
\n"; } sub warning { if ($Apache::lonxml::debug eq 1) {