--- loncom/xml/lonxml.pm 2000/08/11 14:24:50 1.18 +++ loncom/xml/lonxml.pm 2000/10/12 19:43:25 1.28 @@ -26,20 +26,32 @@ use Apache::run; use Apache::londefdef; use Apache::scripttag; #================================================== Main subroutine: xmlparse +@Apache::lonxml::pwd=(); +$Apache::lonxml::outputstack = ''; +$Apache::lonxml::redirection = 1; sub xmlparse { my ($target,$content_file_string,$safeinit,%style_for_target) = @_; my @pars = (); - push (@pars,HTML::TokeParser->new(\$content_file_string)); + @Apache::lonxml::pwd=(); + my $pwd=$ENV{'request.filename'}; + $pwd =~ s:/[^/]*$::; + &newparser(\@pars,\$content_file_string,$pwd); my $currentstring = ''; my $finaloutput = ''; my $newarg = ''; my $result; + my $safeeval = new Safe; $safeeval->permit("entereval"); $safeeval->permit(":base_math"); - if ( $safeinit ne '') {&Apache::run::run($safeinit,$safeeval);} + $safeeval->deny(":base_io"); +#need to inspect this class of ops +# $safeeval->deny(":base_orig"); + $safeinit .= ';$external::target='.$target.';'; + $safeinit .= ';$external::randomseed='.&Apache::lonnet::rndseed().';'; + &Apache::run::run($safeinit,$safeeval); #-------------------- Redefinition of the target in the case of compound target ($target, my @tenta) = split('&&',$target); @@ -58,11 +70,19 @@ sub xmlparse { push (@stack,$token->[1]); # add parameters list to another stack push (@parstack,&parstring($token)); - &increasedepth(); + &increasedepth($token); if (exists $style_for_target{$token->[1]}) { - $finaloutput .= &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); @@ -70,30 +90,49 @@ sub xmlparse { } elsif ($token->[0] eq 'E') { #clear out any tags that didn't end while ($token->[1] ne $stack[$#stack] - && ($#stack > -1)) {pop @stack;pop @parstack;&decreasedepth;} + && ($#stack > -1)) {pop @stack;pop @parstack;&decreasedepth($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); + } + } else { $result = &callsub("end_$token->[1]", $target, $token, \@parstack, \@pars,$safeeval, \%style_for_target); } } - if ($result ne "" ) { - if ( $#parstack > -1 ) { + if ($result ne "") { + if ( $#parstack > -1 ) { + + if ($Apache::lonxml::redirection == 1) { $finaloutput .= &Apache::run::evaluate($result,$safeeval, $parstack[$#parstack]); + } else { + $Apache::lonxml::outputstack .= &Apache::run::evaluate($result,$safeeval, + $parstack[$#parstack]); + } + } else { $finaloutput .= &Apache::run::evaluate($result,$safeeval,''); } $result = ''; + } else { + $finaloutput .= $result; } - if ($token->[0] eq 'E') { pop @stack;pop @parstack;&decreasedepth;} + if ($token->[0] eq 'E') { pop @stack;pop @parstack;&decreasedepth($token);} } pop @pars; + pop @Apache::lonxml::pwd; } + return $finaloutput; } @@ -103,7 +142,7 @@ sub recurse { my @innerparstack = (); my ($newarg,$target,$safeeval,$style_for_target,@parstack) = @_; my @pat = (); - push (@pat,HTML::TokeParser->new(\$newarg)); + &newparser(\@pat,\$newarg); my $tokenpat; my $partstring = ''; my $output=''; @@ -115,7 +154,7 @@ sub recurse { } elsif ($tokenpat->[0] eq 'S') { push (@innerstack,$tokenpat->[1]); push (@innerparstack,&parstring($tokenpat)); - &increasedepth(); + &increasedepth($tokenpat); $partstring = &callsub("start_$tokenpat->[1]", $target, $tokenpat, \@innerparstack, \@pat, $safeeval, $style_for_target); @@ -123,7 +162,7 @@ sub recurse { #clear out any tags that didn't end while ($tokenpat->[1] ne $innerstack[$#innerstack] && ($#innerstack > -1)) {pop @innerstack;pop @innerparstack; - &decreasedepth;} + &decreasedepth($tokenpat);} $partstring = &callsub("end_$tokenpat->[1]", $target, $tokenpat, \@innerparstack, \@pat, $safeeval, $style_for_target); @@ -148,9 +187,10 @@ sub recurse { $partstring = ''; } if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; - &decreasedepth;} + &decreasedepth($tokenpat);} } pop @pat; + pop @Apache::lonxml::pwd; } return $output; } @@ -159,15 +199,16 @@ sub callsub { my ($sub,$target,$token,$parstack,$parser,$safeeval,$style)=@_; my $currentstring=''; { + my $sub1; no strict 'refs'; if (my $space=$Apache::lonxml::alltags{$token->[1]}) { - #print "Calling sub $sub in $space \n"; - $sub="$space\:\:$sub"; + #&Apache::lonxml::debug("Calling sub $sub in $space
\n"); + $sub1="$space\:\:$sub"; $Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter); - $currentstring = &$sub($target,$token,$parstack,$parser, + $currentstring = &$sub1($target,$token,$parstack,$parser, $safeeval,$style); } else { - #print "NOT Calling sub $sub\n"; + #&Apache::lonxml::debug("NOT Calling sub $sub in $space
\n"); if (defined($token->[4])) { $currentstring = $token->[4]; } else { @@ -186,11 +227,13 @@ sub initdepth { } sub increasedepth { + my ($token) = @_; if ($Apache::lonxml::depth<$Apache::lonxml::olddepth-1) { $#Apache::lonxml::depthcounter--; $Apache::lonxml::olddepth=$Apache::lonxml::depth; } $Apache::lonxml::depth++; +# print "
s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1]
\n"; $Apache::lonxml::depthcounter[$Apache::lonxml::depth]++; if ($Apache::lonxml::depthcounter[$Apache::lonxml::depth]==1) { $Apache::lonxml::olddepth=$Apache::lonxml::depth; @@ -198,19 +241,117 @@ sub increasedepth { } sub decreasedepth { + my ($token) = @_; $Apache::lonxml::depth--; +# print "
e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1]
\n"; +} + +sub get_all_text { + + my($tag,$pars)= @_; + my $depth=0; + my $token; + my $result=''; + my $tag=substr($tag,1); #strip the / off the tag +# &Apache::lonxml::debug("have:$tag:"); + while (($depth >=0) && ($token = $pars->get_token)) { + if ($token->[0] eq 'T') { + $result.=$token->[1]; + } elsif ($token->[0] eq 'S') { + if ($token->[1] eq $tag) { $depth++; } + $result.=$token->[4]; + } elsif ($token->[0] eq 'E') { + if ( $token->[1] eq $tag) { $depth--; } + #skip sending back the last end tag + if ($depth > -1) { $result.=$token->[2]; } + } + } + return $result +} + +sub newparser { + my ($parser,$contentref,$dir) = @_; + push (@$parser,HTML::TokeParser->new($contentref)); + if ( $dir eq '' ) { + push (@Apache::lonxml::pwd, $Apache::lonxml::pwd[$#Apache::lonxml::pwd]); + } else { + push (@Apache::lonxml::pwd, $dir); + } +# &Apache::lonxml::debug("pwd:$#Apache::lonxml::pwd"); +# &Apache::lonxml::debug("pwd:$Apache::lonxml::pwd[$#Apache::lonxml::pwd]"); } sub parstring { my ($token) = @_; my $temp=''; - map {$temp .= "my \$$_=\"$token->[2]->{$_}\";"} @{$token->[3]}; + map { + if ($_=~/\w+/) { + $temp .= "my \$$_=\"$token->[2]->{$_}\";" + } + } @{$token->[3]}; return $temp; } + +sub handler { + my $request=shift; + + my $target='web'; + $Apache::lonxml::debug=1; + if ($ENV{'browser.mathml'}) { + $request->content_type('text/xml'); + } else { + $request->content_type('text/html'); + } + $request->send_http_header; + + return 'OK' if $request->header_only; + + $request->print(&Apache::lontexconvert::header()); + + $request->print(''."\n"); + + my $file = "/home/httpd/html".$request->uri; + my %mystyle; + my $result = ''; + $result = Apache::lonxml::xmlparse($target, &Apache::lonnet::getfile($file),'',%mystyle); + $request->print($result); + $request->print(''); + $request->print(&Apache::lontexconvert::footer()); + return 'OK'; +} + +$Apache::lonxml::debug=0; +sub debug { + if ($Apache::lonxml::debug eq 1) { + print "DEBUG:".$_[0]."
\n"; + } +} +sub error { + print "ERROR:".$_[0]."
\n"; +} +sub warning { + if ($Apache::lonxml::debug eq 1) { + print "WARNING:".$_[0]."
\n"; + } +} + 1; __END__ + + + + + + + + + + + + +