--- loncom/homework/response.pm	2007/08/10 18:16:28	1.174
+++ loncom/homework/response.pm	2007/11/06 11:48:48	1.183
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
 #
-# $Id: response.pm,v 1.174 2007/08/10 18:16:28 riegler Exp $
+# $Id: response.pm,v 1.183 2007/11/06 11:48:48 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -451,7 +451,11 @@ sub end_customresponse {
     }
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
 	$target eq 'tex' || $target eq 'analyze') {
-	&Apache::lonxml::increment_counter(&Apache::response::repetition());
+	&Apache::lonxml::increment_counter(&Apache::response::repetition(),
+					   "$part.$id");
+	if ($target eq 'analyze') {
+	    &Apache::lonhomework::set_bubble_lines();
+	}
     }
     pop(@Apache::lonxml::namespace);
     pop(@Apache::response::custom_answer);
@@ -569,8 +573,7 @@ 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
-# The while-pos-construction is necessary for a b c -> a*b*c*d instead of a*b c*d
-    while($expression=~s/([A-Za-z0-9])\s+([A-Za-z0-9])/$1\*$2/gs){pos($expression)--}
+    $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
@@ -895,11 +898,15 @@ sub getresponse {
 	    $response = $env{'scantron.'.
 				 ($Apache::lonxml::counter+$offset-1+$line).
 				 '.answer'};
-	    if ($response ne "") {
+	    if ((defined($response)) && ($response ne " ")) {
 		last;
 	    }
 	    
 	}
+
+	# save bubbled letter for later
+	$Apache::lonhomework::results{"resource.$part.$id.scantron"}.=
+	    $response;
 	if ($resulttype ne 'letter') {
 	    if ($resulttype eq 'A is 1') {
 		$response = $let_to_num{$response}+1;
@@ -914,9 +921,6 @@ sub getresponse {
 		$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};
@@ -1045,7 +1049,7 @@ sub show_answer {
     my $award  = $Apache::lonhomework::history{"resource.$part.solved"};
     my $status = $Apache::inputtags::status[-1];
     return  ( ($award =~ /^correct/
-	       && lc($Apache::lonhomework::problemstatus) ne 'no')
+	       && &Apache::lonhomework::show_problem_status())
 	      || $status eq "SHOW_ANSWER");
 }
 
@@ -1207,6 +1211,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;