--- loncom/homework/inputtags.pm	2004/06/28 15:01:44	1.147
+++ loncom/homework/inputtags.pm	2004/11/06 01:27:42	1.149.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.147 2004/06/28 15:01:44 sakharuk Exp $
+# $Id: inputtags.pm,v 1.149.2.2 2004/11/06 01:27:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -330,6 +330,7 @@ sub decideoutput {
     my $button=0;
     my $previousmsg;
     my $bgcolor='orange';
+    my $added_computer_text=0;
     my %possiblecolors =
 	( 'correct' => '#aaffaa',
 	  'charged_try' => '#ffaaaa',
@@ -347,7 +348,8 @@ sub decideoutput {
 	    } else {
 		$message = "<b>".&mt('You are correct.')."</b>";
 	    }
-	    $message.= " ".&mt(" Computer's answer now shown.");
+	    $message.=" ".&mt("Computer's answer now shown above.");
+	    $added_computer_text=1;
 	    unless ($ENV{'course.'.
 			     $ENV{'request.course.id'}.
 			     '.disable_receipt_display'} eq 'yes') { 
@@ -379,7 +381,8 @@ sub decideoutput {
 	    } else {
 		$message = "<b>".&mt('You are correct.')."</b>";
 	    }
-	    $message.= " ".&mt(" Computer's answer now shown.");
+	    $message.=" ".&mt("Computer's answer now shown above.");
+	    $added_computer_text=1;
 	    unless ($ENV{'course.'.
 			     $ENV{'request.course.id'}.
 			     '.disable_receipt_display'} eq 'yes') { 
@@ -487,8 +490,10 @@ sub decideoutput {
 	$bgcolor=$possiblecolors{'correct'};
 	$button=1;
     }
-    if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER') {
-	$message.=" ".&mt("Computer's answer now shown.");
+    if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && 
+	!$added_computer_text) {
+	$message.=" ".&mt("Computer's answer now shown above.");
+	$added_computer_text=1;
     }
     return ($button,$bgcolor,$message,$previousmsg);
 }
@@ -519,10 +524,15 @@ sub hidealldata {
 
 sub setgradedata {
     my ($award,$msg,$id,$previously_used) = @_;
-    # if the student already has it correct, don't modify the status
-    if ($Apache::lonhomework::scantronmode && defined($ENV{'form.CODE'})) {
+    if ($Apache::lonhomework::scantronmode && 
+	&Apache::lonnet::validCODE($ENV{'form.CODE'})) {
 	$Apache::lonhomework::results{"resource.CODE"}=$ENV{'form.CODE'};
+    } elsif ($Apache::lonhomework::scantronmode && 
+	     $ENV{'form.CODE'} eq '' &&
+	     $Apache::lonhomework::history{"resource.CODE"} ne '') {
+	$Apache::lonhomework::results{"resource.CODE"}='';
     }
+
     if (!$Apache::lonhomework::scantronmode &&
 	$Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
 	$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {
@@ -531,7 +541,10 @@ sub setgradedata {
     } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~
 	      /^correct/ || $Apache::lonhomework::scantronmode ||
 	      lc($Apache::lonhomework::problemstatus) eq 'no') {
-	#handle assignment of tries and solved status
+        # the student doesn't already have it correct,
+	# or we are in a mode (scantron orno problem status) where a correct 
+        # can become incorrect
+	# handle assignment of tries and solved status
 	my $solvemsg;
 	if ($Apache::lonhomework::scantronmode) {
 	    $solvemsg='correct_by_scantron';
@@ -565,7 +578,8 @@ 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') {
+	    if (lc($Apache::lonhomework::problemstatus) eq 'no' ||
+		$Apache::lonhomework::scantronmode) {
 		$Apache::lonhomework::results{"resource.$id.awarded"} = 0;
 	    }
 	    $Apache::lonhomework::results{"resource.$id.solved"} =
@@ -584,7 +598,8 @@ sub setgradedata {
 	} else {
 	    $Apache::lonhomework::results{"resource.$id.solved"} =
 		'incorrect_attempted';
-	    if (lc($Apache::lonhomework::problemstatus) eq 'no') {
+	    if (lc($Apache::lonhomework::problemstatus) eq 'no' ||
+		$Apache::lonhomework::scantronmode) {
 		$Apache::lonhomework::results{"resource.$id.tries"} =
 		    $Apache::lonhomework::history{"resource.$id.tries"} + 1;
 		$Apache::lonhomework::results{"resource.$id.awarded"} = 0;