--- loncom/homework/caparesponse/caparesponse.pm	2005/01/08 06:10:38	1.159
+++ loncom/homework/caparesponse/caparesponse.pm	2005/01/31 22:00:40	1.162
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.159 2005/01/08 06:10:38 albertel Exp $
+# $Id: caparesponse.pm,v 1.162 2005/01/31 22:00:40 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -128,7 +128,7 @@ sub end_numericalresponse {
     }
     my $tag;
     if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }
-    if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {
+    if ( $target eq 'grade' && &Apache::response::submitted() ) {
 	&Apache::response::setup_params($tag,$safeeval);
 	$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
 	my $partid = $Apache::inputtags::part;
@@ -137,7 +137,6 @@ sub end_numericalresponse {
 	    $tag eq 'formularesponse') {
 	    $increment=&Apache::response::scored_response($partid,$id);
 	} elsif ($Apache::lonhomework::type eq 'survey') {
-	    if ( !defined($ENV{'form.submitted'})) { return ''; }
 	    my $response = &Apache::response::getresponse();
 	    if ( $response =~ /[^\s]/) {
 		my %previous=&Apache::response::check_for_previous($response,
@@ -154,12 +153,13 @@ sub end_numericalresponse {
 		&Apache::lonxml::debug("submitted a $response<br>\n");
 		&Apache::lonxml::debug($$parstack[-1] . "\n<br>");
 		
-		if ($ENV{'form.submitted'} eq 'scantron') {
+		if ( &Apache::response::submitted('scantron')) {
 		    my $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles');
 		    if (!$number_of_bubbles) { $number_of_bubbles=8; }
 		    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];
 		}
@@ -184,7 +184,7 @@ sub end_numericalresponse {
 		}
 		#sig fig don't make much sense either
 		if (($Apache::lonhomework::type eq 'exam' ||
-		     $ENV{'form.submitted'} eq 'scantron') &&
+		     &Apache::response::submitted('scantron')) &&
 		    $tag eq 'numericalresponse') {
 		    delete($$args_ref{'sig'});
 		}
@@ -238,6 +238,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],
@@ -310,6 +311,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 +403,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 +488,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
@@ -609,14 +611,13 @@ sub end_stringresponse {
     if (!$Apache::lonxml::default_homework_loaded) {
 	&Apache::lonxml::default_homework_load($safeeval);
     }
-    if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {
+    if ( $target eq 'grade' && &Apache::response::submitted() ) {
 	&Apache::response::setup_params('stringresponse',$safeeval);
 	$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
 	if ($Apache::lonhomework::type eq 'exam' ||
-	    $ENV{'form.submitted'} eq 'scantron') {
+	    &Apache::response::submitted('scantron')) {
 	    $increment=&Apache::response::scored_response($part,$id);
 	} elsif ($Apache::lonhomework::type eq 'survey') {
-	    if ( !defined($ENV{'form.submitted'})) { return ''; }
 	    my $response = &Apache::response::getresponse();
 	    if ( $response =~ /[^\s]/) {
 		my %previous=&Apache::response::check_for_previous($response,