--- loncom/xml/lonxml.pm 2001/03/29 20:47:06 1.66
+++ loncom/xml/lonxml.pm 2001/05/04 19:18:43 1.71
@@ -5,7 +5,7 @@
# 11/6 Gerd Kortemeyer
# 6/1/1 Gerd Kortemeyer
# 2/21,3/13 Guy
-# 3/29 Gerd Kortemeyer
+# 3/29,5/4 Gerd Kortemeyer
package Apache::lonxml;
use vars
@@ -16,6 +16,67 @@ use Safe;
use Safe::Hole;
use Opcode;
use Apache::Constants qw(:common);
+use Apache::lontexconvert;
+
+
+sub xmlbegin {
+ my $output='';
+ if ($ENV{'browser.mathml'}) {
+ $output=''
+ .''
+ .']>'
+ .'';
+ } else {
+ $output='';
+ }
+ return $output;
+}
+
+sub xmlend {
+ return '';
+}
+
+sub fontsettings() {
+ my $headerstring='';
+ if (($ENV{'browser.os'} eq 'mac') && (!$ENV{'browser.mathml'})) {
+ $headerstring.=
+ '';
+ }
+ return $headerstring;
+}
+
+sub registerurl {
+ return (<
+// 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
+
+ENDSCRIPT
+}
+
+sub loadevents() {
+ return 'LONCAPAreg();';
+}
+
+sub unloadevents() {
+ return 'LONCAPAstale();';
+}
sub register {
my $space;
@@ -34,7 +95,6 @@ sub printalltags {
}
}
use Apache::style;
-use Apache::lontexconvert;
use Apache::run;
use Apache::londefdef;
use Apache::scripttag;
@@ -171,9 +231,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 = ();
@@ -249,14 +315,21 @@ 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
\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
\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 $metamode
\n");
+ &Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode
\n");
if ($metamode <1) {
if (defined($token->[4]) && ($metamode < 1)) {
$currentstring .= $token->[4];
@@ -456,9 +529,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 +552,6 @@ sub handler {
return OK if $request->header_only;
- if ($target eq 'web') {
- $request->print(&Apache::lontexconvert::header());
- $request->print(''."\n");
- }
my $file=&Apache::lonnet::filelocation("",$request->uri);
my %mystyle;
@@ -492,27 +563,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('');
- $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]."
\n";
@@ -549,3 +606,5 @@ sub warning {
1;
__END__
+
+