--- loncom/xml/lonxml.pm 2001/03/22 22:40:26 1.59
+++ loncom/xml/lonxml.pm 2001/03/27 18:19:29 1.65
@@ -8,7 +8,7 @@
package Apache::lonxml;
use vars
-qw(@pwd @outputstack $redirection $textredirection $import @extlinks $metamode);
+qw(@pwd @outputstack $redirection $import @extlinks $metamode);
use strict;
use HTML::TokeParser;
use Safe;
@@ -51,6 +51,7 @@ sub xmlparse {
my ($target,$content_file_string,$safeinit,%style_for_target) = @_;
if ($target eq 'meta') {
# meta mode is a bit weird only some output is to be turned off
+ #<output> tag turns metamode off (defined in londefdef.pm)
$Apache::lonxml::redirection = 0;
$Apache::lonxml::metamode = 1;
$Apache::lonxml::import = 0;
@@ -96,9 +97,9 @@ sub xmlparse {
while ( $#pars > -1 ) {
while ($token = $pars[$#pars]->get_token) {
if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) {
- if (!$metamode) { $result=$token->[1]; }
+ if ($metamode<1) { $result=$token->[1]; }
} elsif ($token->[0] eq 'PI') {
- if (!$metamode) { $result=$token->[2]; }
+ if ($metamode<1) { $result=$token->[2]; }
} elsif ($token->[0] eq 'S') {
# add tag to stack
push (@stack,$token->[1]);
@@ -106,9 +107,7 @@ sub xmlparse {
push (@parstack,&parstring($token));
&increasedepth($token);
if (exists $style_for_target{$token->[1]}) {
- if ($metamode) {
- $result = $style_for_target{$token->[1]};
- } elsif ($Apache::lonxml::redirection) {
+ if ($Apache::lonxml::redirection) {
$Apache::lonxml::outputstack['-1'] .=
&recurse($style_for_target{$token->[1]},$target,$safeeval,
\%style_for_target,@parstack);
@@ -128,9 +127,7 @@ sub xmlparse {
}
if (exists $style_for_target{'/'."$token->[1]"}) {
- if ($metamode) {
- $result = $style_for_target{$token->[1]};
- } elsif ($Apache::lonxml::redirection) {
+ if ($Apache::lonxml::redirection) {
$Apache::lonxml::outputstack['-1'] .=
&recurse($style_for_target{'/'."$token->[1]"},
$target,$safeeval,\%style_for_target,@parstack);
@@ -190,9 +187,9 @@ sub recurse {
while ( $#pat > -1 ) {
while ($tokenpat = $pat[$#pat]->get_token) {
if (($tokenpat->[0] eq 'T') || ($tokenpat->[0] eq 'C') || ($tokenpat->[0] eq 'D') ) {
- $partstring = $tokenpat->[1];
+ if ($metamode<1) { $partstring=$tokenpat->[1]; }
} elsif ($tokenpat->[0] eq 'PI') {
- $partstring = $tokenpat->[2];
+ if ($metamode<1) { $partstring=$tokenpat->[2]; }
} elsif ($tokenpat->[0] eq 'S') {
push (@innerstack,$tokenpat->[1]);
push (@innerparstack,&parstring($tokenpat));
@@ -252,21 +249,23 @@ sub callsub {
$safeeval,$style);
}
if (my $space=$Apache::lonxml::alltags{$token->[1]}) {
- #&Apache::lonxml::debug("Calling sub $sub in $space<br />\n");
+# &Apache::lonxml::debug("Calling sub $sub in $space $metamode<br />\n");
$sub1="$space\:\:$sub";
$Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
$currentstring .= &$sub1($target,$token,$parstack,$parser,
$safeeval,$style);
} else {
- #&Apache::lonxml::debug("NOT Calling sub $sub in $space<br />\n");
- if (defined($token->[4]) && !$metamode) {
- $currentstring .= $token->[4];
- } else {
- $currentstring .= $token->[2];
+# &Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode<br />\n");
+ if ($metamode <1) {
+ if (defined($token->[4]) && ($metamode < 1)) {
+ $currentstring .= $token->[4];
+ } else {
+ $currentstring .= $token->[2];
+ }
}
}
if ($target eq 'edit' && $token->[0] eq 'E') {
- $currentstring = &Apache::edit::tag_end($target,$token,$parstack,$parser,
+ $currentstring .= &Apache::edit::tag_end($target,$token,$parstack,$parser,
$safeeval,$style);
}
use strict 'refs';
@@ -418,7 +417,7 @@ sub handler {
} else {
$request->content_type('text/html');
}
-
+
# $request->print(<<ENDHEADER);
#<html>
#<head>
@@ -428,12 +427,13 @@ sub handler {
#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");
+ if ($target eq 'web') {
+ $request->print(&Apache::lontexconvert::header());
+ $request->print('<body bgcolor="#FFFFFF">'."\n");
+ }
my $file=&Apache::lonnet::filelocation("",$request->uri);
my %mystyle;
@@ -448,8 +448,13 @@ sub handler {
$request->print($result);
- $request->print('</body>');
- $request->print(&Apache::lontexconvert::footer());
+ if ($target eq 'tex') {
+# $request->print('\end{document}'."\n");
+ } elsif ($target eq 'web') {
+ $request->print('</body>');
+ $request->print(&Apache::lontexconvert::footer());
+ }
+
writeallows($request->uri);
return OK;
}