--- loncom/xml/scripttag.pm 2004/02/12 17:34:24 1.109 +++ loncom/xml/scripttag.pm 2005/02/26 06:14:01 1.124 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Script Vars
"; + $result.= "');newWindow.document.close();} +// ]]> +Script Vars
"; } } elsif ($target eq "edit" ) { #&Apache::run::run($bodytext,$safeeval); @@ -137,11 +140,11 @@ sub start_script { my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser); } } else { - if ($target ne "meta") { - $result = $token->[4]; my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser); - $result.=$bodytext; - } + if ($target ne "meta" && $target ne 'tex') { + $result = $token->[4]; + $result.=$bodytext; + } } return $result; } @@ -152,7 +155,7 @@ sub end_script { my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval); my $result=''; #other script blocks need to survive - if ($type ne "loncapa/perl") { + if ($type ne "loncapa/perl" && $target ne 'tex') { return $token->[2]; } elsif ($target eq 'edit' ) { return &Apache::edit::end_table(); @@ -164,7 +167,7 @@ sub end_script { sub start_display { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - + @Apache::scripttag::parser_env = @_; my $result; if ( $target eq "modified" ) { @@ -179,11 +182,14 @@ sub start_display { $result=&Apache::run::run($bodytext,$safeeval); if ($target eq 'grade' || $target eq 'answer' || $target eq 'analyze') { - $result=''; # grade should produce no output + # grade/answer/analyxe should produce no output but if we + # are redirecting, the redirecter should know what to do + # with the output + if (!$Apache::lonxml::redirection) { $result=''; } } $Apache::lonxml::post_evaluate=0; } elsif ($target eq "edit" ) { - my $bodytext=&Apache::lonxml::get_all_text_unblanced("/display",$parser); + my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser); #$result = # "
<$token->[1]> output:
$bodytext
Source:
"; #$result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1); @@ -392,7 +398,8 @@ sub end_import { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; pop(@Apache::inputtags::import); my $result; - if ($target eq 'edit' ) { $result=&Apache::edit::end_table(); } + if ($target eq 'edit' ) { $result=&Apache::edit::end_row. + &Apache::edit::end_table(); } return $result; } @@ -482,7 +489,15 @@ sub end_comment { sub xmlparse { my ($string) = @_; -# &Apache::lonxml::debug("Got $string"); + &Apache::lonxml::debug("xmlparse recursion starting with $string"); + # Apache::run::evaluate does an 'eval' on the name of the subroutine + # if it detects something that looks like a subroutine, this ends up calling + # things without any arguments and since perl is nice enough to pass + # along the default arguments when you don't explicitly say no arguments + # if you call &xmlparse, it gets &xmlparse passed as it argument. + # Same thing soccurs with &chemparse. + if ($string eq '&xmlparse') { return '&xmlparse'; } + if ($string eq '&chemparse') { return '&chemparse'; } my ($target,$token,$tagstack,$parstack,$oldparser,$safeeval,$style)= @Apache::scripttag::parser_env; my @parser; @@ -490,8 +505,76 @@ sub xmlparse { my $result=&Apache::lonxml::inner_xmlparse($target,$tagstack, $parstack,\@parser, $safeeval,$style); + &Apache::lonxml::debug("target is $target xmlparse recursion ending with $result"); return $result; } +sub start_num { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; + my $result = ''; + my $inside = &Apache::lonxml::get_all_text_unbalanced("/num",$parser); + if ($target eq 'tex' || $target eq 'web') { + $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); + if (!$Apache::lonxml::default_homework_loaded) { + &Apache::lonxml::default_homework_load($safeeval); + } + @Apache::scripttag::parser_env = @_; + my $format=&Apache::lonxml::get_param('format',$parstack,$safeeval); + $result=&Apache::run::run("return &prettyprint(q\0$inside\0,q\0$format\0);",$safeeval); + } + return $result; +} + +sub end_num { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; + my $result = ''; + return $result; +} + +sub start_parse { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; + my $result = ''; + if ( $target eq 'web' || $target eq 'tex' || + $target eq 'grade' || $target eq 'answer' || + $target eq 'analyze') { + my $inside = &Apache::lonxml::get_all_text_unbalanced("/parse",$parser); + $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); + if (!$Apache::lonxml::default_homework_loaded) { + &Apache::lonxml::default_homework_load($safeeval); + } + @Apache::scripttag::parser_env = @_; + $result=&Apache::run::run("return &xmlparse(q\0$inside\0);",$safeeval); + } + return $result; +} + +sub end_parse { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; + my $result = ''; + return $result; +} + +sub start_algebra { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; + my $result = ''; + if ( $target eq 'web' || $target eq 'tex' || + $target eq 'grade' || $target eq 'answer' || + $target eq 'analyze') { + my $inside = &Apache::lonxml::get_all_text_unbalanced("/algebra",$parser); + $inside = &Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { + $result=&Apache::lontexconvert::algebra($inside,$target); + } + $Apache::lonxml::post_evaluate=0; + } + return $result; +} + +sub end_algebra { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; + my $result = ''; + return $result; +} + 1; __END__