--- loncom/homework/lonhomework.pm	2001/08/06 20:33:23	1.52
+++ loncom/homework/lonhomework.pm	2001/10/31 17:44:42	1.61
@@ -1,7 +1,7 @@
 # The LON-CAPA Homework handler
 # Guy Albertelli
 # 11/30 Gerd Kortemeyer
-# 6/1 Gerd Kortemeyer
+# 6/1,8/17,8/18 Gerd Kortemeyer
 
 package Apache::lonhomework;
 use strict;
@@ -10,6 +10,7 @@ use Apache::lonxml;
 use Apache::lonnet;
 use Apache::inputtags;
 use Apache::structuretags;
+use Apache::randomlabel;
 use Apache::response;
 use Apache::hint;
 use Apache::outputtags;
@@ -37,9 +38,9 @@ sub get_target {
     } else {
       if ( $ENV{'form.problemmode'} eq 'View' ) {
 	if ( defined $ENV{'form.submitted'}) {
-	  return ('grade', 'web');
+	  return ('grade', 'web','answer');
 	} else {
-	  return ('web');
+	  return ('web','answer');
 	}
       } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {
 	if ( $ENV{'form.submitted'} eq 'edit' ) {
@@ -84,7 +85,8 @@ sub send_footer {
 }
 
 $Apache::lonxml::browse='';
-sub check_date {
+
+sub check_access {
   my ($id) = @_;
   my $date ='';
   my $status = '';
@@ -130,6 +132,13 @@ sub check_date {
     if ( $maxtries eq '' ) { $maxtries = '2'; } 
     if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } 
   }
+
+  if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&
+      (!$Apache::lonhomework::history{"resource.0.outtoken"})) {
+      return ('UNCHECKEDOUT','needs to be checked out');
+  }
+
+
   &Apache::lonxml::debug("sending back :$status:$datemsg:");
   if (($Apache::lonhomework::browse eq 'F') && ($status eq 'CLOSED')) {
     &Apache::lonxml::debug("should be allowed to browse a resource when closed");
@@ -167,6 +176,7 @@ sub setupheader {
   } else {
     $request->content_type('text/html');
   }
+  &Apache::loncommon::no_cache($request);
   $request->send_http_header;
   return OK if $request->header_only;
   return ''
@@ -217,15 +227,9 @@ sub renderpage {
     my $result = '';
     &Apache::inputtags::initialize_inputtags;
     &Apache::edit::initialize_edit;
-    %Apache::lonhomework::results=();
-    %Apache::lonhomework::history=&Apache::lonnet::restore();
-    #ignore error conditions
-    my ($temp)=keys %Apache::lonhomework::history ;
-    if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); } 
     if ($target eq 'web') {
       if (&Apache::lonnet::symbread() eq '') {
 	if ($ENV{'request.state'} eq "construct") {
-	  $request->print("In construction space, submissions ignored<br />");
 	} else {
 	  $request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored<br />");
 	}
@@ -254,14 +258,6 @@ sub renderpage {
       $request->print($result);
     }
     #$request->print(":Result ends");
-    if ($target eq 'grade') { &showhash(%Apache::lonhomework::results); }
-
-    #store new values
-    my ($temp) = keys %Apache::lonhomework::results;
-    if ( $temp ne '' ) {
-      &Apache::lonxml::debug("Store return message:".
-			     &Apache::lonnet::cstore(\%Apache::lonhomework::results));
-    }
     #my $td=&tv_interval($t0);
   }
 }