--- loncom/homework/caparesponse/caparesponse.pm	2007/11/16 08:44:37	1.220
+++ loncom/homework/caparesponse/caparesponse.pm	2008/03/06 02:48:23	1.222
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.220 2007/11/16 08:44:37 albertel Exp $
+# $Id: caparesponse.pm,v 1.222 2008/03/06 02:48:23 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -787,6 +787,12 @@ sub end_numericalresponse {
     }
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
 	$target eq 'tex' || $target eq 'analyze') {
+        if (($tag eq 'formularesponse') && ($target eq 'analyze')) {
+            my $type = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.type');
+            if ($type eq 'exam') {
+                $increment = &Apache::response::repetition();
+            }
+        }
 	&Apache::lonxml::increment_counter($increment,"$partid.$id");
 	if ($target eq 'analyze') {
 	    &Apache::lonhomework::set_bubble_lines();
@@ -982,13 +988,23 @@ sub make_numerical_bubbles {
     $ind=&Math::Random::random_uniform_integer(1,0,$#factors);
     my $factor = $factors[$ind];
     my @bubble_display;
+    my $answerfactor=$answer;
+    if ($answer==0) { 
+       $answerfactor=&Math::Random::random_uniform_integer(1,1,100)/
+                     &Math::Random::random_uniform_integer(1,1,10);
+    }
     for ($ind=0;$ind<$number_of_bubbles;$ind++) {
-	$bubble_values[$ind] = $answer*($factor**($power-$powers[$#powers-$ind]));
+	$bubble_values[$ind] = $answerfactor*($factor**($power-$powers[$#powers-$ind]));
 	$bubble_display[$ind] = &format_number($bubble_values[$ind],
 					       $format,$target,$safeeval);
-
     }
     my $correct = $alphabet[$number_of_bubbles-$power];
+    if ($answer==0) {
+       $correct='A';
+       $bubble_values[0]=0;
+       $bubble_display[0] = &format_number($bubble_values[0],
+                                           $format,$target,$safeeval);
+    }
     &Math::Random::random_set_seed(@oldseed);
     return (\@bubble_values,\@bubble_display,$correct);
 }