--- loncom/homework/caparesponse/caparesponse.pm	2005/05/23 21:18:25	1.168
+++ loncom/homework/caparesponse/caparesponse.pm	2005/07/11 18:35:23	1.174
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.168 2005/05/23 21:18:25 albertel Exp $
+# $Id: caparesponse.pm,v 1.174 2005/07/11 18:35:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -121,7 +121,7 @@ sub start_numericalresponse {
 }
 
 sub check_submission {
-    my ($response,$partid,$id,$tag,$parstack,$safeeval)=@_;
+    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');
@@ -142,7 +142,8 @@ sub check_submission {
     }
     #sig fig don't make much sense either
     if (($Apache::lonhomework::type eq 'exam' ||
-	 &Apache::response::submitted('scantron')) &&
+	 &Apache::response::submitted('scantron') ||
+	 $ignore_sig) &&
 	$tag eq 'numericalresponse') {
 	delete($$args_ref{'sig'});
     }
@@ -352,6 +353,15 @@ sub end_numericalresponse {
 		#}
 	    }
 	    my $response=$ans;
+	    my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.
+					      $id.'.turnoffunit');
+	    if ($unit ne ''  && 
+		! ($Apache::lonhomework::type eq 'exam' ||
+		   lc($hideunit) eq "yes") )  {
+		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') {
@@ -376,7 +386,24 @@ sub end_numericalresponse {
 						 $parstack,$safeeval);
 	    my ($ad,$msg) =&Apache::inputtags::finalizeawards($awards,$msgs);
 	    if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {
-		&Apache::lonxml::error(&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));
+		# 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 $error;
+		if ($siglow ne '' && $sighigh ne '') {
+		    $error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range ("[_2]" to "[_3]") or significant figures ("[_4]" to "[_5]") need to be adjusted.',$response,$low,$high,$siglow,$sighigh);
+		} else {
+		    $error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range ("[_2]" to "[_3]") needs to be adjusted.',$response,$low,$high);
+		}
+		if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {
+		    &Apache::lonxml::error($error);
+		} else {
+		    &Apache::lonxml::warning($error);
+		}
 	    }
 	}
 	if (defined($unit) and ($unit ne '') and