--- loncom/xml/lonxml.pm 2000/10/09 14:07:02 1.24 +++ loncom/xml/lonxml.pm 2000/11/07 23:39:07 1.36 @@ -2,9 +2,11 @@ # XML Parser Module # # last modified 06/26/00 by Alexander Sakharuk +# 11/6 Gerd Kortemeyer package Apache::lonxml; - +use vars +qw(@pwd $outputstack $redirection $textredirection $on_offimport @extlinks); use strict; use HTML::TokeParser; use Safe; @@ -26,10 +28,20 @@ use Apache::run; use Apache::londefdef; use Apache::scripttag; #================================================== Main subroutine: xmlparse -@Apache::lonxml::pwd=(); +@pwd=(); +$outputstack = ''; +$redirection = 1; +$textredirection = 1; +$on_offimport = 0; +@extlinks=(); + sub xmlparse { my ($target,$content_file_string,$safeinit,%style_for_target) = @_; + if ($target eq 'meta') + {$Apache::lonxml::textredirection = 0; + $Apache::lonxml::on_offimport = 1; + } my @pars = (); @Apache::lonxml::pwd=(); my $pwd=$ENV{'request.filename'}; @@ -40,9 +52,6 @@ sub xmlparse { my $newarg = ''; my $result; - my $indicator = 1; - my $pocketbox = ''; - my $safeeval = new Safe; $safeeval->permit("entereval"); $safeeval->permit(":base_math"); @@ -50,6 +59,7 @@ sub xmlparse { #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 @@ -62,9 +72,10 @@ sub xmlparse { while ( $#pars > -1 ) { while ($token = $pars[$#pars]->get_token) { if ($token->[0] eq 'T') { - $result=$token->[1]; + 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;} # add tag to stack push (@stack,$token->[1]); # add parameters list to another stack @@ -72,12 +83,12 @@ sub xmlparse { &increasedepth($token); if (exists $style_for_target{$token->[1]}) { - if ($indicator == 1) { + if ($Apache::lonxml::redirection == 1) { $finaloutput .= &recurse($style_for_target{$token->[1]}, $target,$safeeval,\%style_for_target, @parstack); } else { - $pocketbox .= &recurse($style_for_target{$token->[1]}, + $Apache::lonxml::outputstack .= &recurse($style_for_target{$token->[1]}, $target,$safeeval,\%style_for_target, @parstack); } @@ -85,23 +96,21 @@ sub xmlparse { } else { $result = &callsub("start_$token->[1]", $target, $token,\@parstack, \@pars, $safeeval, \%style_for_target); - - if ($result eq "footnote") { &Apache::lonxml::debug($result);} - } } elsif ($token->[0] eq 'E') { +# 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)) {pop @stack;pop @parstack;&decreasedepth($token);&Apache::lonxml::debug("Clearing out stack");} if (exists $style_for_target{'/'."$token->[1]"}) { - if ($indicator == 1) { + if ($Apache::lonxml::redirection == 1) { $finaloutput .= &recurse($style_for_target{'/'."$token->[1]"}, $target,$safeeval,\%style_for_target, @parstack); } else { - $pocketbox .= &recurse($style_for_target{'/'."$token->[1]"}, + $Apache::lonxml::outputstack .= &recurse($style_for_target{'/'."$token->[1]"}, $target,$safeeval,\%style_for_target, @parstack); } @@ -111,14 +120,14 @@ sub xmlparse { \@pars,$safeeval, \%style_for_target); } } - if ($result ne "" ) { + if ($result ne "") { if ( $#parstack > -1 ) { - if ($indicator == 1) { + if ($Apache::lonxml::redirection == 1) { $finaloutput .= &Apache::run::evaluate($result,$safeeval, $parstack[$#parstack]); } else { - $pocketbox .= &Apache::run::evaluate($result,$safeeval, + $Apache::lonxml::outputstack .= &Apache::run::evaluate($result,$safeeval, $parstack[$#parstack]); } @@ -126,6 +135,8 @@ sub xmlparse { $finaloutput .= &Apache::run::evaluate($result,$safeeval,''); } $result = ''; + } else { + $finaloutput .= $result; } if ($token->[0] eq 'E') { pop @stack;pop @parstack;&decreasedepth($token);} } @@ -150,7 +161,7 @@ sub recurse { while ( $#pat > -1 ) { while ($tokenpat = $pat[$#pat]->get_token) { if ($tokenpat->[0] eq 'T') { - $partstring = $tokenpat->[1]; + if ($Apache::lonxml::textredirection == 1) {$partstring = $tokenpat->[1];} } elsif ($tokenpat->[0] eq 'S') { push (@innerstack,$tokenpat->[1]); push (@innerparstack,&parstring($tokenpat)); @@ -202,17 +213,11 @@ sub callsub { my $sub1; no strict 'refs'; if (my $space=$Apache::lonxml::alltags{$token->[1]}) { -# &Apache::lonxml::debug("Calling sub $sub in $space
\n"); -# if ( $sub eq "start_parserlib" ) { -# print "me:".%$style.":\n"; -# } + #&Apache::lonxml::debug("Calling sub $sub in $space
\n"); $sub1="$space\:\:$sub"; $Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter); $currentstring = &$sub1($target,$token,$parstack,$parser, $safeeval,$style); -# if ( $sub eq "start_parserlib" ) { -# print "me2:".%$style.":"; -# } } else { #&Apache::lonxml::debug("NOT Calling sub $sub in $space
\n"); if (defined($token->[4])) { @@ -234,22 +239,24 @@ 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; } +# my $curdepth=join('_',@Apache::lonxml::depthcounter); +# print "
s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]
\n"; } sub decreasedepth { my ($token) = @_; $Apache::lonxml::depth--; -# print "
e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1]
\n"; + if ($Apache::lonxml::depth<$Apache::lonxml::olddepth-1) { + $#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"; } sub get_all_text { @@ -269,7 +276,9 @@ sub get_all_text { } elsif ($token->[0] eq 'E') { if ( $token->[1] eq $tag) { $depth--; } #skip sending back the last end tag - if ($depth > -1) { $result.=$token->[2]; } + if ($depth > -1) { $result.=$token->[2]; } else { + $pars->unget_token($token); + } } } return $result @@ -291,36 +300,61 @@ sub parstring { my ($token) = @_; my $temp=''; map { - if ($_=~/\w+/) { + unless ($_=~/\W/) { $temp .= "my \$$_=\"$token->[2]->{$_}\";" } } @{$token->[3]}; return $temp; } -#<<<<<<< lonxml.pm + +sub writeallows { + my $thisurl='/res/'.&Apache::lonnet::declutter(shift); + my $thisdir=$thisurl; + $thisdir=~s/\/[^\/]+$//; + my %httpref=(); + map { + $httpref{'httpref.'. + &Apache::lonnet::hreflocation($thisdir,$_)}=$thisurl; } @extlinks; + &Apache::lonnet::appenv(%httpref); +} sub handler { my $request=shift; my $target='web'; $Apache::lonxml::debug=1; - $request->content_type('text/html'); - $request->send_http_header; - $request->print(< - -Just test - - -ENDHEADER + if ($ENV{'browser.mathml'}) { + $request->content_type('text/xml'); + } else { + $request->content_type('text/html'); + } + +# $request->print(< +# +#Just test +# +# +#ENDHEADER # &Apache::lonhomework::send_header($request); + $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 follows:"); $request->print($result); -# $request->print(":Result ends"); + + $request->print(''); + $request->print(&Apache::lontexconvert::footer()); + writeallows($request->uri); + return 'OK'; } $Apache::lonxml::debug=0; @@ -343,5 +377,18 @@ __END__ + + + + + + + + + + + + +