--- loncom/xml/scripttag.pm 2004/02/11 15:10:05 1.108
+++ loncom/xml/scripttag.pm 2006/03/29 22:41:39 1.137
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Script Vars
";
+ $result.= "$end_page');newWindow.document.close();newWindow.focus()}
+// ]]>
+Script Vars
";
}
} elsif ($target eq "edit" ) {
#&Apache::run::run($bodytext,$safeeval);
@@ -136,11 +147,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;
}
@@ -151,7 +162,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();
@@ -163,14 +174,14 @@ sub end_script {
sub start_display {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-
+ @Apache::scripttag::parser_env = @_;
my $result;
if ( $target eq "modified" ) {
$result=$token->[4].&Apache::edit::modifiedfield("/display",$parser);
} elsif ( $target eq 'web' || $target eq 'tex' ||
- $target eq 'grade' || $target eq 'answer' ||
- $target eq 'analyze') {
+ $target eq 'grade' || $target eq 'webgrade' ||
+ $target eq 'answer' || $target eq 'analyze') {
my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser);
if (!$Apache::lonxml::default_homework_loaded) {
&Apache::lonxml::default_homework_load($safeeval);
@@ -178,11 +189,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);
@@ -208,7 +222,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]);
@@ -254,7 +268,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]);
@@ -295,19 +309,19 @@ 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{';
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
$result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70);
- $result.=&Apache::edit::text_arg('Height:','width',$token,5);
- $result.=&Apache::edit::text_arg('Width:','height',$token,5);
+ $result.=&Apache::edit::text_arg('Height:','height',$token,5);
+ $result.=&Apache::edit::text_arg('Width:','width',$token,5);
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
- $safeeval,'linttext',
+ $safeeval,'linktext',
'width','height');
if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
}
@@ -317,7 +331,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,'<>&"\'');
@@ -328,7 +342,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 {
@@ -344,8 +374,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);
@@ -391,7 +421,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;
}
@@ -433,9 +464,9 @@ sub end_physnet {
sub start_standalone {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web' ) {
- if ( $ENV{'request.course.id'} ) {
- my $inside = &Apache::lonxml::get_all_text("/standalone",$parser);
+ if ($target eq 'web' || $target eq 'webgrade') {
+ if ( $env{'request.course.id'} ) {
+ my $inside = &Apache::lonxml::get_all_text("/standalone",$parser,$style);
} else {
$result='
'; } @@ -446,8 +477,8 @@ sub start_standalone { sub end_standalone { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web' ) { - if ( $ENV{'request.course.id'} ) { + if ($target eq 'web' || $target eq 'webgrade' ) { + if ( $env{'request.course.id'} ) { } else { $result=' |