[LON-CAPA-cvs] cvs: loncom /xml scripttag.pm

albertel lon-capa-cvs@mail.lon-capa.org
Mon, 12 Apr 2004 23:01:58 -0000


albertel		Mon Apr 12 19:01:58 2004 EDT

  Modified files:              
    /loncom/xml	scripttag.pm 
  Log:
  - trying to stop a degenerate case
  
  
Index: loncom/xml/scripttag.pm
diff -u loncom/xml/scripttag.pm:1.110 loncom/xml/scripttag.pm:1.111
--- loncom/xml/scripttag.pm:1.110	Tue Feb 24 16:12:48 2004
+++ loncom/xml/scripttag.pm	Mon Apr 12 19:01:57 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.110 2004/02/24 21:12:48 albertel Exp $
+# $Id: scripttag.pm,v 1.111 2004/04/12 23:01:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -482,7 +482,8 @@
 
 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 @@
   my $result=&Apache::lonxml::inner_xmlparse($target,$tagstack,
 					     $parstack,\@parser,
 					     $safeeval,$style);
+  &Apache::lonxml::debug("xmlparse recursion ending with $result");
   return $result;
 }