--- loncom/homework/structuretags.pm	2001/08/17 16:50:04	1.57
+++ loncom/homework/structuretags.pm	2001/08/22 19:21:36	1.66
@@ -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 <web></web> tags
-# 8/17 Gerd Kortemeyer
+# 8/17,8/18,8/20 Gerd Kortemeyer
 
 package Apache::structuretags; 
 
@@ -63,6 +63,49 @@ 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();
+  %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();
+    $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
+				    $symb,$courseid,$domain,$name);
+    &Apache::lonxml::debug("Store return message:".$result);
+  }
+  return $result;
+}
+
+sub checkout_msg {
+return (<<ENDCHECKOUT);
+<h2>The resource needs to be checked out</h2>
+As a resource gets checked out, a unique timestamped ID is given to it, and a
+permanent record is left in the system.<p />
+<font color=red>
+Checking out resources is subject to course policies, and may exclude future
+credit even if done erroneously.<p />
+</font>  
+<form method=post>
+<input type=button name="doescheckout" 
+value="Check out Exam for Viewing" 
+onClick="if (confirm('Check out Exam?')) { this.form.submit(); }" />
+</form>
+ENDCHECKOUT
+}
+
 sub start_problem {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
@@ -70,6 +113,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 '') {
@@ -82,7 +126,8 @@ sub start_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;
@@ -92,9 +137,14 @@ sub start_problem {
   my ($result,$head_tag_start,$body_tag_start)=
     &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
 
-  if ($target eq 'web') {
-      if ($ENV{'form.doescheckout'}) {
-	  $body_tag_start.=&Apache::lonxml::maketoken('web');
+  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();
+             $Apache::lonhomework::history{"resource.0.outtoken"}=$token;
+          }
+          $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);
       }
   }
   if ($target eq 'web' || $target eq 'grade') {
@@ -114,19 +164,7 @@ sub start_problem {
         if ($status eq 'CLOSED') {
 	    $msg.='The problem '.$accessmsg;
 	} elsif ($status eq 'UNCHECKEDOUT') {
-            $msg.=(<<ENDCHECKOUT);
-<h2>The resource needs to be checked out</h2>
-As a resource gets checked out, a unique timestamped ID is given to it, and a
-permanent record is left in the system.<p />
-<font color=red>
-Checking out resources is subject to course policies, and may exclude future
-credit even if done erroneously.<p />
-</font>  
-<form method=post>
-<input type=submit name="doescheckout" 
-value="Check out Exam for Viewing" />
-</form>
-ENDCHECKOUT
+            $msg.=&checkout_msg;
         }
 	return $result.$msg.'<br />';
       }
@@ -149,6 +187,13 @@ ENDCHECKOUT
 	$result.='<input type="hidden" name="problemmode" value="View" />
                  <input type="submit" name="problemmode" value="Edit" /><hr />';
       }
+      # if we are viewing someone else preserve that info
+      if (defined $ENV{'form.grade_symb'}) {
+	foreach my $field ('symb','courseid','domain','username') {
+	  $result .= '<input type="hidden" name="grade_'.$field.
+	    '" value="'.$ENV{"form.grade_$field"}.'" />'."\n";
+	}
+      }
       return $result;
     } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') {
       return $result.$head_tag_start."<title>$name</title></head>\n$body_tag_start\n";
@@ -197,13 +242,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='<br /><input type="submit" name="submit" value="Submit Changes" />';
   }