--- loncom/xml/scripttag.pm 2000/07/06 21:07:26 1.1
+++ loncom/xml/scripttag.pm 2000/07/25 21:28:22 1.3
@@ -5,29 +5,54 @@
package Apache::scripttag;
use strict;
+use Apache::lonnet;
sub BEGIN {
- &Apache::lonxml::register('Apache::scripttag',('script'));
+ &Apache::lonxml::register('Apache::scripttag',('script','scriptlib'));
}
sub start_script {
- my ($target,$token,@parstack)=@_;
+ my ($target,$token,$parstack,$parser,$safeeval)=@_;
-#static mapping of params into variables
-# map {$partstring =~ s/\$$_/$token->[2]->{$_}/g; } @{$token->[3]};
- # print "want to use run\n";
- my $decl='';
- map {$decl .="my \$".$_.'='.$token->[2]->{$_}} @{$token->[3]};
- print "declares $decl\n";
- print "2:\n$token->[2]\n";
- print "3:\n$token->[3]\n";
-# &Apache::run::run($partstring,$safeeval);
-
-# $partstring = '';
+ my $result="";
+ my $bodytext=$parser->get_text("/script");
+ if ($target ne "edit" ) {
+ $result = &Apache::run::run($bodytext,$safeeval);
+ } else {
+ $result="\n";
+ }
+ return $result;
}
-sub end_script {
-
+sub end_script {}
+
+sub start_scriptlib {
+ my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my $bodytext=$parser->get_text("/scriptlib");
+ my $result ="";
+ if ($target ne "edit" ) {
+ &Apache::run::run(&getfile($bodytext),$safeeval);
+ #print "ran $bodytext:
".&getfile($bodytext)."
";
+ } else {
+ $result="\n";
+ }
+ return $result;
}
+
+sub end_scriptlib {}
+
+sub getfile {
+ my ($filename) = @_;
+ my $a="";
+ &Apache::lonnet::repcopy($filename);
+ {
+ my $fh=Apache::File->new($filename);
+ while (<$fh>) {
+ $a .=$_;
+ }
+ }
+ return $a
+}
+
1;
__END__