--- loncom/homework/default_homework.lcpm	2001/08/22 21:04:58	1.34
+++ loncom/homework/default_homework.lcpm	2001/08/22 22:21:46	1.35
@@ -13,17 +13,21 @@ $rad2deg=180.0/$pi;
 $deg2rad=$pi/180.0;
 
 sub caparesponse_check {
-  #not properly used yet: calc
-  #not to be used: $ans_fmt
-  my ($answer,$type,$tol,$sig,$ans_fmt,$unit,$calc) = 
-	eval $expr.';return ($answer,$type,$tol,$sig,$ans_fmt,$unit,$calc);';
-
+  my $answer='';  #done
+  my $type='';    #done
   my $tol_type=''; # gets it's value from whether tol has a % or not done
+  my $tol='';     #done
+  my $sig='';     #done lowerbnd,upperbnd
   my $sig_lbound=''; #done
   my $sig_ubound=''; #done
+  my $ans_fmt='';
+  my $unit='';     #done
+  my $calc='';
   my ($response,$expr)=@_;
 
 
+  ($answer,$type,$tol,$sig,$ans_fmt,
+   $unit,$calc) = eval $expr.';return ($answer,$type,$tol,$sig,$ans_fmt,$unit,$calc);';
   #type's definitons come from capaParser.h
   my $message='';
   #remove leading and trailing whitespace
@@ -84,7 +88,7 @@ sub caparesponse_check {
   elsif ($result =='12') { $result='WANTED_NUMERIC'; }
   else  {$result = "ERROR: Unknown Result:$result:$@:";}
 
-  return "$result:<br />Error $error:<br />Answer $answer:<br />Response $response:<br /> type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$unit|<br />$message$expr";
+  return "$result:<br />Error $error:<br />Answer $answer:<br />Response $response:<br /> type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$units<br />$message$expr";
 }
 
 sub caparesponse_check_list {