--- loncom/xml/scripttag.pm 2000/08/08 19:34:29 1.7
+++ loncom/xml/scripttag.pm 2000/10/02 22:22:25 1.17
@@ -14,28 +14,50 @@ sub BEGIN {
sub start_script {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my $args ='';
+ 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 $bodytext=$$parser[$#$parser]->get_text("/script");
- if ($target ne "edit" ) {
- $result = &Apache::run::run($bodytext,$safeeval);
+ 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]);
+
+ if ( $target eq "modified" ) {
+
+ }
+
+ # print "
script runs $bodytext";
+ &Apache::run::run($bodytext,$safeeval);
+
+ if ($target eq "edit" ) {
+ $result= "
<$token->[1]> output:
$bodytext
Source:
";
+ $result.=&editfield($token->[1],$bodytext);
+ }
} else {
- $result=&editfield($token->[1],$bodytext);
+ $result = $token->[4];
}
- return $result;
}
-sub end_script {}
+sub end_script {
+ my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ return $token->[2];
+}
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("/home/httpd/html".$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 +68,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,
- &getfile("/home/httpd/html/".$bodytext)));
- } else {
+
+ $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
+ %$style = ( %$style , &Apache::style::styleparser($target,
+ &getfile($bodytext)));
+
+ if ($target eq "edit" ) {
$result=&editfield($token->[1],$bodytext);
}
return $result;
@@ -63,13 +86,19 @@ 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("/home/httpd/html/".$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
"
}
}
@@ -91,12 +120,17 @@ sub editfield {
sub getfile {
my ($filename) = @_;
my $a="";
- &Apache::lonnet::repcopy($filename);
- {
- my $fh=Apache::File->new($filename);
- while (<$fh>) {
+
+ $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 .=$_;
- }
}
return $a
}