--- loncom/xml/scripttag.pm 2000/08/11 15:22:00 1.11
+++ loncom/xml/scripttag.pm 2000/09/14 20:57:49 1.14
@@ -15,11 +15,19 @@ sub BEGIN {
sub start_script {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
my $result="";
- my $bodytext=$$parser[$#$parser]->get_text("/script");
- if ($target ne "edit" ) {
- $result = &Apache::run::run($bodytext,$safeeval);
- } else {
- $result=&editfield($token->[1],$bodytext);
+# my $bodytext=$$parser[$#$parser]->get_text("/script");
+ my $bodytext=&Apache::lonxml::get_all_text("script",$$parser[$#$parser]);
+
+ if ( $target eq "modified" ) {
+
+ }
+
+# print "
script runs $bodytext";
+ $result = &Apache::run::run($bodytext,$safeeval);
+
+ if ($target eq "edit" ) {
+ $result= "
<$token->[1]> output:
$bodytext
Source:
";
+ $result.=&editfield($token->[1],$bodytext);
}
return $result;
}
@@ -30,12 +38,13 @@ sub start_scriptlib {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
my $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
my $result ="";
- if ($target ne "edit" ) {
- $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
- &Apache::run::run(&getfile($bodytext),$safeeval);
- #print "ran $bodytext:
".&getfile($bodytext)."
";
- } else {
- $result=&editfield($token->[1],$bodytext);
+
+ $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
+ &Apache::run::run(&getfile($bodytext),$safeeval);
+ #print "ran $bodytext:
".&getfile($bodytext)."
";
+
+ if ($target eq "edit" ) {
+ $result.=&editfield($token->[1],$bodytext);
}
return $result;
}
@@ -46,11 +55,12 @@ sub start_parserlib {
my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
my $bodytext=$$parser[$#$parser]->get_text("/parserlib");
my $result ="";
- if ($target ne "edit" ) {
- $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
- %$style = ( %$style , &Apache::style::styleparser($target,
+
+ $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
+ %$style = ( %$style , &Apache::style::styleparser($target,
&getfile($bodytext)));
- } else {
+
+ if ($target eq "edit" ) {
$result=&editfield($token->[1],$bodytext);
}
return $result;
@@ -63,13 +73,18 @@ sub start_import {
my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
my $bodytext=$$parser[$#$parser]->get_text("/import");
my $result ="";
- if ($target ne "edit" ) {
- $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
- my $file=&getfile($bodytext);
- my $tempparser=HTML::TokeParser->new(\$file);
- push (@$parser,$tempparser);
- } else {
- $result=&editfield($token->[1],$bodytext);
+
+ $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
+ my $file=&getfile($bodytext);
+ if ($file eq -1) {
+ return " Unable to find $bodytext for import";
+ }
+
+ my $tempparser=HTML::TokeParser->new(\$file);
+ push (@$parser,$tempparser);
+
+ if ($target eq "edit" ) {
+ $result.=&editfield($token->[1],$bodytext);
$result.="Clickhere to edit
"
}
}
@@ -93,12 +108,13 @@ sub getfile {
my ($filename) = @_;
my $a="";
- $filename=~ s/\s+//g;
+ $filename=~ s/^\s*(\S+)\s*$/$1/; ## strip off leading and trailing spaces
$filename="/home/httpd/html/res".$filename;
if (! -e $filename ) {
&Apache::lonnet::subscribe($filename);
&Apache::lonnet::repcopy($filename);
}
+ if (! -e $filename ) { return -1; };
my $fh=Apache::File->new($filename);
while (<$fh>) {
$a .=$_;