--- loncom/xml/lonxml.pm 2001/03/29 20:47:06 1.66
+++ loncom/xml/lonxml.pm 2001/05/25 14:02:10 1.77
@@ -5,17 +5,17 @@
# 11/6 Gerd Kortemeyer
# 6/1/1 Gerd Kortemeyer
# 2/21,3/13 Guy
-# 3/29 Gerd Kortemeyer
+# 3/29,5/4 Gerd Kortemeyer
+# 5/10 Scott Harrison
package Apache::lonxml;
use vars
-qw(@pwd @outputstack $redirection $import @extlinks $metamode);
+qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace);
use strict;
use HTML::TokeParser;
use Safe;
use Safe::Hole;
use Opcode;
-use Apache::Constants qw(:common);
sub register {
my $space;
@@ -27,42 +27,130 @@ sub register {
}
}
-sub printalltags {
- my $temp;
- foreach $temp (sort keys %Apache::lonxml::alltags) {
- &Apache::lonxml::debug("$temp -- $Apache::lonxml::alltags{$temp}");
- }
-}
-use Apache::style;
+use Apache::Constants qw(:common);
use Apache::lontexconvert;
+use Apache::style;
use Apache::run;
use Apache::londefdef;
use Apache::scripttag;
use Apache::edit;
#================================================== Main subroutine: xmlparse
+#debugging control, to turn on debugging modify the correct handler
+$Apache::lonxml::debug=0;
+
+#path to the directory containing the file currently being processed
@pwd=();
+
+#these two are used for capturing a subset of the output for later processing,
+#don't touch them directly use &startredirection and &endredirection
@outputstack = ();
$redirection = 0;
+
+#controls wheter the <import> tag actually does
$import = 1;
@extlinks=();
+
+# meta mode is a bit weird only some output is to be turned off
+#<output> tag turns metamode off (defined in londefdef.pm)
$metamode = 0;
+# turns on and of run::evaluate actually derefencing var refs
+$evaluate = 1;
+
+# data structure for eidt mode, determines what tags can go into what other tags
+%insertlist=();
+
+#stores the list of active tag namespaces
+@namespace=();
+
+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 fontsettings() {
+ my $headerstring='';
+ if (($ENV{'browser.os'} eq 'mac') && (!$ENV{'browser.mathml'})) {
+ $headerstring.=
+ '<meta Content-Type="text/html; charset=x-mac-roman">';
+ }
+ return $headerstring;
+}
+
+sub registerurl {
+ return (<<ENDSCRIPT);
+<script language="JavaScript">
+// BEGIN LON-CAPA Internal
+ function LONCAPAreg() {
+ if (window.location.pathname!="/res/adm/pages/menu.html") {
+ menu=window.open("","LONCAPAmenu");
+ menu.currentURL=window.location.pathname;
+ menu.currentStale=0;
+ }
+ }
+
+ function LONCAPAstale() {
+ if (window.location.pathname!="/res/adm/pages/menu.html") {
+ menu=window.open("","LONCAPAmenu");
+ menu.currentStale=1;
+ }
+ }
+// END LON-CAPA Internal
+</script>
+ENDSCRIPT
+}
+
+sub loadevents() {
+ return 'LONCAPAreg();';
+}
+
+sub unloadevents() {
+ return 'LONCAPAstale();';
+}
+
+sub printalltags {
+ my $temp;
+ foreach $temp (sort keys %Apache::lonxml::alltags) {
+ &Apache::lonxml::debug("$temp -- $Apache::lonxml::alltags{$temp}");
+ }
+}
+
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::evaluate = 1;
$Apache::lonxml::import = 0;
} elsif ($target eq 'grade') {
&startredirection;
$Apache::lonxml::metamode = 0;
+ $Apache::lonxml::evaluate = 1;
$Apache::lonxml::import = 1;
- } else {
+ } elsif ($target eq 'modified') {
+ $Apache::lonxml::redirection = 0;
$Apache::lonxml::metamode = 0;
+ $Apache::lonxml::evaluate = 0;
+ $Apache::lonxml::import = 0;
+ } else {
$Apache::lonxml::redirection = 0;
+ $Apache::lonxml::metamode = 0;
+ $Apache::lonxml::evaluate = 1;
$Apache::lonxml::import = 1;
}
#&printalltags();
@@ -80,6 +168,7 @@ sub xmlparse {
my $safehole = new Safe::Hole;
$safeeval->permit("entereval");
$safeeval->permit(":base_math");
+ $safeeval->permit("sort");
$safeeval->deny(":base_io");
$safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
#need to inspect this class of ops
@@ -171,9 +260,15 @@ sub xmlparse {
# if ($target eq 'meta') {
# $finaloutput.=&endredirection;
# }
+
+ if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) {
+ $finaloutput=&afterburn($finaloutput);
+ }
+
return $finaloutput;
}
+
sub recurse {
my @innerstack = ();
@@ -242,6 +337,7 @@ sub recurse {
sub callsub {
my ($sub,$target,$token,$parstack,$parser,$safeeval,$style)=@_;
my $currentstring='';
+ my $nodefault;
{
my $sub1;
no strict 'refs';
@@ -249,25 +345,46 @@ sub callsub {
$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 $metamode<br />\n");
+ 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,
- $safeeval,$style);
+ ($currentstring,$nodefault) = &$sub1($target,$token,$parstack,$parser,
+ $safeeval,$style);
} else {
-# &Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode<br />\n");
+ #&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode<br />\n");
if ($metamode <1) {
if (defined($token->[4]) && ($metamode < 1)) {
- $currentstring .= $token->[4];
+ $currentstring = $token->[4];
} else {
- $currentstring .= $token->[2];
+ $currentstring = $token->[2];
}
}
}
- if ($target eq 'edit' && $token->[0] eq 'E') {
- $currentstring .= &Apache::edit::tag_end($target,$token,$parstack,$parser,
- $safeeval,$style);
+ &Apache::lonxml::debug("nodefalt:$nodefault:");
+ if ($currentstring eq '' && $nodefault eq '') {
+ if ($target eq 'edit') {
+ &Apache::lonxml::debug("doing default edit for $token->[1]");
+ if ($token->[0] eq 'S') {
+ $currentstring = &Apache::edit::tag_start($target,$token);
+ } elsif ($token->[0] eq 'E') {
+ $currentstring = &Apache::edit::tag_end($target,$token);
+ }
+ } elsif ($target eq 'modified') {
+ if ($token->[0] eq 'S') {
+ $currentstring = $token->[4];
+ $currentstring.=&Apache::edit::handle_insert();
+ } else {
+ $currentstring = $token->[2];
+ }
+ }
}
use strict 'refs';
}
@@ -281,7 +398,7 @@ sub startredirection {
sub endredirection {
if (!$Apache::lonxml::redirection) {
- &Apache::lonxml::error("Endredirection was called, before a startredirection, perhaps you have unbalanced tags. Some debuggin information:".join ":",caller);
+ &Apache::lonxml::error("Endredirection was called, before a startredirection, perhaps you have unbalanced tags. Some debuging information:".join ":",caller);
return '';
}
$Apache::lonxml::redirection--;
@@ -411,7 +528,6 @@ sub writeallows {
#
# Afterburner handles anchors, highlights and links
#
-
sub afterburn {
my $result=shift;
map {
@@ -456,9 +572,11 @@ ENDSCRIPT
sub handler {
my $request=shift;
-
+
my $target='web';
+
$Apache::lonxml::debug=0;
+
if ($ENV{'browser.mathml'}) {
$request->content_type('text/xml');
} else {
@@ -477,10 +595,6 @@ sub handler {
return OK if $request->header_only;
- if ($target eq 'web') {
- $request->print(&Apache::lontexconvert::header());
- $request->print('<body bgcolor="#FFFFFF">'."\n");
- }
my $file=&Apache::lonnet::filelocation("",$request->uri);
my %mystyle;
@@ -492,27 +606,13 @@ sub handler {
} else {
$result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle);
}
-#
-# Afterburner
-#
- if ($ENV{'QUERY_STRING'}) {
- $result=&afterburn($result);
- }
- $request->print($result);
-
- if ($target eq 'tex') {
-# $request->print('\end{document}'."\n");
- } elsif ($target eq 'web') {
- $request->print('</body>');
- $request->print(&Apache::lontexconvert::footer());
- }
+ $request->print($result);
writeallows($request->uri);
return OK;
}
-$Apache::lonxml::debug=0;
sub debug {
if ($Apache::lonxml::debug eq 1) {
print "DEBUG:".$_[0]."<br />\n";
@@ -520,7 +620,7 @@ sub debug {
}
sub error {
- if ($Apache::lonxml::debug eq 1) {
+ if (($Apache::lonxml::debug eq 1) || ($ENV{'request.state'} eq 'construct') ) {
print "<b>ERROR:</b>".$_[0]."<br />\n";
} else {
print "<b>An Error occured while processing this resource. The instructor has been notified.</b> <br />";
@@ -534,18 +634,52 @@ sub error {
&Apache::lonmsg::user_normal_msg($user,$domain,"Error in $ENV{'request.filename'}",$_[0]);
}
}
-
+
#FIXME probably shouldn't have me get everything forever.
&Apache::lonmsg::user_normal_msg('albertel','msu',"Error in $ENV{'request.filename'}",$_[0]);
- #&Apache::lonmsg::user_normal_msg('albertel','103',"Error in $ENV{'request.filename'}",$_[0]);
+ #&Apache::lonmsg::user_normal_msg('albertel','103',"Error in $ENV{'request.filename'}",$_[0]);
}
}
sub warning {
- if ($Apache::lonxml::debug eq 1) {
+ if ($ENV{'request.state'} eq 'construct') {
print "<b>W</b>ARNING<b>:</b>".$_[0]."<br />\n";
}
}
+sub register_insert {
+ my @data = split /\n/, &Apache::lonnet::getfile('/home/httpd/lonTabs/insertlist.tab');
+ my $i;
+ my $tagnum=0;
+ my @order;
+ for ($i=0;$i < $#data; $i++) {
+ my $line = $data[$i];
+ if ( $line =~ /^\#/ || $line =~ /^\s*\n/) { next; }
+ if ( $line =~ /TABLE/ ) { last; }
+ my ($tag,$descrip,$function,$show) = split(/,/, $line);
+ $insertlist{"$tagnum.tag"} = $tag;
+ $insertlist{"$tagnum.description"} = $descrip;
+ $insertlist{"$tagnum.function"} = $function;
+ $insertlist{"$tagnum.show"}= $show;
+ $tagnum++;
+ }
+ $i++; #skipping TABLE line
+ $tagnum = 0;
+ for (;$i < $#data;$i++) {
+ my $line = $data[$i];
+ my ($mnemonic,@which) = split(/ +/,$line);
+ my $tag = $insertlist{"$tagnum.tag"};
+ for (my $j=0;$j <$#which;$j++) {
+ if ( $which[$j] eq 'Y' ) {
+ if ($insertlist{"$j.show"} ne 'no') {
+ push(@{ $insertlist{"$tag.which"} },$j);
+ }
+ }
+ }
+ $tagnum++;
+ }
+}
1;
__END__
+
+