--- loncom/xml/scripttag.pm 2000/10/10 18:18:26 1.20
+++ loncom/xml/scripttag.pm 2001/01/04 19:15:02 1.29
@@ -10,41 +10,70 @@ use Apache::lonnet;
sub BEGIN {
&Apache::lonxml::register('Apache::scripttag',('script','scriptlib',
'parserlib','import',
- 'footnote'));
+ 'footnote','display'));
}
-$Apache::scripttag::SCRIPT_RESULT='';
sub start_script {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
my $args ='';
- if ( $#$parstack > -1 ) {
- $args=$$parstack[$#$parstack];
- }
+ if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
my $type = &Apache::run::run("{$args;".'return $type}',$safeeval);
+ my $result='';
#&Apache::lonxml::debug("found type of $type");
- $Apache::scripttag::SCRIPT_RESULT='';
if ($type eq "loncapa/perl") {
- $safeeval->share('$SCRIPT_RESULT');
- my $bodytext=&Apache::lonxml::get_all_text("script",$$parser[$#$parser]);
+ my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);
if ( $target eq "modified" ) {
- }
- &Apache::run::run($bodytext,$safeeval);
-
- if ($target eq "edit" ) {
- $Apache::scripttag::SCRIPT_RESULT =
- "
<$token->[1]> output:
$bodytext
Source:
";
- $Apache::scripttag::SCRIPT_RESULT.=&editfield($token->[1],$bodytext);
+
+ } elsif ( $target eq "web" || $target eq "grade" ) {
+ &Apache::run::run($bodytext,$safeeval);
+ } elsif ($target eq "edit" ) {
+ &Apache::run::run($bodytext,$safeeval);
+ $result="
<$token->[1]> output:
$bodytext
Source:
";
+ $result.=&editfield($token->[1],$bodytext);
}
} else {
- $Apache::scripttag::SCRIPT_RESULT = $token->[4];
+ if ($target ne "meta") { $result = $token->[4]; }
}
- return $Apache::scripttag::SCRIPT_RESULT;
+ return $result;
}
sub end_script {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
- return $token->[2];
+ if ( $target eq "meta" ) { return ''; }
+ my $args ='';
+ if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
+ my $type = &Apache::run::run("{$args;".'return $type}',$safeeval);
+ my $result='';
+ #other script blocks need to survive
+ if ($type ne "loncapa/perl") { return $token->[2]; }
+ return '';
+}
+
+sub start_display {
+ my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my $args ='';
+ if ( $#$parstack > -1 ) {
+ $args=$$parstack[$#$parstack];
+ }
+ my $bodytext=&Apache::lonxml::get_all_text("/display",$$parser[$#$parser]);
+
+ if ( $target eq "modified" ) {
+ }
+ my $result=&Apache::run::run($bodytext,$safeeval);
+ if ($target eq 'grade' ) {
+ # grade should produce no output
+ $result='';
+ }
+ if ($target eq "edit" ) {
+ $result =
+ "
<$token->[1]> output:
$bodytext
Source:
";
+ $result.=&editfield($token->[1],$bodytext);
+ }
+ return $result;
+}
+
+sub end_display {
}
sub start_scriptlib {
@@ -82,6 +111,7 @@ sub start_parserlib {
my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],
$bodytext);
my $styletext=&Apache::lonnet::getfile($location);
+ #&Apache::lonxml::debug("found :$bodytext: in :$location: with :$styletext:");
if ($styletext == -1) {
&Apache::lonxml::error(" Unable to find $location for parserlib");
return "";
@@ -134,6 +164,7 @@ sub start_import {
$result.=&editfield($token->[1],$bodytext);
$result.="Clickhere to edit
"
}
+ return '';
}
sub end_import {