--- loncom/xml/lonxml.pm 2000/10/11 21:07:59 1.26
+++ loncom/xml/lonxml.pm 2000/11/06 14:32:35 1.32
@@ -29,10 +29,16 @@ use Apache::scripttag;
@Apache::lonxml::pwd=();
$Apache::lonxml::outputstack = '';
$Apache::lonxml::redirection = 1;
+$Apache::lonxml::textredirection = 1;
+$Apache::lonxml::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;
+ }
my @pars = ();
@Apache::lonxml::pwd=();
my $pwd=$ENV{'request.filename'};
@@ -63,9 +69,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 +95,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 +158,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));
@@ -291,32 +299,18 @@ sub parstring {
} @{$token->[3]};
return $temp;
}
-#<<<<<<< lonxml.pm
sub handler {
my $request=shift;
my $target='web';
$Apache::lonxml::debug=1;
- $request->content_type('text/html');
-# $request->send_http_header;
if ($ENV{'browser.mathml'}) {
- $request->print( '<?xml version="1.0"?>'
- .'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'
- .'<!DOCTYPE html SYSTEM "/adm/MathML/mathml.dtd" '
- .'[<!ENTITY mathns "http://www.w3.org/1998/Math/MathML">]>'
- .'<html xmlns:math="http://www.w3.org/1998/Math/MathML" '
- .'xmlns="http://www.w3.org/TR/REC-html40">'
- .'<body bgcolor="#FFFFFF">'."\n");
- } else {
- my $headerstring='<html>';
- if ($ENV{'browser.os'} eq 'mac') {
- $headerstring.="<head>\n"
- .'<meta Content-Type="text/html; charset=x-mac-roman">'
- ."\n</head>\n";
- }
- $request->print($headerstring.'<body bgcolor="#FFFFFF">'."\n");
+ $request->content_type('text/xml');
+ } else {
+ $request->content_type('text/html');
}
+
# $request->print(<<ENDHEADER);
#<html>
#<head>
@@ -325,13 +319,23 @@ sub handler {
#<body bgcolor="#FFFFFF">
#ENDHEADER
# &Apache::lonhomework::send_header($request);
+ $request->send_http_header;
+
+ return 'OK' if $request->header_only;
+
+ $request->print(&Apache::lontexconvert::header());
+
+ $request->print('<body bgcolor="#FFFFFF">'."\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('</body>');
+ $request->print(&Apache::lontexconvert::footer());
+ return 'OK';
}
$Apache::lonxml::debug=0;