--- loncom/homework/structuretags.pm 2002/01/11 16:32:29 1.75 +++ loncom/homework/structuretags.pm 2002/04/11 17:37:13 1.90 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.75 2002/01/11 16:32:29 matthew Exp $ +# $Id: structuretags.pm,v 1.90 2002/04/11 17:37:13 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,7 +34,7 @@ package Apache::structuretags; use strict; use Apache::lonnet; -sub BEGIN { +BEGIN { &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); # &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate')) } @@ -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(undef,$target); + } + my $body_tag_start; + if (!defined($found{'body'})) { + $body_tag_start=''; } - $body_tag_start.='>'; return ($result,$head_tag_start,$body_tag_start); } @@ -147,16 +162,26 @@ 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 = (); @Apache::inputtags::previous=(); - &initialize_storage(); - if ($target eq 'web') { - &Apache::lonhomework::showhash(%Apache::lonhomework::history); + if ($target ne 'analyze') { + &initialize_storage(); + if ($target eq 'web') { + &Apache::lonhomework::showhash(%Apache::lonhomework::history); + } + $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type'); + &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); } - $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type'); - &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); if ($Apache::lonhomework::type eq '') { my $uri=$ENV{'request.uri'}; if ($uri=~/\.(\w+)$/) { @@ -273,6 +298,8 @@ sub start_problem { } elsif ($target eq 'modified') { $result=$token->[4]; $result.=&Apache::edit::handle_insert(); + } elsif ($target eq 'tex') { + $result .= '\begin{document} '; } else { # page_start returned a starting result, delete it if we don't need it $result = ''; @@ -285,8 +312,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