--- loncom/xml/scripttag.pm	2000/07/25 21:28:22	1.3
+++ loncom/xml/scripttag.pm	2000/08/11 15:27:58	1.12
@@ -8,18 +8,18 @@ use strict;
 use Apache::lonnet;
 
 sub BEGIN {
-  &Apache::lonxml::register('Apache::scripttag',('script','scriptlib'));
+  &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");
+  my $bodytext=$$parser[$#$parser]->get_text("/script");
   if ($target ne "edit" ) {
     $result = &Apache::run::run($bodytext,$safeeval);
   } else {
-    $result="<textarea>$bodytext</textarea>\n";
+    $result=&editfield($token->[1],$bodytext);
   }
   return $result;
 }
@@ -28,28 +28,80 @@ 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" ) {
+    $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
     &Apache::run::run(&getfile($bodytext),$safeeval);
     #print "ran $bodytext:<br>".&getfile($bodytext)."<br>";
   } else {
-    $result="<textarea>$bodytext</textarea>\n";
+    $result=&editfield($token->[1],$bodytext);
   }
   return $result;
 }
 
 sub end_scriptlib {}
 
+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 {
+    $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 ="";
+  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);
+    $result.="Click<a href=\"/res/$bodytext\">here</a> to edit<br></br>"
+  }
+}
+
+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 "<br></br>\n&lt;$tag&gt;<br></br>\n&nbsp;&nbsp;&nbsp;<textarea rows=\"$count\" cols=\"$maxlength\" name=homework_edit_".$Apache::lonxml::curdepth.">$data</textarea><br></br>\n&lt;/$tag&gt;<br></br>\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);
+  }
+  my $fh=Apache::File->new($filename);
+  while (<$fh>) {
       $a .=$_;
-    }
   }
   return $a
 }