--- loncom/xml/scripttag.pm	2004/02/10 18:58:26	1.107
+++ loncom/xml/scripttag.pm	2004/02/12 17:34:24	1.109
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.107 2004/02/10 18:58:26 albertel Exp $
+# $Id: scripttag.pm,v 1.109 2004/02/12 17:34:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,13 +118,14 @@ sub start_script {
 	    ($ENV{'form.answer_output_mode'} ne 'tex') &&
 	    ($Apache::lonhomework::viewgrades == 'F')) {
 	    $Apache::lonxml::evaluate--;
-	    $result.="<script type=\"text/javascript\"> function LONCAPA_scriptvars_$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.document.open('text/html','replace');newWindow.document.writeln('<html><head><title>Script Vars</title></head><body bgcolor=\"#FFFFFF\"><pre>";
+	    my (undef,undef,$udom,$uname)=&Apache::lonxml::whichuser();
+	    $result.="<script type=\"text/javascript\"> function LONCAPA_scriptvars_".$uname."_".$udom."_"."$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.document.open('text/html','replace');newWindow.document.writeln('<html><head><title>Script Vars</title></head><body bgcolor=\"#FFFFFF\"><pre>";
 	    my $listing=&Apache::run::dump($target,$safeeval);
 	    $listing=~s/\'/\\\'/g;
 	    $listing=~s/\n/\\n/g;
 	    $listing=~s/\r/\\r/g;
 	    $result.=$listing;
-	    $result.= "</pre></body></html>');newWindow.document.close();}</script><a href=\"javascript:LONCAPA_scriptvars_$Apache::lonxml::curdepth();void(0);\">Script Vars</a><br />";
+	    $result.= "</pre></body></html>');newWindow.document.close();}</script><a href=\"javascript:LONCAPA_scriptvars_".$uname."_".$udom."_$Apache::lonxml::curdepth();void(0);\">Script Vars</a><br />";
 	}
     } elsif ($target eq "edit" ) {
       #&Apache::run::run($bodytext,$safeeval);
@@ -138,7 +139,7 @@ sub start_script {
   } else {
     if ($target ne "meta") {
       $result = $token->[4];
-      my $bodytext=&Apache::lonxml::get_all_text_unblanaced("/script",$parser);
+      my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
       $result.=$bodytext;
     }
   }
