--- loncom/homework/caparesponse/caparesponse.pm	2007/04/17 23:25:24	1.212
+++ loncom/homework/caparesponse/caparesponse.pm	2007/08/29 10:09:56	1.217
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.212 2007/04/17 23:25:24 albertel Exp $
+# $Id: caparesponse.pm,v 1.217 2007/08/29 10:09:56 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -392,9 +392,6 @@ sub setup_capa_args {
 sub setup_capa_response {
     my ($args_ref,$response) = @_;   
 
-    use Data::Dumper;
-    &Apache::lonxml::debug("response dump is ".&Dumper($response));
-    
     if (ref($response)) {
 	$$args_ref{'response'}=dclone($response);
     } else {
@@ -465,7 +462,7 @@ sub add_in_tag_answer {
     my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval,
 					      $response_level);
     &Apache::lonxml::debug('answer is'.join(':',@answer));
-    if (@answer && defined($answer[0])) {
+    if (@answer && $answer[0] =~ /\S/) {
 	$answer{$tag_internal_answer_name}= {'type' => 'ordered',
 					     'answers' => [\@answer] };
     }
@@ -608,6 +605,7 @@ sub end_numericalresponse {
 	my $part_id="$partid.$id";
 	if ($target eq 'analyze') {
 	    push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
+	    push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, 1);
 	    $Apache::lonhomework::analyze{"$part_id.type"} = $tag;
 	    my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
 	    if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }
@@ -794,7 +792,15 @@ sub end_numericalresponse {
 
 sub format_prior_response_numerical {
     my ($mode,$answer) = @_;
-    #FIXME needs to support multianswer modes
+    if (ref($answer)) {
+	my $result = '<table class="LC_prior_numerical"><tr>';
+	foreach my $element (@{ $answer }) {
+	    $result.= '<td><span class="LC_prior_numerical">'.
+		&HTML::Entities::encode($element,'"<>&').'</span></td>';
+	}
+	$result.='</tr></table>';
+	return $result;
+    }
     return '<span class="LC_prior_numerical">'.
 	    &HTML::Entities::encode($answer,'"<>&').'</span>';
 
@@ -816,10 +822,9 @@ sub check_for_answer_errors {
 	} (sort(keys(%counts))));
 	&Apache::lonxml::error(&mt("All answers must have the same number of components. Varying numbers of answers were seen. ").$counts);
     }
-    use Data::Dumper;
-    &Apache::lonxml::debug("count dump is ".&Dumper(\%counts));
     my $expected_number_of_inputs = (keys(%counts))[0];
-    if ( $expected_number_of_inputs != scalar(@Apache::inputtags::inputlist)) {
+    if ( $expected_number_of_inputs > 0 
+	 && $expected_number_of_inputs != scalar(@Apache::inputtags::inputlist)) {
 	&Apache::lonxml::error(&mt("Expected [_1] input fields, but there were only [_2] seen.", 
 				   $expected_number_of_inputs,
 				   scalar(@Apache::inputtags::inputlist)));
@@ -855,7 +860,13 @@ sub get_table_sizes {
     my $bubbles_per_line=int($textwidth/$cell_width);
     if ($bubbles_per_line > $number_of_bubbles) {
 	$bubbles_per_line=$number_of_bubbles;
-    }elsif (($bubbles_per_line > $number_of_bubbles/2) && ($number_of_bubbles % 2==0)) {$bubbles_per_line=$number_of_bubbles/2;}
+    } elsif (($bubbles_per_line > $number_of_bubbles/2) 
+	     && ($number_of_bubbles % 2==0)) {
+	$bubbles_per_line=$number_of_bubbles/2;
+    }
+    if ($bubbles_per_line < 1) {
+	$bubbles_per_line=1;
+    }
     my $number_of_tables = int($number_of_bubbles/$bubbles_per_line);
     my @table_range = ();
     for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$bubbles_per_line;}
@@ -890,6 +901,11 @@ sub format_number {
 
 sub make_numerical_bubbles {
     my ($part,$id,$target,$parstack,$safeeval) =@_;
+
+    if (!%answer) {
+	&Apache::lonxml::error(&mt("No answers defined for response [_1] in part [_2] to make bubbles for.",$id,$part));
+	return ([],[],undef);
+    }
     
     my $number_of_bubbles = 
 	&Apache::response::get_response_param($part.'_'.$id,'numbubbles',8);