--- loncom/xml/scripttag.pm	2000/07/06 21:07:26	1.1
+++ loncom/xml/scripttag.pm	2000/08/07 21:26:21	1.6
@@ -5,29 +5,77 @@
 package Apache::scripttag; 
 
 use strict;
+use Apache::lonnet;
 
 sub BEGIN {
-  &Apache::lonxml::register('Apache::scripttag',('script'));
+  &Apache::lonxml::register('Apache::scripttag',('script','scriptlib',
+						 'parserlib','import'));
 }
 
 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[$#$parser]->get_text("/script");
+  if ($target ne "edit" ) {
+    $result = &Apache::run::run($bodytext,$safeeval);
+  } else {
+    $result="<textarea>$bodytext</textarea>\n";
+  }
+  return $result;
 }
 
-sub end_script {
-  
+sub end_script {}
+
+sub start_scriptlib {
+  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
+  my $result ="";
+  if ($target ne "edit" ) {
+    &Apache::run::run(&getfile("/home/httpd/html".$bodytext),$safeeval);
+    #print "ran $bodytext:<br>".&getfile($bodytext)."<br>";
+  } else {
+    $result="<textarea>$bodytext</textarea>\n";
+  }
+  return $result;
+}
+
+sub end_scriptlib {}
+
+sub start_parserlib {
+  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my $bodytext=$$parser[$#$parser]->get_text("/parserlib");
+  %$style = ( %$style , &Apache::style::styleparser($target, 
+             &getfile("/home/httpd/html/".$bodytext)));
+}
+
+sub end_parserlib {
 }
+
+sub start_import {
+  my ($target,$token,$parstack,$parser)=@_;
+  my $bodytext=$$parser[$#$parser]->get_text("/import");
+  print "going after".$bodytext."\n";
+  my $file=&getfile("/home/httpd/html/".$bodytext);
+  my $tempparser=HTML::TokeParser->new(\$file);
+  push (@$parser,$tempparser);
+}
+
+sub end_import {
+}
+
+sub getfile {
+  my ($filename) = @_;
+  my $a="";
+  &Apache::lonnet::repcopy($filename);
+  {
+    my $fh=Apache::File->new($filename);
+    while (<$fh>) {
+      $a .=$_;
+    }
+  }
+  return $a
+}
+
 1;
 __END__