--- loncom/homework/structuretags.pm 2001/08/18 16:08:34 1.58 +++ loncom/homework/structuretags.pm 2001/09/14 20:17:35 1.67 @@ -2,7 +2,7 @@ # definition of tags that give a structure to a document # 2/19 Guy # 6/26/2001 fixed extra web display at end of tags -# 8/17,8/18 Gerd Kortemeyer +# 8/17,8/18,8/20 Gerd Kortemeyer package Apache::structuretags; @@ -63,6 +63,63 @@ sub page_start { return ($result,$head_tag_start,$body_tag_start); } +sub initialize_storage { + %Apache::lonhomework::results=(); + my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); + if ($ENV{'request.state'} eq 'construct') { + %Apache::lonhomework::history= + &Apache::lonnet::restore($ENV{'request.uri'},'nohist_construct',$domain,$name); + my ($temp)=keys %Apache::lonhomework::history ; + &Apache::lonxml::debug("Return message of $temp"); + } else { + %Apache::lonhomework::history= + &Apache::lonnet::restore($symb,$courseid,$domain,$name); + } + #ignore error conditions + my ($temp)=keys %Apache::lonhomework::history ; + if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); } +} + +# -------------------------------------------------------------finalize_storage +# Stores away the result has to a student's environment +# checks form.grade_ for specific values, other wises stores +# to the running users environment +sub finalize_storage { + my $result; + my ($temp) = keys %Apache::lonhomework::results; + if ( $temp ne '' ) { + my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); + if ($ENV{'request.state'} eq 'construct') { + $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results, + $ENV{'request.uri'},'nohist_construct', + $domain,$name); + &Apache::lonxml::debug('Construct Store return message:'.$result); + } else { + $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results, + $symb,$courseid,$domain,$name); + &Apache::lonxml::debug('Store return message:'.$result); + } + } + return $result; +} + +sub checkout_msg { +return (<The resource needs to be checked out +As a resource gets checked out, a unique timestamped ID is given to it, and a +permanent record is left in the system.

+ +Checking out resources is subject to course policies, and may exclude future +credit even if done erroneously.

+ +

+ +
+ENDCHECKOUT +} + sub start_problem { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; @@ -70,6 +127,7 @@ sub start_problem { $Apache::inputtags::part='0'; @Apache::inputtags::responselist = (); @Apache::inputtags::previous=(); + &initialize_storage(); $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 '') { @@ -83,7 +141,7 @@ sub start_problem { } } -#adeed vars to the scripting enviroment + #added vars to the scripting enviroment my $expression='$external::part='.$Apache::inputtags::part.';'; &Apache::run::run($expression,$safeeval); my $status; @@ -93,35 +151,28 @@ sub start_problem { my ($result,$head_tag_start,$body_tag_start)= &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); - if ($Apache::lonhomework::type eq 'exam') { - if ($target eq 'web') { - my $token=$Apache::lonhomework::history{"resource.0.outtoken"}; - if (($ENV{'form.doescheckout'}) && (!$token)) { - $token=&Apache::lonxml::maketoken(); - } - $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token); - } - if ($target eq 'meta') { - print "Cool, I was called"; - - return (< - - - - - - -ENDSTORES - } - } + if ($target eq 'web' || $target eq 'grade') { + #handle exam checkout + if ($Apache::lonhomework::type eq 'exam') { + my $token=$Apache::lonhomework::history{"resource.0.outtoken"}; + if (($ENV{'form.doescheckout'}) && (!$token)) { + $token=&Apache::lonxml::maketoken(); + $Apache::lonhomework::history{"resource.0.outtoken"}=$token; + } + $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token); + } + + #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); + } ($status,$accessmsg) = &Apache::lonhomework::check_access('0'); push (@Apache::inputtags::status,$status); my $expression='$external::datestatus="'.$status.'";'; @@ -138,49 +189,47 @@ ENDSTORES if ($status eq 'CLOSED') { $msg.='The problem '.$accessmsg; } elsif ($status eq 'UNCHECKEDOUT') { - $msg.=(<The resource needs to be checked out -As a resource gets checked out, a unique timestamped ID is given to it, and a -permanent record is left in the system.

- -Checking out resources is subject to course policies, and may exclude future -credit even if done erroneously.

- -

- -
-ENDCHECKOUT + $msg.=&checkout_msg; } - return $result.$msg.'
'; + $result.=$msg.'
'; } - } - } - if ($target eq 'web') { - my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); - if ($name eq '') { - $name=&Apache::lonnet::EXT('resource.title'); - if ($name eq 'con_lost') { $name = ''; } - } - $Apache::lonhomework::name=$name; - if ($status eq 'CAN_ANSWER') { - # create a page header and exit - $result.="$head_tag_start$name\n + } elsif ($target eq 'web') { + my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); + if ($name eq '') { + $name=&Apache::lonnet::EXT('resource.title'); + if ($name eq 'con_lost') { $name = ''; } + } + $Apache::lonhomework::name=$name; + if ($status eq 'CAN_ANSWER') { + # create a page header and exit + $result.="$head_tag_start$name\n $body_tag_start\n
". ''; - if ($ENV{'request.state'} eq "construct") { - $result.=' -
'; + if ($ENV{'request.state'} eq "construct") { + $result.= + ' + + Random Seed:
'; + } + # if we are viewing someone else preserve that info + if (defined $ENV{'form.grade_symb'}) { + foreach my $field ('symb','courseid','domain','username') { + $result .= ''."\n"; + } + } + } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' + || $status eq 'CLOSED') { + $result.=$head_tag_start. + "$name\n$body_tag_start\n"; } - return $result; - } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') { - return $result.$head_tag_start."$name\n$body_tag_start\n"; } - } - if ($target eq 'edit') { + } elsif ($target eq 'edit') { $result.=$head_tag_start."".$body_tag_start. - ' + ' @@ -189,14 +238,14 @@ ENDCHECKOUT '; my $temp=&Apache::edit::insertlist($target,$token); $result.=$temp; - return $result; - } - if ($target eq 'modified') { + } elsif ($target eq 'modified') { $result=$token->[4]; $result.=&Apache::edit::handle_insert(); - return $result; + } else { + # page_start returned a starting result, delete it if we don't need it + $result = ''; } - return ''; + return $result; } sub end_problem { @@ -221,13 +270,15 @@ sub end_problem { } $result.=&Apache::lonxml::xmlend(); } - } - if ($target eq 'meta') { + if ($target eq 'grade') { + &Apache::lonhomework::showhash(%Apache::lonhomework::results); + &finalize_storage(); + } + } elsif ($target eq 'meta') { if ($Apache::inputtags::part eq '0') { $result=&Apache::response::mandatory_part_meta; } - } - if ($target eq 'edit') { + } elsif ($target eq 'edit') { &Apache::lonxml::debug("in end_problem with $target, edit"); $result='
'; }