[LON-CAPA-cvs] cvs: loncom /homework structuretags.pm

[albertel]

albertel		Fri Jun 13 10:35:24 2003 EDT

  Modified files:              
    /loncom/homework	structuretags.pm 
  Log:
  - Fixes BUG#1642, <problem> inside <problem> is better
  
  
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.183 loncom/homework/structuretags.pm:1.184
--- loncom/homework/structuretags.pm:1.183	Fri Jun 13 10:01:26 2003
+++ loncom/homework/structuretags.pm	Fri Jun 13 10:35:24 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.183 2003/06/13 14:01:26 albertel Exp $
+# $Id: structuretags.pm,v 1.184 2003/06/13 14:35:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -266,12 +266,14 @@
 sub start_problem {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
-    $Apache::lonhomework::parsing_a_problem=1;
-    if ( $Apache::inputtags::part ne '' ) {
-	&Apache::lonxml::error('Only one problem allowed in a .problem file');
-	my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
+    if ( $Apache::inputtags::part ne '' ||
+	 $Apache::lonhomework::parsing_a_problem) {
+	&Apache::lonxml::error('Only one &lt;problem&gt; allowed in a .problem file');
+	#my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
 	return '';
     }
+
+    $Apache::lonhomework::parsing_a_problem=1;
 #initialize globals
     $Apache::inputtags::part='0';
     @Apache::inputtags::partlist=('0');