--- loncom/xml/scripttag.pm	2004/02/12 17:34:24	1.109
+++ loncom/xml/scripttag.pm	2004/09/29 14:50:43	1.118
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.109 2004/02/12 17:34:24 albertel Exp $
+# $Id: scripttag.pm,v 1.118 2004/09/29 14:50:43 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,8 +25,6 @@
 #
 # http://www.lon-capa.org/
 #
-# 2/21 Guy
-# 8/20 Gerd Kortemeyer
 
 package Apache::scripttag;
 
@@ -119,7 +117,8 @@ sub start_script {
 	    ($Apache::lonhomework::viewgrades == 'F')) {
 	    $Apache::lonxml::evaluate--;
 	    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 $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
+	    $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.$windowopen;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;
@@ -137,11 +136,11 @@ sub start_script {
 	my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
     }
   } else {
-    if ($target ne "meta") {
-      $result = $token->[4];
       my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
-      $result.=$bodytext;
-    }
+      if ($target ne "meta" && $target ne 'tex') {
+	  $result = $token->[4];
+	  $result.=$bodytext;
+      }
   }
   return $result;
 }
@@ -152,7 +151,7 @@ sub end_script {
   my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);
   my $result='';
   #other script blocks need to survive
-  if ($type ne "loncapa/perl") {
+  if ($type ne "loncapa/perl" && $target ne 'tex') {
     return $token->[2];
   } elsif ($target eq 'edit' ) {
     return &Apache::edit::end_table();
@@ -179,11 +178,14 @@ sub start_display {
       $result=&Apache::run::run($bodytext,$safeeval);
       if ($target eq 'grade' || $target eq 'answer' ||
 	  $target eq 'analyze') {
-	  $result=''; # grade should produce no output
+	  # grade/answer/analyxe should produce no output but if we
+	  # are redirecting, the redirecter should know what to do
+	  # with the output
+	  if (!$Apache::lonxml::redirection) { $result=''; }
       }
       $Apache::lonxml::post_evaluate=0;
   } elsif ($target eq "edit" ) {
-    my $bodytext=&Apache::lonxml::get_all_text_unblanced("/display",$parser);
+    my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser);
     #$result = 
     #  "<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";
     #$result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
@@ -482,7 +484,15 @@ sub end_comment {
 
 sub xmlparse {
   my ($string) = @_;
-#  &Apache::lonxml::debug("Got $string");
+  &Apache::lonxml::debug("xmlparse recursion starting with $string");
+  # Apache::run::evaluate does an 'eval' on the name of the subroutine
+  # if it detects something that looks like a subroutine, this ends up calling
+  # things without any arguments and since perl is nice enough to pass
+  # along the default arguments when you don't explicitly say no arguments
+  # if you call &xmlparse, it gets &xmlparse passed as it argument.
+  # Same thing soccurs with &chemparse.
+  if ($string eq '&xmlparse') { return '&xmlparse'; }
+  if ($string eq '&chemparse') { return '&chemparse'; }
   my ($target,$token,$tagstack,$parstack,$oldparser,$safeeval,$style)=
     @Apache::scripttag::parser_env;
   my @parser;
@@ -490,6 +500,7 @@ sub xmlparse {
   my $result=&Apache::lonxml::inner_xmlparse($target,$tagstack,
 					     $parstack,\@parser,
 					     $safeeval,$style);
+  &Apache::lonxml::debug("xmlparse recursion ending with $result");
   return $result;
 }
 
