--- loncom/homework/caparesponse/caparesponse.pm	2004/12/23 22:53:41	1.158
+++ loncom/homework/caparesponse/caparesponse.pm	2005/01/26 22:43:43	1.161
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.158 2004/12/23 22:53:41 albertel Exp $
+# $Id: caparesponse.pm,v 1.161 2005/01/26 22:43:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -160,6 +160,7 @@ sub end_numericalresponse {
 		    my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
 		    my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
 		    my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
+		    if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }
 		    my ($values,$display)=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect,$safeeval);
 		    $response=$values->[$response];
 		}
@@ -238,6 +239,7 @@ sub end_numericalresponse {
 	    my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
 						    $safeeval);
 	    my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
+	    if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }
 	    my ($bubble_values,$bubble_display)=
 		&make_numerical_bubbles($number_of_bubbles,
 					$target,$answers[0],
@@ -270,7 +272,7 @@ sub end_numericalresponse {
 		}
 		if ($tag eq 'numericalresponse') {
 		    my ($celllength,$number_of_tables,@table_range)=
-			&get_table_sizes($number_of_bubbles,$bubble_values);
+			&get_table_sizes($number_of_bubbles,$bubble_display);
 		    my $j=0;
 		    my $cou=0;
 		    $result.='\vskip -1 mm \noindent \begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';
@@ -281,7 +283,7 @@ sub end_numericalresponse {
 			}
 			$result.='}';
 			for (my $ind=$cou;$ind<$cou+$table_range[$j];$ind++) {
-			    $result.='\hskip -4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$ & \hskip -3 mm {\small '.$bubble_values->[$ind].'} ';
+			    $result.='\hskip -4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$ & \hskip -3 mm {\small '.$bubble_display->[$ind].'} ';
 			    if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';}
 			}
 			$cou += $table_range[$j];
@@ -310,6 +312,7 @@ sub end_numericalresponse {
 	    push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
 	    $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])); }
 	    push (@{ $Apache::lonhomework::analyze{"$part_id.incorrect"} }, @incorrect);
 	    &Apache::response::check_if_computed($token,$parstack,
 						 $safeeval,'answer');
@@ -401,7 +404,7 @@ sub get_table_sizes {
     my $cell_width=0;
     foreach my $member (@$rbubble_values) {
 	my $cell_width_real=0;
-	if ($member=~/(\+|-)?(\d*)\.?(\d*)\s*\$\\times\s*10\^{(\+|-)?(\d+)}\$/) {
+	if ($member=~/(\+|-)?(\d*)\.?(\d*)\s*\$?\\times\s*10\^{(\+|-)?(\d+)}\$?/) {
 	    $cell_width_real=(length($2)+length($3)+length($5)+7)*$scale;
 	} elsif ($member=~/(\d*)\.?(\d*)(E|e)(\+|-)?(\d*)/) {
 	    $cell_width_real=(length($1)+length($2)+length($5)+9)*$scale;
@@ -486,7 +489,7 @@ sub make_numerical_bubbles {
 	}
 	if (defined($$incorrect[0]) &&
 	    scalar(@$incorrect)+1 < $number_of_bubbles) {
-	    &Apache::lonxml::warning("Not enough incorrect answers were specified in the incorrect array, ignoring the specified incorrect answers and instead generating them.");
+	    &Apache::lonxml::warning("Not enough incorrect answers were specified in the incorrect array, ignoring the specified incorrect answers and instead generating them (".join(',',@$incorrect).").");
 	}
     }
     my @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors