--- loncom/xml/lonxml.pm 2000/10/12 19:43:25 1.28 +++ loncom/xml/lonxml.pm 2000/11/01 17:25:36 1.31 @@ -29,10 +29,13 @@ use Apache::scripttag; @Apache::lonxml::pwd=(); $Apache::lonxml::outputstack = ''; $Apache::lonxml::redirection = 1; +$Apache::lonxml::textredirection = 1; + sub xmlparse { my ($target,$content_file_string,$safeinit,%style_for_target) = @_; + if ($target eq 'meta') {$Apache::lonxml::textredirection = 0;} my @pars = (); @Apache::lonxml::pwd=(); my $pwd=$ENV{'request.filename'}; @@ -63,9 +66,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 @@ -88,6 +92,7 @@ sub xmlparse { \@pars, $safeeval, \%style_for_target); } } 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);} @@ -150,7 +155,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)); @@ -302,6 +307,15 @@ sub handler { } 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; @@ -315,6 +329,7 @@ sub handler { my $result = ''; $result = Apache::lonxml::xmlparse($target, &Apache::lonnet::getfile($file),'',%mystyle); $request->print($result); + $request->print(''); $request->print(&Apache::lontexconvert::footer()); return 'OK';