--- loncom/homework/lonhomework.pm	2006/04/21 15:27:30	1.233.2.2
+++ loncom/homework/lonhomework.pm	2006/02/10 23:44:53	1.234
@@ -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.234 2006/02/10 23:44:53 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);
@@ -298,15 +297,12 @@ sub check_slot_access {
 	$slotstatus='CAN_ANSWER';
     }
 
-    my ($is_correct,$got_grade,$checkedin);
+    my ($got_grade,$checkedin);
     if ($type eq 'Task') {
 	my $version=$Apache::lonhomework::history{'resource.0.version'};
 	$got_grade = 
 	    ($Apache::lonhomework::history{"resource.$version.0.status"} 
 	     =~ /^(?:pass|fail)$/);
-	$is_correct =  
-	    ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass'
-	     || $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ );
 	$checkedin =
 	    $Apache::lonhomework::history{"resource.$version.0.checkedin"};
     } elsif ($type eq 'problem') {
@@ -314,8 +310,6 @@ sub check_slot_access {
 	$checkedin = $Apache::lonhomework::history{"resource.0.checkedin"};
     }
     
-    &Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)");
-    
     if ($slotstatus eq 'NOT_IN_A_SLOT' 
 	&& $checkedin ) {
 
@@ -326,9 +320,6 @@ sub check_slot_access {
 	}
 
     }
-    if ( $is_correct) {
-	return ('SHOW_ANSWER');
-    }
     if ( $status eq 'CANNOT_ANSWER' && 
 	 ($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) {
 	return ($status,$datemsg);
@@ -999,15 +990,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'},