--- loncom/homework/inputtags.pm	2003/08/28 12:54:27	1.114
+++ loncom/homework/inputtags.pm	2003/10/15 22:20:13	1.114.2.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.114 2003/08/28 12:54:27 sakharuk Exp $
+# $Id: inputtags.pm,v 1.114.2.4 2003/10/15 22:20:13 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -454,7 +454,8 @@ sub decideoutput {
       $message = "Unknown message: $award";
       $button=1;
   }
-  if (lc($Apache::lonhomework::problemstatus) eq 'no') {
+  if (lc($Apache::lonhomework::problemstatus) eq 'no'  && 
+      $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {
       $message = "Answer Submitted";
       $bgcolor=$possiblecolors{'correct'};
       $button=1;
@@ -516,6 +517,9 @@ sub setgradedata {
     } elsif ( $award eq 'INCORRECT' ) {
       $Apache::lonhomework::results{"resource.$id.tries"} =
 	$Apache::lonhomework::history{"resource.$id.tries"} + 1;
+      if (lc($Apache::lonhomework::problemstatus) eq 'no') {
+	  $Apache::lonhomework::results{"resource.$id.awarded"} = 0;
+      }
       $Apache::lonhomework::results{"resource.$id.solved"} =
 	'incorrect_attempted'
     } elsif ( $award eq 'SUBMITTED' ) {
@@ -535,6 +539,7 @@ sub setgradedata {
       if (lc($Apache::lonhomework::problemstatus) eq 'no') {
 	  $Apache::lonhomework::results{"resource.$id.tries"} =
 	      $Apache::lonhomework::history{"resource.$id.tries"} + 1;
+	  $Apache::lonhomework::results{"resource.$id.awarded"} = 0;
       }
     }
 
@@ -615,7 +620,8 @@ sub gradestatus {
 
   my $status = $Apache::inputtags::status['-1'];
   &Apache::lonxml::debug("gradestatus has :$status:");
-  if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE') {  
+  if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE' &&
+       $status ne 'INVALID_ACCESS') {  
     my $award = $Apache::lonhomework::history{"resource.$id.award"};
     my $solved = $Apache::lonhomework::history{"resource.$id.solved"};
     my $previous = $Apache::lonhomework::history{"resource.$id.previous"};