--- loncom/xml/lonxml.pm 2001/03/30 01:42:23 1.67 +++ loncom/xml/lonxml.pm 2001/05/10 19:10:25 1.73 @@ -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); use strict; use HTML::TokeParser; use Safe; use Safe::Hole; use Opcode; -use Apache::Constants qw(:common); sub register { my $space; @@ -27,42 +27,125 @@ 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 tag actually does $import = 1; @extlinks=(); + +# meta mode is a bit weird only some output is to be turned off +# tag turns metamode off (defined in londefdef.pm) $metamode = 0; +# turns on and of run::evaluate actually derefencing var refs +$evaluate = 1; + + +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 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 - # 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(); @@ -248,6 +331,7 @@ sub recurse { sub callsub { my ($sub,$target,$token,$parstack,$parser,$safeeval,$style)=@_; my $currentstring=''; + my $nodefault; { my $sub1; no strict 'refs'; @@ -255,25 +339,44 @@ 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); + ($currentstring,$nodefault) = &$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]; + $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') { + if ($token->[0] eq 'S') { + $currentstring = &Apache::edit::tag_start($token,$target); + } elsif ($token->[0] eq 'E') { + $currentstring = &Apache::edit::tag_end($token,$target); + } + } elsif ($target eq 'modified') { + if ($token->[0] eq 'S') { + $currentstring = $token->[4]; + } else { + $currentstring = $token->[2]; + } + } } use strict 'refs'; } @@ -287,7 +390,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--; @@ -417,7 +520,6 @@ sub writeallows { # # Afterburner handles anchors, highlights and links # - sub afterburn { my $result=shift; map { @@ -462,9 +564,11 @@ ENDSCRIPT sub handler { my $request=shift; - + my $target='web'; + $Apache::lonxml::debug=0; + if ($ENV{'browser.mathml'}) { $request->content_type('text/xml'); } else { @@ -483,10 +587,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; @@ -499,20 +599,12 @@ sub handler { $result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle); } - 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"; @@ -542,10 +634,12 @@ sub error { } sub warning { - if ($Apache::lonxml::debug eq 1) { + if ($ENV{'request.state'} eq 'construct') { print "WARNING:".$_[0]."
\n"; } } 1; __END__ + +