--- loncom/xml/scripttag.pm 2000/12/05 22:07:26 1.26
+++ loncom/xml/scripttag.pm 2001/01/12 20:38:06 1.32
@@ -10,15 +10,13 @@ use Apache::lonnet;
sub BEGIN {
&Apache::lonxml::register('Apache::scripttag',('script','scriptlib',
'parserlib','import',
- 'footnote','display'));
+ 'window','display'));
}
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");
@@ -26,23 +24,29 @@ sub start_script {
my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);
if ( $target eq "modified" ) {
- }
- &Apache::run::run($bodytext,$safeeval);
-
- if ($target eq "edit" ) {
+ } 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 {
- $result = $token->[4];
+ if ($target ne "meta") { $result = $token->[4]; }
}
return $result;
}
sub end_script {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
-# return '';
- 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 {
@@ -106,6 +110,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 "";
@@ -121,19 +126,26 @@ sub start_parserlib {
sub end_parserlib {
}
-sub start_footnote {
+sub start_window {
my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- $Apache::lonxml::redirection = 0;
+ if ($target eq 'web') {
+ $Apache::lonxml::redirection = 0;
+ }
return $result;
}
-sub end_footnote {
+sub end_window {
my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
- $Apache::lonxml::outputstack =~ s/\"/\"\;/g;
- my $result = "newwindow $Apache::lonxml::outputstack