--- loncom/xml/scripttag.pm 2000/08/02 16:47:53 1.4
+++ loncom/xml/scripttag.pm 2000/09/19 19:10:01 1.16
@@ -8,18 +8,27 @@ use strict;
use Apache::lonnet;
sub BEGIN {
- &Apache::lonxml::register('Apache::scripttag',('script','scriptlib','parserlib'));
+ &Apache::lonxml::register('Apache::scripttag',('script','scriptlib',
+ 'parserlib','import'));
}
sub start_script {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
-
my $result="";
- my $bodytext=$parser->get_text("/script");
- if ($target ne "edit" ) {
- $result = &Apache::run::run($bodytext,$safeeval);
- } else {
- $result="\n";
+ $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);
}
return $result;
}
@@ -28,13 +37,15 @@ sub end_script {}
sub start_scriptlib {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
- my $bodytext=$parser->get_text("/scriptlib");
+ my $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
my $result ="";
- if ($target ne "edit" ) {
- &Apache::run::run(&getfile($bodytext),$safeeval);
- #print "ran $bodytext:
".&getfile($bodytext)."
";
- } else {
- $result="\n";
+
+ $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;
}
@@ -43,22 +54,71 @@ sub end_scriptlib {}
sub start_parserlib {
my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
- my $bodytext="/home/httpd/html/".$parser->get_text("/parserlib");
- %$style = ( %$style , &Apache::style::styleparser($target, &getfile($bodytext)));
+ 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)));
+
+ if ($target eq "edit" ) {
+ $result=&editfield($token->[1],$bodytext);
+ }
+ return $result;
}
sub end_parserlib {
}
+sub start_import {
+ my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my $bodytext=$$parser[$#$parser]->get_text("/import");
+ my $result ="";
+
+ $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
"
+ }
+}
+
+sub end_import {
+}
+
+sub editfield {
+ my ($tag,$data)=@_;
+
+ my $count=0;
+ my $maxlength=-1;
+ map { $count++;
+ if (length($_) > $maxlength) { $maxlength = length ($_); }
+ } split ("\n", $data);
+
+ return "
\n<$tag>
\n
\n</$tag>
\n";
+}
+
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
}