--- loncom/homework/lonhomework.pm	2001/08/17 14:24:29	1.53
+++ loncom/homework/lonhomework.pm	2001/11/29 18:36:59	1.63
@@ -1,7 +1,33 @@
+# The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
+#
+# $Id: lonhomework.pm,v 1.63 2001/11/29 18:36:59 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # 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 +36,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;
@@ -22,24 +49,25 @@ sub BEGIN {
 
 sub get_target {
   if ( $ENV{'request.state'} eq "published") {
-    if ( defined $ENV{'form.submitted'}) {
+    if ( defined($ENV{'form.submitted'})) {
       return ('grade', 'web');
     } else {
       return ('web');
     }
   } elsif ($ENV{'request.state'} eq "construct") {
-    if ( defined $ENV{'form.preview'}) {
-      if ( defined $ENV{'form.submitted'}) {
+    if ( defined($ENV{'form.preview'})) {
+      if ( defined($ENV{'form.submitted'})) {
 	return ('grade', 'web');
       } else {
 	return ('web');
       }
     } else {
       if ( $ENV{'form.problemmode'} eq 'View' ) {
-	if ( defined $ENV{'form.submitted'}) {
-	  return ('grade', 'web');
+	if ( defined($ENV{'form.submitted'}) &&
+	     (!defined($ENV{'form.resetdata'})) ) {
+	  return ('grade', 'web','answer');
 	} else {
-	  return ('web');
+	  return ('web','answer');
 	}
       } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {
 	if ( $ENV{'form.submitted'} eq 'edit' ) {
@@ -131,6 +159,13 @@ sub check_access {
     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");
@@ -168,6 +203,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 ''
@@ -218,15 +254,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 />");
 	}
@@ -255,14 +285,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);
   }
 }
@@ -356,6 +378,10 @@ sub handler {
   }
 
   if ($ENV{'request.state'} eq "construct") {
+    if ($ENV{'form.resetdata'} eq 'Reset Submissions') {
+      my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+      &Apache::lonnet::tmpreset($symb,'',$domain,$name);
+    }
     if ( -e $file ) {
       if (!(defined $ENV{'form.problemmode'})) {
 	#first visit to problem in construction space