--- loncom/xml/lonxml.pm 2000/10/30 20:34:25 1.30 +++ loncom/xml/lonxml.pm 2000/11/06 17:03:29 1.34 @@ -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,15 +28,20 @@ use Apache::run; use Apache::londefdef; use Apache::scripttag; #================================================== Main subroutine: xmlparse -@Apache::lonxml::pwd=(); -$Apache::lonxml::outputstack = ''; -$Apache::lonxml::redirection = 1; -$Apache::lonxml::textredirection = 1; +@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;} + if ($target eq 'meta') + {$Apache::lonxml::textredirection = 0; + $Apache::lonxml::on_offimport = 1; + } my @pars = (); @Apache::lonxml::pwd=(); my $pwd=$ENV{'request.filename'}; @@ -68,7 +75,7 @@ sub xmlparse { 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 @@ -91,7 +98,7 @@ sub xmlparse { \@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);} @@ -296,10 +303,21 @@ sub parstring { return $temp; } +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='meta'; + my $target='web'; $Apache::lonxml::debug=1; if ($ENV{'browser.mathml'}) { $request->content_type('text/xml'); @@ -331,6 +349,7 @@ sub handler { $request->print(''); $request->print(&Apache::lontexconvert::footer()); + writeallows($request->uri); return 'OK'; }