--- loncom/homework/inputtags.pm	2003/04/08 13:46:30	1.90
+++ loncom/homework/inputtags.pm	2003/04/08 15:18:45	1.91
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.90 2003/04/08 13:46:30 sakharuk Exp $
+# $Id: inputtags.pm,v 1.91 2003/04/08 15:18:45 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -264,84 +264,82 @@ sub decideoutput {
   my $button=0;
   my $previousmsg;
 
- if (lc $Apache::lonhomework::problemstatus eq 'yes') {
-
   if ($previous) { $previousmsg='You have entered that answer before'; }
 
   if      ($solved =~ /^correct/) {
-    if ($target eq 'tex') {
-      $message = '\textbf{You are correct}. Your receipt is '.
-      &Apache::lonnet::receipt;
-    } else {
-      $message = "<b>You are correct.</b> Your receipt is ".
-      &Apache::lonnet::receipt;
-    }
-    $button=0;
-    $previousmsg='';
+      if ($target eq 'tex') {
+	  $message = '\textbf{You are correct}. Your receipt is '.
+           &Apache::lonnet::receipt;
+      } else {
+	  $message = "<b>You are correct.</b> Your receipt is ".
+	   &Apache::lonnet::receipt;
+      }
+      $button=0;
+      $previousmsg='';
   } elsif ($solved =~ /^excused/) {
-    $message = "<b>You are excused from the problem.</b>";
-    $button=0;
-    $previousmsg='';
-  } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
-    if ($solved =~ /^incorrect/ || $solved eq '') {
-      $message = "Incorrect";
-      $button=1;
-    } else {
-      $message = "<b>You are correct.</b> Your receipt is ".
-	&Apache::lonnet::receipt;
+      $message = "<b>You are excused from the problem.</b>";
       $button=0;
       $previousmsg='';
-    }
+  } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
+      if ($solved =~ /^incorrect/ || $solved eq '') {
+	  $message = "Incorrect";
+	  $button=1;
+      } else {
+	  $message = "<b>You are correct.</b> Your receipt is ".
+	   &Apache::lonnet::receipt;
+	  $button=0;
+	  $previousmsg='';
+      }
   } elsif ($award eq 'NO_RESPONSE') {
-    $message = '';
-    $button=1;
+      $message = '';
+      $button=1;
   } elsif ($award eq 'MISSING_ANSWER') {
-    $message = 'Some parts were not submitted';
-    $button = 1;
+      $message = 'Some parts were not submitted';
+      $button = 1;
   } elsif ($award eq 'WANTED_NUMERIC') {
-    $message = "This question expects a numeric answer";
-    $button=1;
+      $message = "This question expects a numeric answer";
+      $button=1;
   } elsif ($award eq 'MISORDERED_RANK') {
-    $message = 'You have provided an invalid ranking, please refer to '.
-     &Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';
-    $button=1;
+      $message = 'You have provided an invalid ranking, please refer to '.
+       &Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';
+      $button=1;
   } elsif ($award eq 'INVALID_FILETYPE') {
-    $message = 'The filetype extension of the file you uploaded is not allowed.';
-    $button=1;
+      $message = 'The filetype extension of the file you uploaded is not allowed.';
+      $button=1;
   } elsif ($award eq 'SIG_FAIL') {
-    $message = "Please adjust significant figures.";# you provided %s significant figures";
-    $button=1;
+      $message = "Please adjust significant figures.";# you provided %s significant figures";
+      $button=1;
   } elsif ($award eq 'UNIT_FAIL') {
-    $message = "Units incorrect. ".
+      $message = "Units incorrect. ".
        &Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s";
-    $button=1;
+      $button=1;
   } elsif ($award eq 'UNIT_NOTNEEDED') {
-    $message = "Only a number required.";# Computer reads units of %s";
-    $button=1;
+      $message = "Only a number required.";# Computer reads units of %s";
+      $button=1;
   } elsif ($award eq 'NO_UNIT') {
-    $message = "Units required".
+      $message = "Units required".
        &Apache::loncommon::help_open_topic('Physical_Units');
-    $button=1;
+      $button=1;
   } elsif ($award eq 'BAD_FORMULA') {
-    $message = "Unable to understand formula";
-    $button=1;
+      $message = "Unable to understand formula";
+      $button=1;
   } elsif ($award eq 'INCORRECT') {
-    $message = "Incorrect";
-    $button=1;
+      $message = "Incorrect";
+      $button=1;
   } elsif ($award eq 'SUBMITTED') {
-    $message = "Your submission has been recorded.";
-    $button=1;
+      $message = "Your submission has been recorded.";
+      $button=1;
   } elsif ($award eq 'DRAFT') {
-    $message = "A draft copy has been saved.";
-    $button=1;
+      $message = "A draft copy has been saved.";
+      $button=1;
   } else {
-    $message = "Unknown message: $award";
-    $button=1;
+      $message = "Unknown message: $award";
+      $button=1;
+  } 
+  if (lc($Apache::lonhomework::problemstatus) ne 'yes') {
+      $message = "Answer Submitted";
+      $button=1;
   }
- } elsif ($Apache::lonhomework::type eq 'exam') {
-     $message = "Answer Submitted";
-     $button=1;
- }
   return ($button,$message,$previousmsg);
 }