--- loncom/homework/structuretags.pm 2002/01/24 04:18:54 1.78 +++ loncom/homework/structuretags.pm 2002/03/01 00:23:04 1.83 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.78 2002/01/24 04:18:54 harris41 Exp $ +# $Id: structuretags.pm,v 1.83 2002/03/01 00:23:04 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -67,24 +67,39 @@ sub end_tex { sub page_start { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval); - my $head_tag_start='
'.&Apache::lonxml::registerurl(); - my $body_tag_start=''.&Apache::lonxml::registerurl(); + } + my $body_tag_start; + if (!defined($found{'body'})) { + $body_tag_start=''; } - $body_tag_start.='>'; return ($result,$head_tag_start,$body_tag_start); } @@ -147,6 +162,14 @@ ENDCHECKOUT sub start_problem { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + # meta is called from lonpublisher, which doesn't uses the normal + # lonhomework method of parsing the file which means that inputtags + # won't get reset + if ( $Apache::inputtags::part ne '' && $target != 'meta' ) { + &Apache::lonxml::error('Only one problem allowed in a .problem file'); + my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[-1]); + return ''; + } #intialize globals $Apache::inputtags::part='0'; @Apache::inputtags::responselist = (); @@ -287,8 +310,7 @@ sub end_problem { my $result=''; my $status=$Apache::inputtags::status['-1']; if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ) { - if ( $target eq 'grade' && $Apache::inputtags::part eq '0' && - $status eq 'CAN_ANSWER') { + if ( $target eq 'grade' && $Apache::inputtags::part eq '0') { # if part is zero, no