--- loncom/homework/inputtags.pm	2005/11/03 17:44:15	1.178
+++ loncom/homework/inputtags.pm	2005/11/15 22:28:30	1.180
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.178 2005/11/03 17:44:15 albertel Exp $
+# $Id: inputtags.pm,v 1.180 2005/11/15 22:28:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -386,6 +386,22 @@ sub checkstatus {
     return(undef,undef);
 }
 
+sub valid_award {
+    my ($award) =@_;
+    foreach my $possibleaward ('MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
+			       'TOO_LONG', 'UNIT_INVALID_INSTRUCTOR',
+			       'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE',
+			       'UNIT_FAIL', 'NO_UNIT',
+			       'UNIT_NOTNEEDED', 'WANTED_NUMERIC',
+			       'BAD_FORMULA', 'SIG_FAIL', 'INCORRECT', 
+			       'MISORDERED_RANK', 'INVALID_FILETYPE',
+			       'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE',
+			       'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') {
+	if ($award eq $possibleaward) { return 1; }
+    }
+    return 0;
+}
+
 sub finalizeawards {
     my ($awardref,$msgref)=@_;
     my $result=undef;
@@ -432,6 +448,14 @@ sub decideoutput {
 	  'no_message' => '#fffff',
 	  );
 
+    my $part = $Apache::inputtags::part;
+    my $handgrade = 
+	('yes' eq lc(&Apache::lonnet::EXT("resource.$part.handgrade")));
+    
+    my $computer = ($handgrade)? ''
+	                       : " ".&mt("Computer's answer now shown above.");
+    &Apache::lonxml::debug("handgrade has :$handgrade:");
+
     if ($previous) { $previousmsg=&mt('You have entered that answer before'); }
     
     if      ($solved =~ /^correct/) {
@@ -453,7 +477,7 @@ sub decideoutput {
 		$message = '\textbf{'.$message.'}';
 	    } else {
 		$message = "<b>".$message."</b>";
-		$message.=" ".&mt("Computer's answer now shown above.");
+		$message.= $computer;
 	    }
 	    $added_computer_text=1;
 	    unless ($env{'course.'.
@@ -485,7 +509,7 @@ sub decideoutput {
 		$message = '\textbf{'.&mt('You are correct.').'}';
 	    } else {
 		$message = "<b>".&mt('You are correct.')."</b>";
-		$message.=" ".&mt("Computer's answer now shown above.");
+		$message.= $computer;
 	    }
 	    $added_computer_text=1;
 	    unless ($env{'course.'.
@@ -601,7 +625,7 @@ sub decideoutput {
     }
     if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && 
 	!$added_computer_text && $target ne 'tex') {
-	$message.=" ".&mt("Computer's answer now shown above.");
+	$message.= $computer;
 	$added_computer_text=1;
     }
     return ($button,$bgcolor,$message,$previousmsg);