[LON-CAPA-cvs] cvs: loncom(version_1_2_X) /homework inputtags.pm

[albertel]

albertel		Fri Nov  5 20:27:42 2004 EDT

  Modified files:              (Branch: version_1_2_X)
    /loncom/homework	inputtags.pm 
  Log:
  - backport 1.152
  
  
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.149.2.1 loncom/homework/inputtags.pm:1.149.2.2
--- loncom/homework/inputtags.pm:1.149.2.1	Fri Nov  5 20:15:59 2004
+++ loncom/homework/inputtags.pm	Fri Nov  5 20:27:42 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.149.2.1 2004/11/06 01:15:59 albertel Exp $
+# $Id: inputtags.pm,v 1.149.2.2 2004/11/06 01:27:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -578,7 +578,8 @@
 	} 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"} =
@@ -597,7 +598,8 @@
 	} 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;