--- loncom/xml/lonxml.pm 2001/02/22 00:49:03 1.55
+++ loncom/xml/lonxml.pm 2001/05/04 15:29:32 1.68
@@ -4,11 +4,12 @@
# 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
+# 3/29,5/4 Gerd Kortemeyer
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;
@@ -16,6 +17,38 @@ use Safe::Hole;
use Opcode;
use Apache::Constants qw(:common);
+
+sub xmlbegin {
+ my $output='';
+ if ($ENV{'browser.mathml'}) {
+ $output='<?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">';
+ } else {
+ $output='<html>';
+ }
+ return $output;
+}
+
+sub xmlend {
+ return '</html>';
+}
+
+sub registerurl {
+ return (<<ENDSCRIPT);
+<script language="JavaScript">
+ if (window.location.pathname!="/res/adm/pages/menu.html") {
+ menu=window.open("","LONCAPAmenu");
+ menu.currentURL=window.location.pathname;
+ menu.currentStale=0;
+ }
+</script>
+ENDSCRIPT
+}
+
sub register {
my $space;
my @taglist;
@@ -33,27 +66,33 @@ sub printalltags {
}
}
use Apache::style;
-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 +128,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 +168,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,9 +199,18 @@ sub xmlparse {
pop @Apache::lonxml::pwd;
}
+# if ($target eq 'meta') {
+# $finaloutput.=&endredirection;
+# }
+
+ if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) {
+ $finaloutput=&afterburn($finaloutput);
+ }
+
return $finaloutput;
}
+
sub recurse {
my @innerstack = ();
@@ -172,8 +224,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 +245,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 +280,39 @@ sub callsub {
my ($sub,$target,$token,$parstack,$parser,$safeeval,$style)=@_;
my $currentstring='';
{
- my $sub1;
+ my $sub1;
no strict 'refs';
- if (my $space=$Apache::lonxml::alltags{$token->[1]}) {
- #&Apache::lonxml::debug("Calling sub $sub in $space<br />\n");
+ if ($target eq 'edit' && $token->[0] eq 'S') {
+ $currentstring = &Apache::edit::tag_start($target,$token,$parstack,$parser,
+ $safeeval,$style);
+ }
+ my $tag=$token->[1];
+ my $space=$Apache::lonxml::alltags{$tag};
+ if (!$space) {
+ $tag=~tr/A-Z/a-z/;
+ $sub=~tr/A-Z/a-z/;
+ $space=$Apache::lonxml::alltags{$tag}
+ }
+ if ($space) {
+ &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 +372,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 +417,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 {
@@ -357,17 +452,65 @@ sub writeallows {
&Apache::lonnet::appenv(%httpref);
}
+#
+# Afterburner handles anchors, highlights and links
+#
+
+sub afterburn {
+ my $result=shift;
+ map {
+ my ($name, $value) = split(/=/,$_);
+ $value =~ tr/+/ /;
+ $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+ if (($name eq 'highlight')||($name eq 'anchor')||($name eq 'link')) {
+ unless ($ENV{'form.'.$name}) {
+ $ENV{'form.'.$name}=$value;
+ }
+ }
+ } (split(/&/,$ENV{'QUERY_STRING'}));
+ if ($ENV{'form.highlight'}) {
+ map {
+ my $anchorname=$_;
+ my $matchthis=$anchorname;
+ $matchthis=~s/\_+/\\s\+/g;
+ $result=~s/($matchthis)/\<font color=\"red\"\>$1\<\/font\>/gs;
+ } split(/\,/,$ENV{'form.highlight'});
+ }
+ if ($ENV{'form.link'}) {
+ map {
+ my ($anchorname,$linkurl)=split(/\>/,$_);
+ my $matchthis=$anchorname;
+ $matchthis=~s/\_+/\\s\+/g;
+ $result=~s/($matchthis)/\<a href=\"$linkurl\"\>$1\<\/a\>/gs;
+ } split(/\,/,$ENV{'form.link'});
+ }
+ if ($ENV{'form.anchor'}) {
+ my $anchorname=$ENV{'form.anchor'};
+ my $matchthis=$anchorname;
+ $matchthis=~s/\_+/\\s\+/g;
+ $result=~s/($matchthis)/\<a name=\"$anchorname\"\>$1\<\/a\>/s;
+ $result.=(<<"ENDSCRIPT");
+<script>
+ document.location.hash='$anchorname';
+</script>
+ENDSCRIPT
+ }
+ return $result;
+}
+
sub handler {
my $request=shift;
-
+
my $target='web';
+
$Apache::lonxml::debug=0;
+
if ($ENV{'browser.mathml'}) {
$request->content_type('text/xml');
} else {
$request->content_type('text/html');
}
-
+
# $request->print(<<ENDHEADER);
#<html>
#<head>
@@ -377,12 +520,9 @@ 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");
my $file=&Apache::lonnet::filelocation("",$request->uri);
my %mystyle;
@@ -394,16 +534,13 @@ sub handler {
} else {
$result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle);
}
- $request->print($result);
+ $request->print($result);
- $request->print('</body>');
- $request->print(&Apache::lontexconvert::footer());
writeallows($request->uri);
return OK;
}
-$Apache::lonxml::debug=0;
sub debug {
if ($Apache::lonxml::debug eq 1) {
print "DEBUG:".$_[0]."<br />\n";
@@ -440,3 +577,5 @@ sub warning {
1;
__END__
+
+