--- loncom/xml/scripttag.pm	2000/08/07 21:26:21	1.6
+++ loncom/xml/scripttag.pm	2000/08/08 19:34:29	1.7
@@ -14,13 +14,12 @@ sub BEGIN {
 
 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);
   } else {
-    $result="<textarea>$bodytext</textarea>\n";
+    $result=&editfield($token->[1],$bodytext);
   }
   return $result;
 }
@@ -32,10 +31,11 @@ sub start_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("/home/httpd/html".$bodytext),$safeeval);
     #print "ran $bodytext:<br>".&getfile($bodytext)."<br>";
   } else {
-    $result="<textarea>$bodytext</textarea>\n";
+    $result=&editfield($token->[1],$bodytext);
   }
   return $result;
 }
@@ -45,25 +45,49 @@ 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)));
+  my $result ="";
+  if ($target ne "edit" ) {
+    $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
+    %$style = ( %$style , &Apache::style::styleparser($target, 
+		&getfile("/home/httpd/html/".$bodytext)));
+  } else {
+    $result=&editfield($token->[1],$bodytext);
+  }
+  return $result;
 }
 
 sub end_parserlib {
 }
 
 sub start_import {
-  my ($target,$token,$parstack,$parser)=@_;
+  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   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);
+  my $result ="";
+  if ($target ne "edit" ) {
+    $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
+    my $file=&getfile("/home/httpd/html/".$bodytext);
+    my $tempparser=HTML::TokeParser->new(\$file);
+    push (@$parser,$tempparser);
+  } else {
+    $result=&editfield($token->[1],$bodytext);
+  }
 }
 
 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="";