--- loncom/homework/inputtags.pm	2003/09/17 21:29:44	1.116
+++ loncom/homework/inputtags.pm	2003/09/23 15:59:53	1.119
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.116 2003/09/17 21:29:44 www Exp $
+# $Id: inputtags.pm,v 1.119 2003/09/23 15:59:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -455,7 +455,8 @@ sub decideoutput {
       $message = &mt("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 = &mt("Answer Submitted");
       $bgcolor=$possiblecolors{'correct'};
       $button=1;
@@ -517,6 +518,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' ) {
@@ -536,6 +540,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;
       }
     }