--- loncom/xml/lonxml.pm 2001/02/22 00:49:03 1.55
+++ loncom/xml/lonxml.pm 2001/03/27 18:19:29 1.65
@@ -4,11 +4,11 @@
# last modified 06/26/00 by Alexander Sakharuk
# 11/6 Gerd Kortemeyer
# 6/1/1 Gerd Kortemeyer
-# 2/21 Guy
+# 2/21,3/13 Guy
package Apache::lonxml;
use vars
-qw(@pwd @outputstack $redirection $textredirection $import @extlinks);
+qw(@pwd @outputstack $redirection $import @extlinks $metamode);
use strict;
use HTML::TokeParser;
use Safe;
@@ -37,23 +37,30 @@ use Apache::lontexconvert;
use Apache::run;
use Apache::londefdef;
use Apache::scripttag;
+use Apache::edit;
#================================================== Main subroutine: xmlparse
@pwd=();
@outputstack = ();
$redirection = 0;
$import = 1;
@extlinks=();
+$metamode = 0;
sub xmlparse {
my ($target,$content_file_string,$safeinit,%style_for_target) = @_;
if ($target eq 'meta') {
- &startredirection;
+ # 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;
} elsif ($target eq 'grade') {
&startredirection;
+ $Apache::lonxml::metamode = 0;
$Apache::lonxml::import = 1;
} else {
+ $Apache::lonxml::metamode = 0;
$Apache::lonxml::redirection = 0;
$Apache::lonxml::import = 1;
}
@@ -89,8 +96,10 @@ sub xmlparse {
my $token;
while ( $#pars > -1 ) {
while ($token = $pars[$#pars]->get_token) {
- if ($token->[0] eq 'T') {
- $result=$token->[1];
+ if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) {
+ if ($metamode<1) { $result=$token->[1]; }
+ } elsif ($token->[0] eq 'PI') {
+ if ($metamode<1) { $result=$token->[2]; }
} elsif ($token->[0] eq 'S') {
# add tag to stack
push (@stack,$token->[1]);
@@ -127,11 +136,13 @@ sub xmlparse {
$target,$safeeval,\%style_for_target,
@parstack);
}
-
+
} else {
$result = &callsub("end_$token->[1]", $target, $token, \@parstack,
\@pars,$safeeval, \%style_for_target);
}
+ } else {
+ &Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:");
}
#evaluate variable refs in result
if ($result ne "") {
@@ -156,6 +167,9 @@ sub xmlparse {
pop @Apache::lonxml::pwd;
}
+# if ($target eq 'meta') {
+# $finaloutput.=&endredirection;
+# }
return $finaloutput;
}
@@ -172,8 +186,10 @@ sub recurse {
my $decls='';
while ( $#pat > -1 ) {
while ($tokenpat = $pat[$#pat]->get_token) {
- if ($tokenpat->[0] eq 'T') {
- $partstring = $tokenpat->[1];
+ if (($tokenpat->[0] eq 'T') || ($tokenpat->[0] eq 'C') || ($tokenpat->[0] eq 'D') ) {
+ if ($metamode<1) { $partstring=$tokenpat->[1]; }
+ } elsif ($tokenpat->[0] eq 'PI') {
+ if ($metamode<1) { $partstring=$tokenpat->[2]; }
} elsif ($tokenpat->[0] eq 'S') {
push (@innerstack,$tokenpat->[1]);
push (@innerparstack,&parstring($tokenpat));
@@ -191,6 +207,8 @@ sub recurse {
$partstring = &callsub("end_$tokenpat->[1]",
$target, $tokenpat, \@innerparstack,
\@pat, $safeeval, $style_for_target);
+ } else {
+ &Apache::lonxml::error("Unknown token event :$tokenpat->[0]:$tokenpat->[1]:");
}
#pass both the variable to the style tag, and the tag we
#are processing inside the <definedtag>
@@ -224,22 +242,32 @@ sub callsub {
my ($sub,$target,$token,$parstack,$parser,$safeeval,$style)=@_;
my $currentstring='';
{
- my $sub1;
+ my $sub1;
no strict 'refs';
+ if ($target eq 'edit' && $token->[0] eq 'S') {
+ $currentstring = &Apache::edit::tag_start($target,$token,$parstack,$parser,
+ $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,
+ $currentstring .= &$sub1($target,$token,$parstack,$parser,
$safeeval,$style);
} else {
- #&Apache::lonxml::debug("NOT Calling sub $sub in $space<br />\n");
- if (defined($token->[4])) {
- $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,
+ $safeeval,$style);
+ }
use strict 'refs';
}
return $currentstring;
@@ -299,20 +327,41 @@ sub get_all_text {
my $depth=0;
my $token;
my $result='';
- my $tag=substr($tag,1); #strip the / off the tag
- #&Apache::lonxml::debug("have:$tag:");
- while (($depth >=0) && ($token = $pars->get_token)) {
- #&Apache::lonxml::debug("token:$token->[0]:$depth:$token->[1]");
- if ($token->[0] eq 'T') {
- $result.=$token->[1];
- } elsif ($token->[0] eq 'S') {
- if ($token->[1] eq $tag) { $depth++; }
- $result.=$token->[4];
- } elsif ($token->[0] eq 'E') {
- if ( $token->[1] eq $tag) { $depth--; }
- #skip sending back the last end tag
- if ($depth > -1) { $result.=$token->[2]; } else {
- $pars->unget_token($token);
+ if ( $tag =~ m:^/: ) {
+ my $tag=substr($tag,1);
+# &Apache::lonxml::debug("have:$tag:");
+ while (($depth >=0) && ($token = $pars->get_token)) {
+# &Apache::lonxml::debug("e token:$token->[0]:$depth:$token->[1]");
+ if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) {
+ $result.=$token->[1];
+ } elsif ($token->[0] eq 'PI') {
+ $result.=$token->[2];
+ } elsif ($token->[0] eq 'S') {
+ if ($token->[1] eq $tag) { $depth++; }
+ $result.=$token->[4];
+ } elsif ($token->[0] eq 'E') {
+ if ( $token->[1] eq $tag) { $depth--; }
+ #skip sending back the last end tag
+ if ($depth > -1) { $result.=$token->[2]; } else {
+ $pars->unget_token($token);
+ }
+ }
+ }
+ } else {
+ while ($token = $pars->get_token) {
+# &Apache::lonxml::debug("s token:$token->[0]:$depth:$token->[1]");
+ if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) {
+ $result.=$token->[1];
+ } elsif ($token->[0] eq 'PI') {
+ $result.=$token->[2];
+ } elsif ($token->[0] eq 'S') {
+ if ( $token->[1] eq $tag) {
+ $pars->unget_token($token); last;
+ } else {
+ $result.=$token->[4];
+ }
+ } elsif ($token->[0] eq 'E') {
+ $result.=$token->[2];
}
}
}
@@ -323,6 +372,7 @@ sub get_all_text {
sub newparser {
my ($parser,$contentref,$dir) = @_;
push (@$parser,HTML::TokeParser->new($contentref));
+ $$parser['-1']->xml_mode('1');
if ( $dir eq '' ) {
push (@Apache::lonxml::pwd, $Apache::lonxml::pwd[$#Apache::lonxml::pwd]);
} else {
@@ -367,7 +417,7 @@ sub handler {
} else {
$request->content_type('text/html');
}
-
+
# $request->print(<<ENDHEADER);
#<html>
#<head>
@@ -377,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;
@@ -397,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;
}