--- loncom/homework/structuretags.pm 2002/02/08 20:58:39 1.81 +++ loncom/homework/structuretags.pm 2002/08/23 21:17:16 1.105 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.81 2002/02/08 20:58:39 albertel Exp $ +# $Id: structuretags.pm,v 1.105 2002/08/23 21:17:16 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,6 +33,7 @@ package Apache::structuretags; use strict; use Apache::lonnet; +use Apache::File(); BEGIN { &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); @@ -56,7 +57,7 @@ sub start_tex { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]); if ($target eq 'tex') { - return $bodytext + return $bodytext.' '; } return ''; } @@ -79,7 +80,7 @@ sub page_start { if (!defined($found{'html'})) { $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack, $parser,$safeeval); - $head_tag_start='
'.&Apache::lonxml::registerurl(); + $head_tag_start=''.&Apache::lonxml::registerurl(undef,$target); } my $body_tag_start; if (!defined($found{'body'})) { @@ -100,7 +101,68 @@ sub page_start { } $body_tag_start.='>'; } - return ($result,$head_tag_start,$body_tag_start); + my $form_tag_start; + if (!defined($found{'form'})) { + $form_tag_start=' ENDCHECKOUT } @@ -174,12 +235,14 @@ sub start_problem { $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+)$/) { @@ -198,11 +261,11 @@ sub start_problem { my $accessmsg; #should get back a or the neccesary stuff to start XML/MathML - my ($result,$head_tag_start,$body_tag_start)= + my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); + if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';} - - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { #handle exam checkout if ($Apache::lonhomework::type eq 'exam') { my $token=$Apache::lonhomework::history{"resource.0.outtoken"}; @@ -214,15 +277,7 @@ sub start_problem { } #handle rand seed in construction space - my $rndseed; - if ($ENV{'request.state'} eq "construct") { - $rndseed=$ENV{'form.rndseed'}; - if (!$rndseed) { - $rndseed=time; - $ENV{'form.rndseed'}=$rndseed; - } - &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); - } + my $rndseed=&setup_rndseed($safeeval); ($status,$accessmsg) = &Apache::lonhomework::check_access('0'); push (@Apache::inputtags::status,$status); my $expression='$external::datestatus="'.$status.'";'; @@ -244,28 +299,14 @@ sub start_problem { $result.=$msg.'