--- loncom/xml/scripttag.pm 2000/08/11 14:57:33 1.10
+++ loncom/xml/scripttag.pm 2000/10/05 19:31:54 1.18
@@ -12,30 +12,59 @@ sub BEGIN {
'parserlib','import'));
}
+$Apache::scripttag::SCRIPT_RESULT='';
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);
+ my $args ='';
+ if ( $#$parstack > -1 ) {
+ $args=$$parstack[$#$parstack];
+ }
+ my $type = &Apache::run::run("{$args;".'return $type}',$safeeval);
+ #&Apache::lonxml::debug("found type of $type");
+ $Apache::scripttag::SCRIPT_RESULT='';
+ if ($type eq "loncapa/perl") {
+ $safeeval->share('$SCRIPT_RESULT');
+ my $bodytext=&Apache::lonxml::get_all_text("script",$$parser[$#$parser]);
+
+ if ( $target eq "modified" ) {
+ }
+ &Apache::run::run($bodytext,$safeeval);
+
+ if ($target eq "edit" ) {
+ $Apache::scripttag::SCRIPT_RESULT =
+ "
<$token->[1]> output:
$bodytext
Source:
";
+ $Apache::scripttag::SCRIPT_RESULT.=&editfield($token->[1],$bodytext);
+ }
} else {
- $result=&editfield($token->[1],$bodytext);
+ $Apache::scripttag::SCRIPT_RESULT = $token->[4];
}
- return $result;
+ return $Apache::scripttag::SCRIPT_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($bodytext),$safeeval);
- #print "ran $bodytext:
".&getfile($bodytext)."
";
- } else {
- $result=&editfield($token->[1],$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);
}
return $result;
}
@@ -46,11 +75,19 @@ 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($bodytext)));
- } else {
+
+ $bodytext=&Apache::run::evaluate($bodytext,$safeeval,
+ $$parstack[$#$parstack]);
+ my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],
+ $bodytext);
+ my $styletext=&Apache::lonnet::getfile($location);
+ 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);
}
return $result;
@@ -63,13 +100,21 @@ 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 $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
+ my $file=&Apache::lonnet::getfile($location);
+ if ($file == -1) {
+ &Apache::lonxml::error(" Unable to find $bodytext $location for import");
+ return "";
+ }
+
+ my $dir=$location;
+ $dir=~s:/[^/]*$::;
+ &Apache::lonxml::newparser($parser,\$file,$dir);
+
+ if ($target eq "edit" ) {
+ $result.=&editfield($token->[1],$bodytext);
$result.="Clickhere to edit
"
}
}
@@ -89,19 +134,20 @@ sub editfield {
return "
\n<$tag>
\n
\n</$tag>
\n";
}
-sub getfile {
+sub getfilenothere {
my ($filename) = @_;
my $a="";
+
+ $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);
}
- {
- my $fh=Apache::File->new($filename);
- while (<$fh>) {
+ if (! -e $filename ) { return -1; };
+ my $fh=Apache::File->new($filename);
+ while (<$fh>) {
$a .=$_;
- }
}
return $a
}