--- loncom/homework/lonhomework.pm	2006/04/21 15:27:30	1.233.2.2
+++ loncom/homework/lonhomework.pm	2006/02/26 20:01:17	1.236
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.233.2.2 2006/04/21 15:27:30 albertel Exp $
+# $Id: lonhomework.pm,v 1.236 2006/02/26 20:01:17 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -278,7 +278,6 @@ sub check_slot_access {
     my $slotstatus='NOT_IN_A_SLOT';
     my ($returned_slot,$slot_name);
     foreach my $slot (@slots) {
-	$slot =~ s/(^\s*|\s*$)//g;
 	&Apache::lonxml::debug("getting $slot");
 	my %slot=&Apache::lonnet::get_slot($slot);
 	&Apache::lonhomework::showhash(%slot);
@@ -316,6 +315,13 @@ sub check_slot_access {
     
     &Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)");
     
+    # has a current checked in recrd, but hasn't got a grade, must be awaiting
+    # a grade
+    if ($checkedin 
+	&& !$got_grade) {
+	return ('WAITING_FOR_GRADE');
+    }
+
     if ($slotstatus eq 'NOT_IN_A_SLOT' 
 	&& $checkedin ) {
 
@@ -999,15 +1005,6 @@ sub handler {
     &Apache::lonxml::debug("Problem Mode ".$env{'form.problemmode'});
     my ($symb) = &Apache::lonxml::whichuser();
     &Apache::lonxml::debug('symb is '.$symb);
-    if ($env{'request.state'} eq "construct" || $symb eq '') {
-	if ($env{'form.resetdata'} eq &mt('Reset Submissions') ||
-	    $env{'form.resetdata'} eq &mt('New Problem Variation') ||
-	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
-	    my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
-	    &Apache::lonnet::tmpreset($symb,'',$domain,$name);
-	    &Apache::lonxml::debug("Attempt reset");
-	}
-    }
     if ($env{'request.state'} eq "construct") {
 	if ( -e $file ) {
 	    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},