--- loncom/homework/caparesponse/caparesponse.pm	2004/03/12 16:55:35	1.139
+++ loncom/homework/caparesponse/caparesponse.pm	2004/03/12 21:06:19	1.141
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.139 2004/03/12 16:55:35 albertel Exp $
+# $Id: caparesponse.pm,v 1.141 2004/03/12 21:06:19 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -99,7 +99,7 @@ sub end_numericalresponse {
     my $tag;
     if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }
     if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {
-	&Apache::response::setup_params($tag);
+	&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'];
@@ -159,7 +159,8 @@ sub end_numericalresponse {
 		&Apache::lonxml::debug('answer is'.join(':',@answer));
 		@{$safeeval->varglob('CAPARESPONSE_CHECK_LIST_answer')}=@answer;
 		
-		$result = &Apache::run::run($expression,$safeeval);
+		($result,my @msgs) = &Apache::run::run($expression,$safeeval);
+		&Apache::lonxml::debug('msgs are'.join(':',@msgs));
 		my ($awards) = split /:/ , $result;
 		($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
 		&Apache::lonxml::debug("$expression");
@@ -298,7 +299,7 @@ sub end_numericalresponse {
 	    push (@{ $Apache::lonhomework::analyze{"$part_id.incorrect"} }, @incorrect);
 	}
 	if (scalar(@$tagstack)) {
-	    &Apache::response::setup_params($tag);
+	    &Apache::response::setup_params($tag,$safeeval);
 	}
 	my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
 	my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
@@ -582,7 +583,7 @@ sub end_stringresponse {
 	&Apache::lonxml::default_homework_load($safeeval);
     }
     if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {
-	&Apache::response::setup_params('stringresponse');
+	&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') {
@@ -659,7 +660,7 @@ sub end_stringresponse {
 	    push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id");
 	    $Apache::lonhomework::analyze{"$part.$id.type"} = 'stringresponse';
 	}
-	&Apache::response::setup_params('stringresponse');
+	&Apache::response::setup_params('stringresponse',$safeeval);
 	if ($target eq 'answer') {
 	    $result.=&Apache::response::answer_header('stringresponse');
 	}