--- loncom/homework/response.pm	2007/09/27 19:05:03	1.178
+++ loncom/homework/response.pm	2007/11/05 11:46:08	1.182
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
 #
-# $Id: response.pm,v 1.178 2007/09/27 19:05:03 albertel Exp $
+# $Id: response.pm,v 1.182 2007/11/05 11:46:08 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);
@@ -894,7 +898,7 @@ sub getresponse {
 	    $response = $env{'scantron.'.
 				 ($Apache::lonxml::counter+$offset-1+$line).
 				 '.answer'};
-	    if ($response ne "") {
+	    if ((defined($response)) && ($response ne " ")) {
 		last;
 	    }
 	    
@@ -1046,7 +1050,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");
 }