--- loncom/homework/caparesponse/caparesponse.pm	2004/12/23 22:53:41	1.158
+++ loncom/homework/caparesponse/caparesponse.pm	2005/06/26 22:30:05	1.171
@@ -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.171 2005/06/26 22:30:05 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,6 +30,7 @@ package Apache::caparesponse;
 use strict;
 use capa;
 use Apache::lonlocal;
+use Apache::lonnet;
 
 BEGIN {
     &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));
@@ -119,6 +120,51 @@ sub start_numericalresponse {
     return $result;
 }
 
+sub check_submission {
+    my ($response,$partid,$id,$tag,$parstack,$safeeval,$ignore_sig)=@_;
+    my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
+    $$args_ref{'response'}=$response;
+    my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
+    
+    foreach my $arg ('type','tol','sig','format','unit','calc',
+		     'samples') {
+	$$args_ref{$arg}=
+	    &Apache::lonxml::get_param($arg,$parstack,$safeeval);
+    }
+    foreach my $key (keys(%Apache::inputtags::params)) {
+	$$args_ref{$key}=$Apache::inputtags::params{$key};
+    }
+    
+    #no way to enter units, with radio buttons
+    if ($Apache::lonhomework::type eq 'exam' ||
+	lc($hideunit) eq "yes") {
+	delete($$args_ref{'unit'});
+    }
+    #sig fig don't make much sense either
+    if (($Apache::lonhomework::type eq 'exam' ||
+	 &Apache::response::submitted('scantron') ||
+	 $ignore_sig) &&
+	$tag eq 'numericalresponse') {
+	delete($$args_ref{'sig'});
+    }
+    
+    if ($tag eq 'formularesponse') {
+	$$args_ref{'type'}='fml';
+    } elsif ($tag eq 'numericalresponse') {
+	$$args_ref{'type'}='float';
+    }
+    my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
+    &Apache::lonxml::debug('answer is'.join(':',@answer));
+    @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=@answer;
+    
+    my ($result,@msgs) = 
+	&Apache::run::run("&caparesponse_check_list()",$safeeval);
+    &Apache::lonxml::debug('msgs are'.join(':',@msgs));
+    my ($awards)=split(/:/,$result);
+    my @awards= split(/,/,$awards);
+    return(\@awards,\@msgs);
+}
+
 sub end_numericalresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $increment=1;
@@ -126,26 +172,16 @@ sub end_numericalresponse {
     if (!$Apache::lonxml::default_homework_loaded) {
 	&Apache::lonxml::default_homework_load($safeeval);
     }
+    my $partid = $Apache::inputtags::part;
+    my $id = $Apache::inputtags::response[-1];
     my $tag;
+    $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
     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;
-	my $id = $Apache::inputtags::response['-1'];
 	if ($Apache::lonhomework::type eq 'exam' && 
 	    $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,
-								 $partid,$id);
-		$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
-		my $ad=$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}='SUBMITTED';
-		&Apache::response::handle_previous(\%previous,$ad);
-	    }
 	} else {
 	    my $response = &Apache::response::getresponse();
 	    if ( $response =~ /[^\s]/) {
@@ -154,56 +190,21 @@ 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];
 		}
 		$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
