--- loncom/xml/scripttag.pm 2005/12/01 18:46:17 1.133
+++ loncom/xml/scripttag.pm 2006/03/23 23:47:56 1.135
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Script Vars
";
}
@@ -334,7 +342,15 @@ 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 +366,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);
@@ -545,6 +561,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;
}