--- loncom/xml/lonxml.pm 2000/11/07 23:41:27 1.37 +++ loncom/xml/lonxml.pm 2001/05/04 17:33:35 1.70 @@ -3,14 +3,77 @@ # # last modified 06/26/00 by Alexander Sakharuk # 11/6 Gerd Kortemeyer +# 6/1/1 Gerd Kortemeyer +# 2/21,3/13 Guy +# 3/29,5/4 Gerd Kortemeyer package Apache::lonxml; use vars -qw(@pwd $outputstack $redirection $textredirection $on_offimport @extlinks); +qw(@pwd @outputstack $redirection $import @extlinks $metamode); use strict; use HTML::TokeParser; use Safe; +use Safe::Hole; use Opcode; +use Apache::Constants qw(:common); + + +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 (< + 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; + } + } + +ENDSCRIPT +} + +sub loadevents() { + return 'LONCAPAreg();'; +} + +sub unloadevents() { + return 'LONCAPAstale();'; +} sub register { my $space; @@ -21,27 +84,45 @@ sub register { $Apache::lonxml::alltags{$temptag}=$space; } } - + +sub printalltags { + my $temp; + foreach $temp (sort keys %Apache::lonxml::alltags) { + &Apache::lonxml::debug("$temp -- $Apache::lonxml::alltags{$temp}"); + } +} use Apache::style; -use Apache::lontexconvert; use Apache::run; use Apache::londefdef; use Apache::scripttag; +use Apache::edit; #================================================== Main subroutine: xmlparse @pwd=(); -$outputstack = ''; -$redirection = 1; -$textredirection = 1; -$on_offimport = 0; +@outputstack = (); +$redirection = 0; +$import = 1; @extlinks=(); +$metamode = 0; sub xmlparse { my ($target,$content_file_string,$safeinit,%style_for_target) = @_; - if ($target eq 'meta') - {$Apache::lonxml::textredirection = 0; - $Apache::lonxml::on_offimport = 1; + 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::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; } + #&printalltags(); my @pars = (); @Apache::lonxml::pwd=(); my $pwd=$ENV{'request.filename'}; @@ -53,9 +134,11 @@ sub xmlparse { my $result; my $safeeval = new Safe; + my $safehole = new Safe::Hole; $safeeval->permit("entereval"); $safeeval->permit(":base_math"); $safeeval->deny(":base_io"); + $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT'); #need to inspect this class of ops # $safeeval->deny(":base_orig"); $safeinit .= ';$external::target='.$target.';'; @@ -71,82 +154,89 @@ sub xmlparse { my $token; while ( $#pars > -1 ) { while ($token = $pars[$#pars]->get_token) { - if ($token->[0] eq 'T') { - if ($Apache::lonxml::textredirection == 1) {$result=$token->[1];} -# $finaloutput .= &Apache::run::evaluate($token->[1],$safeeval,''); + 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') { -# if ($target eq 'meta' and $token->[2]->{metaout} eq 'ON') {$Apache::lonxml::textredirection = 1;} # add tag to stack push (@stack,$token->[1]); # add parameters list to another stack push (@parstack,&parstring($token)); &increasedepth($token); if (exists $style_for_target{$token->[1]}) { - - if ($Apache::lonxml::redirection == 1) { - $finaloutput .= &recurse($style_for_target{$token->[1]}, - $target,$safeeval,\%style_for_target, - @parstack); - } else { - $Apache::lonxml::outputstack .= &recurse($style_for_target{$token->[1]}, - $target,$safeeval,\%style_for_target, - @parstack); - } - + if ($Apache::lonxml::redirection) { + $Apache::lonxml::outputstack['-1'] .= + &recurse($style_for_target{$token->[1]},$target,$safeeval, + \%style_for_target,@parstack); + } else { + $finaloutput .= &recurse($style_for_target{$token->[1]},$target, + $safeeval,\%style_for_target,@parstack); + } } else { $result = &callsub("start_$token->[1]", $target, $token,\@parstack, - \@pars, $safeeval, \%style_for_target); + \@pars, $safeeval, \%style_for_target); } } elsif ($token->[0] eq 'E') { -# if ($target eq 'meta') {$Apache::lonxml::textredirection = 0;} #clear out any tags that didn't end - while ($token->[1] ne $stack[$#stack] - && ($#stack > -1)) {pop @stack;pop @parstack;&decreasedepth($token);} + while ($token->[1] ne $stack[$#stack] && ($#stack > -1)) { + &Apache::lonxml::warning("Unbalanced tags in resource $stack['-1']"); + pop @stack;pop @parstack;&decreasedepth($token); + } if (exists $style_for_target{'/'."$token->[1]"}) { - - if ($Apache::lonxml::redirection == 1) { - $finaloutput .= &recurse($style_for_target{'/'."$token->[1]"}, - $target,$safeeval,\%style_for_target, - @parstack); - } else { - $Apache::lonxml::outputstack .= &recurse($style_for_target{'/'."$token->[1]"}, - $target,$safeeval,\%style_for_target, - @parstack); - } + if ($Apache::lonxml::redirection) { + $Apache::lonxml::outputstack['-1'] .= + &recurse($style_for_target{'/'."$token->[1]"}, + $target,$safeeval,\%style_for_target,@parstack); + } else { + $finaloutput .= &recurse($style_for_target{'/'."$token->[1]"}, + $target,$safeeval,\%style_for_target, + @parstack); + } } else { $result = &callsub("end_$token->[1]", $target, $token, \@parstack, - \@pars,$safeeval, \%style_for_target); + \@pars,$safeeval, \%style_for_target); } + } else { + &Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:"); } + #evaluate variable refs in result if ($result ne "") { if ( $#parstack > -1 ) { - - if ($Apache::lonxml::redirection == 1) { - $finaloutput .= &Apache::run::evaluate($result,$safeeval, - $parstack[$#parstack]); - } else { - $Apache::lonxml::outputstack .= &Apache::run::evaluate($result,$safeeval, - $parstack[$#parstack]); - } - + if ($Apache::lonxml::redirection) { + $Apache::lonxml::outputstack['-1'] .= + &Apache::run::evaluate($result,$safeeval,$parstack[$#parstack]); + } else { + $finaloutput .= &Apache::run::evaluate($result,$safeeval, + $parstack[$#parstack]); + } } else { $finaloutput .= &Apache::run::evaluate($result,$safeeval,''); } $result = ''; - } else { - $finaloutput .= $result; + } + if ($token->[0] eq 'E') { + pop @stack;pop @parstack;&decreasedepth($token); } - if ($token->[0] eq 'E') { pop @stack;pop @parstack;&decreasedepth($token);} } pop @pars; 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 = (); @@ -160,8 +250,10 @@ sub recurse { my $decls=''; while ( $#pat > -1 ) { while ($tokenpat = $pat[$#pat]->get_token) { - if ($tokenpat->[0] eq 'T') { - if ($Apache::lonxml::textredirection == 1) {$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)); @@ -172,11 +264,15 @@ sub recurse { } elsif ($tokenpat->[0] eq 'E') { #clear out any tags that didn't end while ($tokenpat->[1] ne $innerstack[$#innerstack] - && ($#innerstack > -1)) {pop @innerstack;pop @innerparstack; - &decreasedepth($tokenpat);} + && ($#innerstack > -1)) { + &Apache::lonxml::warning("Unbalanced tags in resource $innerstack['-1']"); + pop @innerstack;pop @innerparstack;&decreasedepth($tokenpat); + } $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 @@ -210,27 +306,58 @@ 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
\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
\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
\n"); - if (defined($token->[4])) { - $currentstring = $token->[4]; - } else { - $currentstring = $token->[2]; + &Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode
\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; } +sub startredirection { + $Apache::lonxml::redirection++; + push (@Apache::lonxml::outputstack, ''); +} + +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); + return ''; + } + $Apache::lonxml::redirection--; + pop @Apache::lonxml::outputstack; +} + sub initdepth { @Apache::lonxml::depthcounter=(); $Apache::lonxml::depth=-1; @@ -244,8 +371,9 @@ sub increasedepth { if ($Apache::lonxml::depthcounter[$Apache::lonxml::depth]==1) { $Apache::lonxml::olddepth=$Apache::lonxml::depth; } -# my $curdepth=join('_',@Apache::lonxml::depthcounter); -# print "
s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]
\n"; + my $curdepth=join('_',@Apache::lonxml::depthcounter); + &Apache::lonxml::debug("s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n"); +#print "
s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n"; } sub decreasedepth { @@ -255,8 +383,13 @@ sub decreasedepth { $#Apache::lonxml::depthcounter--; $Apache::lonxml::olddepth=$Apache::lonxml::depth+1; } -# my $curdepth=join('_',@Apache::lonxml::depthcounter); -# print "
e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth
\n"; + if ( $Apache::lonxml::depth < -1) { + &Apache::lonxml::warning("Unbalanced tags in resource"); + $Apache::lonxml::depth='-1'; + } + my $curdepth=join('_',@Apache::lonxml::depthcounter); + &Apache::lonxml::debug("e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n"); +#print "
e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n"; } sub get_all_text { @@ -265,28 +398,52 @@ 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)) { - 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]; } } } +# &Apache::lonxml::debug("Exit:$result:"); return $result } 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 { @@ -301,7 +458,10 @@ sub parstring { my $temp=''; map { unless ($_=~/\W/) { - $temp .= "my \$$_=\"$token->[2]->{$_}\";" + my $val=$token->[2]->{$_}; + $val =~ s/([\%\@\\])/\\$1/g; + #if ($val =~ m/^[\%\@]/) { $val="\\".$val; } + $temp .= "my \$$_=\"$val\";" } } @{$token->[3]}; return $temp; @@ -318,17 +478,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)/\$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)/\$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)/\$1\<\/a\>/s; + $result.=(<<"ENDSCRIPT"); + +ENDSCRIPT + } + return $result; +} + sub handler { my $request=shift; my $target='web'; - $Apache::lonxml::debug=1; + + $Apache::lonxml::debug=0; + if ($ENV{'browser.mathml'}) { $request->content_type('text/xml'); } else { $request->content_type('text/html'); } - + # $request->print(< # @@ -338,37 +546,58 @@ sub handler { #ENDHEADER # &Apache::lonhomework::send_header($request); $request->send_http_header; + + return OK if $request->header_only; - return 'OK' if $request->header_only; - - $request->print(&Apache::lontexconvert::header()); - - $request->print(''."\n"); - my $file = "/home/httpd/html".$request->uri; + my $file=&Apache::lonnet::filelocation("",$request->uri); my %mystyle; - my $result = ''; - $result = Apache::lonxml::xmlparse($target, &Apache::lonnet::getfile($file),'',%mystyle); + my $result = ''; + my $filecontents=&Apache::lonnet::getfile($file); + if ($filecontents == -1) { + &Apache::lonxml::error(" Unable to find $file"); + $filecontents=''; + } else { + $result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle); + } + $request->print($result); - $request->print(''); - $request->print(&Apache::lontexconvert::footer()); writeallows($request->uri); - return 'OK'; + return OK; } -$Apache::lonxml::debug=0; sub debug { if ($Apache::lonxml::debug eq 1) { - print "DEBUG:".$_[0]."
\n"; + print "DEBUG:".$_[0]."
\n"; } } + sub error { - print "ERROR:".$_[0]."
\n"; + if ($Apache::lonxml::debug eq 1) { + print "ERROR:".$_[0]."
\n"; + } else { + print "An Error occured while processing this resource. The instructor has been notified.
"; + #notify author + &Apache::lonmsg::author_res_msg($ENV{'request.filename'},$_[0]); + #notify course + if ( $ENV{'request.course.id'} ) { + my $users=$ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}; + foreach my $user (split /\,/, $users) { + ($user,my $domain) = split /:/, $user; + &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]); + } } + sub warning { if ($Apache::lonxml::debug eq 1) { - print "WARNING:".$_[0]."
\n"; + print "WARNING:".$_[0]."
\n"; } } @@ -376,19 +605,3 @@ sub warning { __END__ - - - - - - - - - - - - - - - -