-		my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
-		$$args_ref{'response'}=$response;
-		my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
-
-		foreach my $arg ('type','tol','sig','format','unit','calc',
-				 'samples') {
-		    $$args_ref{$arg}=
-			&Apache::lonxml::get_param($arg,$parstack,$safeeval);
-		}
-		foreach my $key (keys(%Apache::inputtags::params)) {
-		    $$args_ref{$key}=$Apache::inputtags::params{$key};
-		}
-
-		#no way to enter units, with radio buttons
-		if ($Apache::lonhomework::type eq 'exam' ||
-		    lc($hideunit) eq "yes") {
-		    delete($$args_ref{'unit'});
-		}
-		#sig fig don't make much sense either
-		if (($Apache::lonhomework::type eq 'exam' ||
-		     $ENV{'form.submitted'} eq 'scantron') &&
-		    $tag eq 'numericalresponse') {
-		    delete($$args_ref{'sig'});
-		}
-
-		if ($tag eq 'formularesponse') {
-		    $$args_ref{'type'}='fml';
-		} elsif ($tag eq 'numericalresponse') {
-		    $$args_ref{'type'}='float';
-		}
-		my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
-		&Apache::lonxml::debug('answer is'.join(':',@answer));
-		@{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=@answer;
-		
-		($result,my @msgs) = 
-		    &Apache::run::run("&caparesponse_check_list()",$safeeval);
-		&Apache::lonxml::debug('msgs are'.join(':',@msgs));
-		my ($awards)=split(/:/,$result);
-		my (@awards) = split(/,/,$awards);
-		($ad,my $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
+		my ($awards,$msgs)=&check_submission($response,$partid,$id,
+						     $tag,$parstack,$safeeval);
+
+		($ad,my $msg) = &Apache::inputtags::finalizeawards($awards,$msgs);
 		&Apache::lonxml::debug('ad is'.$ad);
 		if ($ad eq 'SIG_FAIL') {
 		    my ($sig_u,$sig_l)=
@@ -213,6 +214,11 @@ sub end_numericalresponse {
 					   $Apache::inputtags::params{'sig'});
 		}
 		&Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
+		if ($Apache::lonhomework::type eq 'survey' &&
+		    ($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' ||
+		     $ad eq 'EXACT_ANS')) {
+		    $ad='SUBMITTED';
+		}
 		&Apache::response::handle_previous(\%previous,$ad);
 		$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
 		$Apache::lonhomework::results{"resource.$partid.$id.awardmsg"}=$msg;
@@ -225,8 +231,6 @@ sub end_numericalresponse {
 	my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
 	my $status = $Apache::inputtags::status['-1'];
 	if ($Apache::lonhomework::type eq 'exam') {
-	    my $partid=$Apache::inputtags::part;
-	    my $id=$Apache::inputtags::response[-1];
 	    my $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles');
 	    if ($Apache::inputtags::params{'numbubbles'}) {
 		$number_of_bubbles = $Apache::inputtags::params{'numbubbles'};
@@ -238,6 +242,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 +275,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 +286,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];
@@ -304,12 +309,12 @@ sub end_numericalresponse {
     } elsif ($target eq 'edit') {
 	$result.='</td></tr>'.&Apache::edit::end_table;
     } elsif ($target eq 'answer' || $target eq 'analyze') {
-	
-	my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+	my $part_id="$partid.$id";
 	if ($target eq 'analyze') {
 	    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');
@@ -347,10 +352,16 @@ sub end_numericalresponse {
 		#    $low =&format_number($low,$fmt,$target,$safeeval);
 		#}
 	    }
+	    my $response=$ans;
+	    if ($unit) {
+		my $cleanunit=$unit;
+		$cleanunit=~s/\$\,//g;
+		$response.=" $cleanunit";
+	    }
 	    if ($target eq 'answer') {
 		if ($high && $tag eq 'numericalresponse') { $ans.=' ['.$low.','.$high.']'; }
 		if (defined($sighigh) && $tag eq 'numericalresponse') {
-		    if ($ENV{'form.answer_output_mode'} eq 'tex') {
+		    if ($env{'form.answer_output_mode'} eq 'tex') {
 			$ans.= " Sig $siglow - $sighigh";
 		    } else {
 			$ans.= " Sig <i>$siglow - $sighigh</i>";
@@ -363,12 +374,33 @@ sub end_numericalresponse {
 		    push (@{ $Apache::lonhomework::analyze{"$part_id.ans_high"} }, $high);
 		    push (@{ $Apache::lonhomework::analyze{"$part_id.ans_low"} }, $low);
 		}
+		if ($fmt) {
+		    push (@{ $Apache::lonhomework::analyze{"$part_id.format"} }, $fmt);
+		}
+	    }
+	    my ($awards,$msgs)=&check_submission($response,$partid,$id,$tag,
+						 $parstack,$safeeval);
+	    my ($ad,$msg) =&Apache::inputtags::finalizeawards($awards,$msgs);
+	    if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {
+		# answer failed check if it is sig figs that is failing
+		my ($awards,$msgs)=&check_submission($response,$partid,$id,
+						     $tag,$parstack,$safeeval,
+						     1);
+		my ($ad,$msg)=&Apache::inputtags::finalizeawards($awards,
+								 $msgs);
+
+		my $msg=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range ("[_2]" to "[_3]") or significant figures ("[_4]" to "[_5]") needs to be adjusted',$response,$low,$high,$siglow,$sighigh);
+		if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {
+		    &Apache::lonxml::error($msg);
+		} else {
+		    &Apache::lonxml::warning($msg);
+		}
 	    }
 	}
 	if (defined($unit) and ($unit ne '') and
 	    $tag eq 'numericalresponse') {
 	    if ($target eq 'answer') {
-		if ($ENV{'form.answer_output_mode'} eq 'tex') {
+		if ($env{'form.answer_output_mode'} eq 'tex') {
 		    $result.=&Apache::response::answer_part($tag,
 							    " Unit: $unit ");
 		} else {
@@ -401,7 +433,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;
@@ -414,11 +446,11 @@ sub get_table_sizes {
     }
     $cell_width+=8; 
     my $textwidth;
-    if ($ENV{'form.textwidth'} ne '') {
-	$ENV{'form.textwidth'}=~/(\d*)\.?(\d*)/;
+    if ($env{'form.textwidth'} ne '') {
+	$env{'form.textwidth'}=~/(\d*)\.?(\d*)/;
 	$textwidth=$1.'.'.$2;
     } else {
-	$ENV{'textwidth'}=~/(\d+)\.?(\d*)/;
+	$env{'form.textwidth'}=~/(\d+)\.?(\d*)/;
 	$textwidth=$1.'.'.$2;
     }
     my $bubbles_per_line=int($textwidth/$cell_width);
@@ -486,7 +518,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
@@ -525,8 +557,8 @@ sub get_tolrange {
 sub get_sigrange {
     my ($sig)=@_;
     &Apache::lonxml::debug("Got a sig of :$sig:");
-    my $courseid=$ENV{'request.course.id'};
-    if (lc($ENV{"course.$courseid.disablesigfigs"}) eq 'yes') {
+    my $courseid=$env{'request.course.id'};
+    if (lc($env{"course.$courseid.disablesigfigs"}) eq 'yes') {
 	return (15,0);
     }
     my $sig_lbound;
@@ -546,7 +578,7 @@ sub get_sigrange {
 	($sig_lbound > 15) ||
 	($sig =~/(\+|-)/ ) ) {
 	my $errormsg=&mt("Invalid Significant figures detected")." ($sig)";
-	if ($ENV{'request.state'} eq 'construct') {
+	if ($env{'request.state'} eq 'construct') {
 	    $errormsg.=
 		&Apache::loncommon::help_open_topic('Significant_Figures');
 	}
@@ -609,23 +641,12 @@ 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,
-								   $part,$id);
-		$Apache::lonhomework::results{"resource.$part.$id.submission"}=
-		    $response;
-		my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
-		&Apache::response::handle_previous(\%previous,$ad);
-	    }
 	} else {
 	    my $response = &Apache::response::getresponse();
 	    if ( $response =~ /[^\s]/) {
@@ -668,6 +689,11 @@ sub end_stringresponse {
 		    ($ad,$msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
 		    &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
 		}
+		if ($Apache::lonhomework::type eq 'survey' &&
+		    ($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' ||
+		     $ad eq 'EXACT_ANS')) {
+		    $ad='SUBMITTED';
+		}
 		&Apache::response::handle_previous(\%previous,$ad);
 		$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
 		$Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=$msg;
@@ -716,7 +742,7 @@ sub end_stringresponse {
 	    $string='Regular Expression';
 	}
 	if ($target eq 'answer') {
-	    if ($ENV{'form.answer_output_mode'} eq 'tex') {
+	    if ($env{'form.answer_output_mode'} eq 'tex') {
 		$result.=&Apache::response::answer_part('stringresponse',
 							"$string");
 	    } else {