--- loncom/homework/structuretags.pm 2001/08/06 18:33:58 1.52
+++ loncom/homework/structuretags.pm 2001/09/18 02:21:13 1.68
@@ -2,6 +2,8 @@
# 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,8/20 Gerd Kortemeyer
+
package Apache::structuretags;
use strict;
@@ -61,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)=@_;
@@ -68,61 +127,109 @@ 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 '') {
- $Apache::lonhomework::type='homework';
+ my $uri=$ENV{'request.uri'};
+ if ($uri=~/\.(\w+)$/) {
+ $Apache::lonhomework::type=$1;
+ &Apache::lonxml::debug("Using type of $1");
+ } else {
+ $Apache::lonhomework::type='problem';
+ &Apache::lonxml::debug("Using default type, problem, :$uri:");
+ }
}
-#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;
- my $datemsg;
+ my $accessmsg;
#should get back a or the neccesary stuff to start XML/MathML
my ($result,$head_tag_start,$body_tag_start)=
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
- if ($target eq 'web' || $target eq 'grade') {
- ($status,$datemsg) = &Apache::lonhomework::check_date('0');
+
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
+ #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.'";';
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
&Apache::run::run($expression,$safeeval);
- if ( $status eq 'CLOSED' ) {
+ if (( $status eq 'CLOSED' ) ||
+ ( $status eq 'UNCHECKEDOUT') ||
+ ( $status eq 'BANNED')) {
my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
if ( $target eq "web" ) {
$result.= $head_tag_start.'';
- return $result . $body_tag_start .
- "
Problem is not open to be viewed. The problem $datemsg
";
+ my $msg=$body_tag_start.
+ 'Not open to be viewed
';
+ if ($status eq 'CLOSED') {
+ $msg.='The problem '.$accessmsg;
+ } elsif ($status eq 'UNCHECKEDOUT') {
+ $msg.=&checkout_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
\n";
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
@@ -163,13 +273,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='