--- loncom/homework/default_homework.lcpm	2001/06/14 21:29:14	1.28
+++ loncom/homework/default_homework.lcpm	2001/07/23 22:40:59	1.32
@@ -21,14 +21,25 @@ sub caparesponse_check {
   my $sig_lbound=''; #done
   my $sig_ubound=''; #done
   my $ans_fmt='';
-  my $units='';     #done
+  my $unit='';     #done
   my $calc='';
   my ($response,$expr)=@_;
-  
+
+
   ($answer,$type,$tol,$sig,$ans_fmt,
-   $units,$calc) = eval $expr.';return $answer,$type,$tol,$sig,$ans_fmt,$units,$calc';
+   $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
+  if ($response=~ /^\s|\s$/) {
+    $response=~ s:^\s+|\s+$::g;
+    $message .="Removed ws now :$response:<br />";
+  } else {
+    $message .="no ws in :$response:<br />";
+  }
+
   if ($type eq '' ) {
+    $message .= "Didn't find a type :$type:$expr: defaulting<br />";
     if ( $answer eq ($answer *1.0)) { $type = 2;
     } else { $type = 3; }
   } else {
@@ -61,7 +72,7 @@ sub caparesponse_check {
   my $result = &caparesponse_capa_check_answer($response,$answer,$type,
 					       $tol_type,$tol,
 					       $sig_lbound,$sig_ubound,
-					       $ans_fmt,$units,$calc);
+					       $ans_fmt,$unit,$calc);
 
   if    ($result == '1') { $result='EXACT_ANS'; } 
   elsif ($result == '2') { $result='APPROX_ANS'; }
@@ -77,34 +88,54 @@ 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|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$units<br />";
+  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 {
   my ($response,$expr)=@_;
+  # do these first, because who knows what varname the instructor might have used
+  # but it probably isn't $CAPARESPONSE_CHECK_LIST_answer
+  my $CAPARESPONSE_CHECK_LIST_answer = eval $expr.';return $answer';
+  my (@list) = eval $CAPARESPONSE_CHECK_LIST_answer;
   my $result='';
+  $result.="error:$@:<br />";
+  # if the eval fails just use what is in the answer exactly
+  if (!defined(@list) || !defined($list[0])) {
+    $result.="list zero is undefined<br />";
+    $list[0]=$CAPARESPONSE_CHECK_LIST_answer;
+  }
   my $aresult='';
   my $current_answer;
-  my $answer = eval $expr.';return $answer';
-  my (@list) = eval $answer;
-  my (@responselist)=split /,/,$response;
+  $result.="Got response :$CAPARESPONSE_CHECK_LIST_answer:$list[0]:<br />";
+  my @responselist;
+  my $type =eval $expr.';return $answer;';
+  if ($type ne '' && $#list > 0) {
+    (@responselist)=split /,/,$response;
+  } else {
+    (@responselist)=($response);
+  }
   my $unit='';
-  $result.="Final response :$responselist['-1']:<br />";
-  if ( $responselist['-1']=~ /(.*[^\s])\s+([^\s]+)/ ) {
-    $responselist['-1']=$1;
-    $unit=$2;
+  $result.="Initial final response :$responselist['-1']:<br />";
+  if ($type eq '') {
+    #for numerical problems split off the unit
+    if ( $responselist['-1']=~ /(.*[^\s])\s+([^\s]+)/ ) {
+      $responselist['-1']=$1;
+      $unit=$2;
+    }
   }
-  $result.="Final response :$responselist['-1']:<br />";
+  $result.="Final final response :$responselist['-1']:<br />";
+  $result.=":$#list: answers<br />";
   $unit=~s/\s//;
   my $i=0;
   my $awards='';
   for ($i=0; $i<@list;$i++) {
+    $result.="trying answer :$list[$i]:<br />";
     if ($unit eq '') {
       $aresult=&caparesponse_check($responselist[$i],
-			     $expr.';my $answer='.$list[$i].';');
+			     $expr.';my $answer=\''.$list[$i].'\';');
     } else {
       $aresult=&caparesponse_check($responselist[$i]." $unit",
-				   $expr.';my $answer='.$list[$i].';');
+				   $expr.';my $answer=\''.$list[$i].'\';');
     }
     my ($temp)=split /:/, $aresult;
     $awards.="$temp,";