--- loncom/homework/caparesponse/caparesponse.pm	2003/05/19 21:15:21	1.102
+++ loncom/homework/caparesponse/caparesponse.pm	2003/06/24 20:41:56	1.105
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.102 2003/05/19 21:15:21 albertel Exp $
+# $Id: caparesponse.pm,v 1.105 2003/06/24 20:41:56 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -150,6 +150,10 @@ sub end_numericalresponse {
 		    $expression.=';my $type="float";';
 		}
 		$expression.="');";
+		my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
+		&Apache::lonxml::debug('answer is'.join(':',@answer));
+		@{$safeeval->varglob('CAPARESPONSE_CHECK_LIST_answer')}=@answer;
+		
 		$result = &Apache::run::run($expression,$safeeval);
 		my ($awards) = split /:/ , $result;
 		($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
@@ -345,11 +349,10 @@ sub end_numericalresponse {
 							    "Unit: <b>$unit</b>");
 		}
 	    } elsif ($target eq 'analyze') {
-		push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} },
-		      $unit);
+		push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} }, $unit);
 	    }
 	}
-	if ($type || $token->[1] eq 'stringresponse') {
+	if ($type || $$tagstack[-1] eq 'stringresponse') {
 	    my $string='Case Insensitive';
 	    if ($type eq 'mc') {
 		$string='Multiple Choice';
@@ -369,7 +372,7 @@ sub end_numericalresponse {
 							    "<b>$string</b>");
 		}
 	    } elsif ($target eq 'analyze') {
-		push (@{ $Apache::lonhomework::analyze{"$part_id.type"} },
+		push (@{ $Apache::lonhomework::analyze{"$part_id.str_type"} },
 		      $type);
 	    }
 	}
@@ -495,7 +498,9 @@ sub start_stringresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'meta') {
+	&Apache::response::start_response($parstack,$safeeval);
 	$result=&Apache::response::meta_package_write('stringresponse');
+	&Apache::response::end_response();
     } else {
 	$result.=&start_numericalresponse(@_);
     }
@@ -510,7 +515,9 @@ sub start_formularesponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'meta') {
+	&Apache::response::start_response($parstack,$safeeval);
 	$result=&Apache::response::meta_package_write('formularesponse');
+	&Apache::response::end_response();
     } else {
 	$result.=&start_numericalresponse(@_);
     }