--- loncom/xml/scripttag.pm	2004/02/12 17:34:24	1.109
+++ loncom/xml/scripttag.pm	2004/04/15 20:24:34	1.112
@@ -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.112 2004/04/15 20:24:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -137,11 +137,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") {
+	  $result = $token->[4];
+	  $result.=$bodytext;
+      }
   }
   return $result;
 }
@@ -183,7 +183,7 @@ sub start_display {
       }
       $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 +482,8 @@ sub end_comment {
 
 sub xmlparse {
   my ($string) = @_;
-#  &Apache::lonxml::debug("Got $string");
+  &Apache::lonxml::debug("xmlparse recursion starting with $string");
+  if ($string eq '&xmlparse') { return '&xmlparse'; }
   my ($target,$token,$tagstack,$parstack,$oldparser,$safeeval,$style)=
     @Apache::scripttag::parser_env;
   my @parser;
@@ -490,6 +491,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;
 }