--- loncom/xml/scripttag.pm	2002/03/22 22:06:06	1.68
+++ loncom/xml/scripttag.pm	2002/04/25 17:25:36	1.71
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.68 2002/03/22 22:06:06 albertel Exp $
+# $Id: scripttag.pm,v 1.71 2002/04/25 17:25:36 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,13 +62,7 @@ sub start_script {
       if (($target eq 'answer') && ($Apache::lonhomework::viewgrades == 'F')) {
 	$Apache::lonxml::evaluate--;
 	$result.="<a href=\"javascript:newWindow=open(\'\',\'new_W\',\'width=500,height=200,scrollbars=1\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'<html><head><title>newwindow</title></head><body bgcolor=&quot;#FFFFFF&quot;><pre>";
-	my $listing= &Apache::run::dump($target,$safeeval);
-	$listing =~ s/\n/\\n/g;
-	$listing =~ s/\"/&quot;/g;
-	$listing =~ s/\'/&rsquo;/g;
-	$listing =~ s/</&lt;/g;
-	$listing =~ s/>/&gt;/g;
-	$listing =~ s/&/&amp;/g;
+	my $listing= &HTML::Entities::encode(&Apache::run::dump($target,$safeeval));
 	$result.=$listing;
 	$result.= "</pre></body></html>\');newWindow.document.close();void(0);\">Script Vars</a><br />";
       }
@@ -262,6 +256,7 @@ sub start_import {
     # FIXME this probably needs to be smart about construction vs.
     # non construction space.
     my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
+    &Apache::lonnet::logthis("$location,$Apache::lonxml::pwd['-1'],$bodytext");
     my $file=&Apache::lonnet::getfile($location);
     if ($file == -1) {
       &Apache::lonxml::error("<b> Unable to find <i>$bodytext as $location</i> for import</b>");
@@ -299,8 +294,11 @@ sub start_import {
 }
 
 sub end_import {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   pop(@Apache::inputtags::import);
-  return '';
+  my $result;
+  if ($target eq 'edit' ) { $result=&Apache::edit::end_table(); }
+  return $result;
 }
 
 sub start_storetc {
