--- loncom/homework/structuretags.pm 2003/04/03 17:44:12 1.161 +++ loncom/homework/structuretags.pm 2003/04/21 20:59:02 1.166 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.161 2003/04/03 17:44:12 albertel Exp $ +# $Id: structuretags.pm,v 1.166 2003/04/21 20:59:02 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -104,10 +104,11 @@ sub page_start { } $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1); if ($target eq 'web' && $ENV{'request.state'} ne 'construct') { - my ($symb)=&Apache::lonxml::whichuser(); - if ($symb eq '') { + my ($symb,undef,undef,undef,$publicuser)= + &Apache::lonxml::whichuser(); + if ($symb eq '' && !$publicuser) { my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference"); - $help="Browsing or ambiguous reference, submissions ignored $help
"; + $help="Browsing resource, all submissions are temporary.
"; $body_tag_start.=$help; } } @@ -135,9 +136,17 @@ sub get_resource_name { sub setup_rndseed { my ($safeeval)=@_; my $rndseed; - if ($ENV{'request.state'} eq "construct") { + my ($symb)=&Apache::lonxml::whichuser(); + if ($ENV{'request.state'} eq "construct" || $symb eq '') { $rndseed=$ENV{'form.rndseed'}; if (!$rndseed) { + $rndseed=$Apache::lonhomework::history{'rndseed'}; + if (!$rndseed) { + $rndseed=time; + $ENV{'form.rndseed'}=$rndseed; + } + } + if ($ENV{'form.resetdata'} eq 'New Problem Variation') { $rndseed=time; $ENV{'form.rndseed'}=$rndseed; } @@ -186,8 +195,9 @@ sub problem_web_to_edit_header { sub initialize_storage { %Apache::lonhomework::results=(); + %Apache::lonhomework::history=(); my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); - if ($ENV{'request.state'} eq 'construct') { + if ($ENV{'request.state'} eq 'construct' || $symb eq '') { %Apache::lonhomework::history= &Apache::lonnet::tmprestore($ENV{'request.uri'},'',$domain,$name); my ($temp)=keys %Apache::lonhomework::history ; @@ -210,7 +220,8 @@ sub finalize_storage { my ($temp) = keys %Apache::lonhomework::results; if ( $temp ne '' ) { my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); - if ($ENV{'request.state'} eq 'construct') { + if ($ENV{'request.state'} eq 'construct' || $symb eq '') { + $Apache::lonhomework::results{'rndseed'}=$ENV{'form.rndseed'}; $result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results, $ENV{'request.uri'},'',$domain,$name); &Apache::lonxml::debug('Construct Store return message:'.$result); @@ -260,6 +271,11 @@ sub start_problem { @Apache::structuretags::whileconds=(); @Apache::structuretags::whilebody=(); @Apache::structuretags::whileline=(); + $Apache::lonhomework::scantronmode=0; + + if (defined($ENV{'scantron.maxquest'})) { + $Apache::lonhomework::scantronmode=1; + } if ($target ne 'analyze') { &initialize_storage(); @@ -269,7 +285,7 @@ sub start_problem { $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 '') { + if ($Apache::lonhomework::type eq '' ) { my $uri=$ENV{'request.uri'}; if ($uri=~/\.(\w+)$/) { $Apache::lonhomework::type=$1; @@ -308,6 +324,15 @@ sub start_problem { #handle rand seed in construction space my $rndseed=&setup_rndseed($safeeval); + my ($symb)=&Apache::lonxml::whichuser(); + if ($ENV{'request.state'} ne "construct" && $symb eq '') { + $form_tag_start.=''. + ''. + ''; + } ($status,$accessmsg) = &Apache::lonhomework::check_access('0'); push (@Apache::inputtags::status,$status); my $expression='$external::datestatus="'.$status.'";';