--- loncom/xml/scripttag.pm 2000/10/02 22:22:25 1.17
+++ loncom/xml/scripttag.pm 2001/02/19 20:43:00 1.33
@@ -9,42 +9,70 @@ use Apache::lonnet;
sub BEGIN {
&Apache::lonxml::register('Apache::scripttag',('script','scriptlib',
- 'parserlib','import'));
+ 'parserlib','import',
+ '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);
- &Apache::lonxml::debug("found type of $type");
- my $result="";
+ my $result='';
+ #&Apache::lonxml::debug("found type of $type");
if ($type eq "loncapa/perl") {
- $safeeval->share('$Apache::scripttag::start_script::result');
- # my $bodytext=$$parser[$#$parser]->get_text("/script");
- my $bodytext=&Apache::lonxml::get_all_text("script",$$parser[$#$parser]);
+ my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);
if ( $target eq "modified" ) {
-
- }
-
- # print "
script runs $bodytext";
- &Apache::run::run($bodytext,$safeeval);
-
- if ($target eq "edit" ) {
- $result= "
<$token->[1]> output:
$bodytext
Source:
";
+ } 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 $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 {
@@ -52,9 +80,17 @@ sub start_scriptlib {
my $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
my $result ="";
- $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
- &Apache::run::run(&getfile($bodytext),$safeeval);
- #print "ran $bodytext:
".&getfile($bodytext)."
";
+ $bodytext=&Apache::run::evaluate($bodytext,$safeeval,
+ $$parstack[$#$parstack]);
+ my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],
+ $bodytext);
+ my $script=&Apache::lonnet::getfile($location);
+ if ($script == -1) {
+ &Apache::lonxml::error(" Unable to find $location for scriptlib");
+ return "";
+ }
+ &Apache::run::run($script,$safeeval);
+ #&Apache::lonxml::debug("ran $bodytext:
".&Apache::lonnet::getfile($bodytext)."
");
if ($target eq "edit" ) {
$result.=&editfield($token->[1],$bodytext);
@@ -69,9 +105,17 @@ sub start_parserlib {
my $bodytext=$$parser[$#$parser]->get_text("/parserlib");
my $result ="";
- $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
- %$style = ( %$style , &Apache::style::styleparser($target,
- &getfile($bodytext)));
+ $bodytext=&Apache::run::evaluate($bodytext,$safeeval,
+ $$parstack[$#$parstack]);
+ 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 "";
+ }
+ %$style = ( %$style , &Apache::style::styleparser($target,$styletext));
if ($target eq "edit" ) {
$result=&editfield($token->[1],$bodytext);
@@ -82,29 +126,72 @@ sub start_parserlib {
sub end_parserlib {
}
+sub start_window {
+ my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my $result = '';
+ if ($target eq 'web') {
+ $Apache::lonxml::redirection = 0;
+ }
+ return $result;
+}
+
+sub end_window {
+ my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my $result;
+ if ($target eq 'web') {
+ $Apache::lonxml::outputstack =~ s/\"/\"\;/g;
+ $result = "newwindow $Apache::lonxml::outputstack