--- loncom/xml/scripttag.pm 2005/09/15 18:30:11 1.131 +++ loncom/xml/scripttag.pm 2007/01/23 21:28:41 1.140 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Script Vars
"; } @@ -214,7 +224,7 @@ sub start_scriptlib { if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit' || $target eq 'answer' || - $target eq 'analyze') { + $target eq 'analyze' || $target eq 'webgrade') { $bodytext=$$parser[$#$parser]->get_text("/scriptlib"); $bodytext=&Apache::run::evaluate($bodytext,$safeeval, $$parstack[$#$parstack]); @@ -260,7 +270,7 @@ sub start_parserlib { my $error=''; if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit' || $target eq 'answer' || - $target eq 'analyze') { + $target eq 'analyze' || $target eq 'webgrade') { $bodytext=$$parser[$#$parser]->get_text("/parserlib"); $bodytext=&Apache::run::evaluate($bodytext,$safeeval, $$parstack[$#$parstack]); @@ -301,7 +311,7 @@ sub end_parserlib { sub start_window { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result = ''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'webgrade') { &Apache::lonxml::startredirection; } elsif ($target eq 'tex') { $result = '\unskip\footnote{'; @@ -323,7 +333,7 @@ sub start_window { sub end_window { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'webgrade') { my $output=&Apache::lonxml::endredirection; $output =~ s/[\n\r]/ /g; # $output = &HTML::Entities::encode($output,'<>&"\''); @@ -334,7 +344,23 @@ sub end_window { if (!$width) { $width='500'; } my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval); if (!$height) { $height='200'; } - $result = "$linktext"; + + my $start_page = + &Apache::loncommon::start_page($linktext, undef, + {'only_body' => 1, + 'bgcolor' => '#FFFFFF', + 'js_ready' => 1,}); + my $end_page = + &Apache::loncommon::end_page({'js_ready' => 1,}); + $result = "$linktext"; } elsif ($target eq 'tex') { $result = '}'; } else { @@ -350,8 +376,8 @@ sub start_import { $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]); - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || - $target eq 'tex' || $target eq 'analyze' ) { + if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade' + || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze' ) { # FIXME this probably needs to be smart about construction vs. # non construction space. my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext); @@ -440,9 +466,9 @@ sub end_physnet { sub start_standalone { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web' ) { + if ($target eq 'web' || $target eq 'webgrade') { if ( $env{'request.course.id'} ) { - my $inside = &Apache::lonxml::get_all_text("/standalone",$parser); + my $inside = &Apache::lonxml::get_all_text("/standalone",$parser,$style); } else { $result='
'; } @@ -453,7 +479,7 @@ sub start_standalone { sub end_standalone { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web' ) { + if ($target eq 'web' || $target eq 'webgrade' ) { if ( $env{'request.course.id'} ) { } else { $result='
'; @@ -467,14 +493,15 @@ sub start_comment { my $result=''; if ($target eq 'edit') { $result=&Apache::edit::tag_start($target,$token); - my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser); + my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser,$style); $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4) } elsif ( $target eq 'modified') { $result=$token->[4].&Apache::edit::modifiedfield("/comment",$parser); - } elsif ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' || - $target eq 'answer' || $target eq 'meta' || $target eq 'analyze') { + } elsif ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' || + $target eq 'answer' || $target eq 'meta' || $target eq 'analyze' || + $target eq 'webgrade') { #normally throw away comments - my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser); + my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser,$style); } return $result; } @@ -501,9 +528,11 @@ sub xmlparse { @Apache::scripttag::parser_env; my @parser; &Apache::lonxml::newparser(\@parser,\$string); + &Apache::lonxml::startredirection(); my $result=&Apache::lonxml::inner_xmlparse($target,$tagstack, $parstack,\@parser, $safeeval,$style); + $result.=&Apache::lonxml::endredirection(); &Apache::lonxml::debug("target is $target xmlparse recursion ending with $result"); return $result; } @@ -512,7 +541,7 @@ 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') { + if ($target eq 'tex' || $target eq 'web' || $target eq 'webgrade') { $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); if (!$Apache::lonxml::default_homework_loaded) { &Apache::lonxml::default_homework_load($safeeval); @@ -533,9 +562,9 @@ sub end_num { 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') { + if ( $target eq 'web' || $target eq 'tex' || + $target eq 'grade' || $target eq 'answer' || + $target eq 'analyze'|| $target eq 'webgrade') { my $inside = &Apache::lonxml::get_all_text_unbalanced("/parse",$parser); $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); if (!$Apache::lonxml::default_homework_loaded) { @@ -543,6 +572,13 @@ sub start_parse { } @Apache::scripttag::parser_env = @_; $result=&Apache::run::run("return &xmlparse(q\0$inside\0);",$safeeval); + if ($target eq 'grade' || $target eq 'answer' || + $target eq 'analyze') { + # 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=''; } + } } return $result; } @@ -556,9 +592,9 @@ sub end_parse { 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') { + if ( $target eq 'web' || $target eq 'tex' || + $target eq 'grade' || $target eq 'answer' || + $target eq 'analyze' || $target eq 'webgrade') { 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') {