--- loncom/homework/inputtags.pm	2004/03/13 00:36:11	1.136
+++ loncom/homework/inputtags.pm	2004/03/26 20:10:42	1.137
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.136 2004/03/13 00:36:11 albertel Exp $
+# $Id: inputtags.pm,v 1.137 2004/03/26 20:10:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -305,7 +305,9 @@ sub finalizeawards {
     }
     if (defined($result)) { return ($result,$msg); }
     foreach my $possibleaward ('MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
-			       'TOO_LONG', 'UNIT_FAIL', 'NO_UNIT',
+			       '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',
@@ -413,7 +415,18 @@ sub decideoutput {
 	$message = &mt("Significant figures are incorrect, you provided [_1] significant figures while [_2] to [_3] were expected. Submission not graded.",(split(/:/,$awardmsg)));
 	$bgcolor=$possiblecolors{'not_charged_try'};
 	$button=1;
-    } elsif ($award eq 'UNIT_FAIL') {
+    } elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') {
+	$message = &mt('Error in instructor specifed unit. This error has been reported to the instructor.', $awardmsg);
+	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} 
+	$bgcolor=$possiblecolors{'not_charged_try'};
+	$button=1;
+    } elsif ($award eq 'UNIT_INVALID_STUDENT') {
+	$message = &mt('Unable to interpret units. Computer reads units as "[_1]"',
+		       $awardmsg);
+	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} 
+	$bgcolor=$possiblecolors{'not_charged_try'};
+	$button=1;
+    } elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') {
 	$message = &mt('Units incorrect. Computer reads units as "[_1]"',
 		       $awardmsg);
 	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');}