--- loncom/xml/scripttag.pm 2000/11/22 00:00:54 1.24
+++ loncom/xml/scripttag.pm 2000/12/21 18:12:12 1.28
@@ -26,23 +26,25 @@ 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)=@_;
+ if ( $target eq "meta" ) { return ''; }
+# return $token->[2];
return '';
- #return $token->[2];
}
sub start_display {
@@ -56,7 +58,10 @@ sub start_display {
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:
";
@@ -103,6 +108,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 "";
@@ -155,6 +161,7 @@ sub start_import {
$result.=&editfield($token->[1],$bodytext);
$result.="Clickhere to edit
"
}
+ return '';
}
sub end_import {