--- loncom/homework/response.pm	2007/05/31 04:15:52	1.168
+++ loncom/homework/response.pm	2007/09/25 20:18:56	1.177
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
 #
-# $Id: response.pm,v 1.168 2007/05/31 04:15:52 albertel Exp $
+# $Id: response.pm,v 1.177 2007/09/25 20:18:56 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -569,15 +569,15 @@ sub implicit_multiplication {
     $expression=~s/(\d+)(?:x|\*)10(?:\^|\*\*)([\+\-]*\d+)/$1\&\($2\)/gsi;
 # Fill in multiplication signs
 # a b -> a*b;3 b -> 3*b;3 4 -> 3*4
-    $expression=~s/(\w)\s+(\w)/$1\*$2/gs;
+    $expression=~s/([A-Za-z0-9])\s+(?=[A-Za-z0-9])/$1\*/gs;
 # )( -> )*(; ) ( -> )*(
     $expression=~s/\)\s*\(/\)\*\(/gs;
 # 3a -> 3*a; 3( -> 3*(; 3 ( -> 3*(; 3A -> 3*A
     $expression=~s/(\d)\s*([a-zA-Z\(])/$1\*$2/gs;
 # a ( -> a*(
-    $expression=~s/(\w)\s+\(/$1\*\(/gs;
+    $expression=~s/([A-Za-z0-9])\s+\(/$1\*\(/gs;
 # )a -> )*a; )3 -> )*3; ) 3 -> )*3
-    $expression=~s/\)\s*(\w)/\)\*$1/gs;
+    $expression=~s/\)\s*([A-Za-z0-9])/\)\*$1/gs;
 # 3&8 -> 3e8; 3&-4 -> 3e-4
     $expression=~s/(\d+)\&\(([\+\-]*\d+)\)/$1e$2/gs;
     return $expression;
@@ -852,23 +852,35 @@ Returns either the exact text of the sub
 converted to something usable.
 
 Optional Arguments:
-  $offset - if a problem has more than one bubble response, pass in the number
-            of the bubble wanted
+  $offset - (defaults to 1) if a problem has more than one bubble
+            response, pass in the number of the bubble wanted, (the
+            first bubble associated with a problem has an offset of 1,
+            the second bubble is 2
+
   $resulttype - undef    -> a number between 0 and 25
                 'A is 1' -> a number between 1 and 26
                 'letter' -> a letter between 'A' and 'Z'
+  $lines  - undef problem only needs a single line of bubbles.
+            nonzero  Problem wants the first nonempty response in 
+                      $lines lines of bubbles.
+  $bubbles_per_line - Must be provided if lines is defined.. number of
+                      bubbles on a line.
 
 =cut
 
 sub getresponse {
-    my ($offset,$resulttype)=@_;
+    my ($offset,$resulttype, $lines, $bubbles_per_line)=@_;
     my $formparm='form.HWVAL_'.$Apache::inputtags::response['-1'];
     my $response;
     if (!defined($offset)) {
-	$temp=1;
+	$offset=1;
     } else {
 	$formparm.=":$offset";
     }
+    if (!defined($lines)) {
+	$lines = 1;
+    }
+
     my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,'H'=>7,
 		    'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14,
 		    'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21,
@@ -876,21 +888,43 @@ sub getresponse {
     if ($env{'form.submitted'} eq 'scantron') {
 	my $part  = $Apache::inputtags::part;
 	my $id    = $Apache::inputtags::response[-1];
-	$response = $env{'scantron.'.($Apache::lonxml::counter+$offset-1).
-			 '.answer'};
-	# save bubbled letter for later
-	$Apache::lonhomework::results{"resource.$part.$id.scantron"}.=
-	    $response;
+	
+	my $line;
+	for ($line = 0; $line < $lines; $line++) {
+	    $response = $env{'scantron.'.
+				 ($Apache::lonxml::counter+$offset-1+$line).
+				 '.answer'};
+	    if ($response ne "") {
+		last;
+	    }
+	    
+	}
 	if ($resulttype ne 'letter') {
 	    if ($resulttype eq 'A is 1') {
 		$response = $let_to_num{$response}+1;
 	    } else {
 		$response = $let_to_num{$response};
 	    }
+	    if ($response ne "") {
+		$response += $line * $bubbles_per_line;
+	    }
+	} else {
+	    if ($response ne "") {
+		$response = chr(ord($response) + $line * $bubbles_per_line);
+	    }
 	}
+	# save submitted response for later
+	$Apache::lonhomework::results{"resource.$part.$id.scantron"}.=
+	    $response;
+
     } else {
 	$response = $env{$formparm};
     }
+    # 
+    #  If we have a nonempty answer, correct the numeric value
+    #  of the answer for the line on which it was found.
+    #
+
     return $response;
 }
 
@@ -1172,6 +1206,21 @@ sub check_status {
     return 2;
 }
 
+=pod
+
+=item setup_prior_tries_hash($func,$data)
+
+  Foreach each past .submission $func is called with 3 arguments
+     - the mode to set things up for (currently always 'grade')
+     - the stored .submission string
+     - The expansion of $data
+
+  $data is an array ref containing elements that are either
+    - scalars that are other elements of the history hash to pass to $func
+    - ref to data to be passed untouched to $func
+
+=cut
+
 sub setup_prior_tries_hash {
     my ($func,$data) = @_;
     my $part = $Apache::inputtags::part;