--- loncom/xml/scripttag.pm 2002/11/14 16:47:41 1.83
+++ loncom/xml/scripttag.pm 2003/06/08 00:43:19 1.93
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# ';
+ }
+ return ('','no');
+}
+
+sub end_LONCAPA_INTERNAL_LONHTTPD_PORT {
return ('','no');
}
@@ -63,7 +85,7 @@ sub start_script {
my $type= &Apache::lonxml::get_param('type',$parstack,$safeeval);
&Apache::lonxml::debug("found type of $type");
if ($type eq "loncapa/perl") {
- my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);
+ my $bodytext=&Apache::lonxml::get_all_text("/script",$parser);
if ( $target eq "modified" ) {
$result=$token->[4].&Apache::edit::modifiedfield();
} elsif ( $target eq 'web' || $target eq 'tex' ||
@@ -73,7 +95,9 @@ sub start_script {
&Apache::lonxml::default_homework_load($safeeval);
}
&Apache::run::run($bodytext,$safeeval);
- if (($target eq 'answer') && ($Apache::lonhomework::viewgrades == 'F')) {
+ if (($target eq 'answer') &&
+ ($ENV{'form.answer_output_mode'} ne 'tex') &&
+ ($Apache::lonhomework::viewgrades == 'F')) {
$Apache::lonxml::evaluate--;
$result.="[4];
- my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);
+ my $bodytext=&Apache::lonxml::get_all_text("/script",$parser);
$result.=$bodytext;
}
}
@@ -117,7 +141,7 @@ sub start_display {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
- my $bodytext=&Apache::lonxml::get_all_text("/display",$$parser[$#$parser]);
+ my $bodytext=&Apache::lonxml::get_all_text("/display",$parser);
if ( $target eq "modified" ) {
$result=$token->[4].&Apache::edit::modifiedfield();
@@ -258,8 +282,15 @@ sub end_window {
my $result;
if ($target eq 'web') {
my $output=&Apache::lonxml::endredirection;
+ my $linktext= &Apache::lonxml::get_param('linktext',$parstack,$safeeval);
+ if (!$linktext) { $linktext='*'; }
+ my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval);
+ if (!$width) { $width='500'; }
+ my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
+ if (!$height) { $height='200'; }
+ $output =~ s/\'/\\\&\#39\;/g;
$output =~ s/\"/\"\;/g;
- $result = "newwindow $output