--- loncom/xml/scripttag.pm 2001/09/18 02:21:13 1.51 +++ loncom/xml/scripttag.pm 2001/10/13 06:00:04 1.54 @@ -31,8 +31,17 @@ sub start_script { my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]); if ( $target eq "modified" ) { $result=$token->[4].&Apache::edit::modifiedfield(); - } elsif ( $target eq "web" || $target eq "grade" || $target eq 'answer') { + } elsif ( $target eq 'web' || $target eq 'tex' || + $target eq 'grade' || $target eq 'answer') { &Apache::run::run($bodytext,$safeeval); + if (($ENV{'request.state'} eq 'construct') && ($target eq 'web')) { + $Apache::lonxml::evaluate--; + $result.="newwindow
";
+	my $listing= &Apache::run::dump($target,$safeeval);
+	$listing =~ s/\n/\\n/g;
+	$result.=$listing;
+	$result.= "
\');newWindow.document.close();void(0);\">Script Vars"; + } } elsif ($target eq "edit" ) { #&Apache::run::run($bodytext,$safeeval); #$result="
<$token->[1]> output:
$bodytext
Source:
"; @@ -51,8 +60,13 @@ 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") { return $token->[2]; } - if ($target eq 'edit' ) { return &Apache::edit::end_table(); } + if ($type ne "loncapa/perl") { + return $token->[2]; + } elsif ($target eq 'edit' ) { + return &Apache::edit::end_table(); + } elsif (($ENV{'request.state'} eq 'construct') && ($target eq 'web')) { + $Apache::lonxml::evaluate++; + } return ''; } @@ -64,7 +78,8 @@ sub start_display { if ( $target eq "modified" ) { $result=$token->[4].&Apache::edit::modifiedfield(); - } elsif ( $target eq "web" || $target eq "grade" || $target eq 'answer') { + } elsif ( $target eq 'web' || $target eq 'tex' || + $target eq 'grade' || $target eq 'answer') { $result=&Apache::run::run($bodytext,$safeeval); if ($target eq 'grade' ) { $result=''; # grade should produce no output @@ -255,8 +270,8 @@ sub end_storetc { my $result; my $output=&Apache::lonxml::endredirection; $output =~ s/\"/\"\;/g; - $result = "{\bf $output.}}\write\tcfile{\protect\tcpc{ $output.}{\the\value{relpage}}}"; - return $result; + $result = '{\bf '.$output.'.}}\write\tcfile{\protect\tcpc{ '.$output.'.}{\the\value{relpage}}}'; + return $result; }