--- loncom/xml/scripttag.pm	2006/12/20 22:41:59	1.139
+++ loncom/xml/scripttag.pm	2007/08/03 23:29:54	1.142
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.139 2006/12/20 22:41:59 albertel Exp $
+# $Id: scripttag.pm,v 1.142 2007/08/03 23:29:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -126,16 +126,19 @@ sub start_script {
 	    my $end_page =
 		&Apache::loncommon::end_page({'js_ready' => 1,});
 
-	    $result.="<script type=\"text/javascript\">
+	    $uname =~s/\W//g;
+	    $udom  =~s/\W//g;
+	    my $script_var ="<script type=\"text/javascript\">
 // <![CDATA[
     function LONCAPA_scriptvars_".$uname."_".$udom."_"."$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page<pre>";
 	    my $listing=&Apache::run::dump($target,$safeeval);
 	    $listing=~s/\\/\\\\/g;
 	    $listing=~s/\'/\\\'/g;
-	    $result.=$listing;
-	    $result.= "<\\/pre>$end_page');newWindow.document.close();newWindow.focus()}
+	    $script_var.=$listing;
+	    $script_var.= "<\\/pre>$end_page');newWindow.document.close();newWindow.focus()}
 // ]]>
 </script><a href=\"javascript:LONCAPA_scriptvars_".$uname."_".$udom."_$Apache::lonxml::curdepth();void(0);\">Script Vars</a><br />";
+	    &Apache::lonxml::add_script_result($script_var);
 	}
     } elsif ($target eq "edit" ) {
       #&Apache::run::run($bodytext,$safeeval);
@@ -388,7 +391,7 @@ sub start_import {
     my $dir=$location;
     $dir=~s:/[^/]*$::;
     #  &Apache::lonxml::debug("directory $dir $location file $file \n<b>END</b>\n");
-    my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
+    my $id= &Apache::lonxml::get_id($parstack,$safeeval);
     if (!$id) { $id=$Apache::lonxml::curdepth; }
     push(@Apache::inputtags::import,$id);
     push(@Apache::inputtags::importlist,$id);
@@ -405,7 +408,7 @@ sub start_import {
   } elsif ($target eq 'modified') {
       $result=$token->[4].&Apache::edit::modifiedfield("/import",$parser);
   } elsif ($target eq 'meta') {
-    my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
+    my $id= &Apache::lonxml::get_id($parstack,$safeeval);
     $result.='<import part="'.$Apache::inputtags::part;
     if ($id) {
       $result.='" id="'.$id;