--- loncom/xml/scripttag.pm 2002/09/23 17:25:24 1.77
+++ loncom/xml/scripttag.pm 2008/12/11 21:28:59 1.151
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# ".&mt('Script Vars')."
";
+ &Apache::lonxml::add_script_result($script_var);
+ }
} elsif ($target eq "edit" ) {
#&Apache::run::run($bodytext,$safeeval);
#$result="
<$token->[1]> output:
$bodytext
Source:
";
- $result=&Apache::edit::tag_start($target,$token,'Script');
- $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4);
+ my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
+ $result=&Apache::edit::tag_start($target,$token,'Script');
+ $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4);
+ } elsif ($target eq 'meta') {
+ 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("/script",$$parser[$#$parser]);
- $result.=$bodytext;
- }
+ my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
+ if ($target ne "meta" && $target ne 'tex' && $target ne 'answer') {
+ $result = $token->[4];
+ $result.=$bodytext;
+ }
}
return $result;
}
@@ -89,11 +153,11 @@ 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();
- } elsif (($target eq 'answer')) {
+ } elsif ($target eq 'answer') {
$Apache::lonxml::evaluate++;
}
return '';
@@ -101,24 +165,36 @@ sub end_script {
sub start_display {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-
+ @Apache::scripttag::parser_env = @_;
my $result;
- my $bodytext=&Apache::lonxml::get_all_text("/display",$$parser[$#$parser]);
if ( $target eq "modified" ) {
- $result=$token->[4].&Apache::edit::modifiedfield();
+ $result=$token->[4].&Apache::edit::modifiedfield("/display",$parser);
} elsif ( $target eq 'web' || $target eq 'tex' ||
- $target eq 'grade' || $target eq 'answer') {
- $result=&Apache::run::run($bodytext,$safeeval);
- if ($target eq 'grade' || $target eq 'answer' ) {
- $result=''; # grade should produce no output
- }
+ $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);
+ }
+ $result=&Apache::run::run($bodytext,$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=''; }
+ }
+ $Apache::lonxml::post_evaluate=0;
} elsif ($target eq "edit" ) {
+ 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);
$result=&Apache::edit::tag_start($target,$token,'Script With Display');
$result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,1)
+ } elsif ($target eq 'meta') {
+ my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser);
}
return $result;
}
@@ -135,7 +211,9 @@ sub start_scriptlib {
my $result ='';
my $error='';
- if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit' || $target eq 'answer') {
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
+ $target eq 'meta' || $target eq 'edit' || $target eq 'answer' ||
+ $target eq 'analyze' || $target eq 'webgrade') {
$bodytext=$$parser[$#$parser]->get_text("/scriptlib");
$bodytext=&Apache::run::evaluate($bodytext,$safeeval,
$$parstack[$#$parstack]);
@@ -144,7 +222,7 @@ sub start_scriptlib {
my $script=&Apache::lonnet::getfile($location);
if ($script == -1) {
if ($target eq 'edit') {
- $error='