--- loncom/homework/caparesponse/caparesponse.pm	2004/03/13 00:36:11	1.142
+++ loncom/homework/caparesponse/caparesponse.pm	2004/03/16 19:47:47	1.143
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.142 2004/03/13 00:36:11 albertel Exp $
+# $Id: caparesponse.pm,v 1.143 2004/03/16 19:47:47 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,6 +39,7 @@ sub start_numericalresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $id = &Apache::response::start_response($parstack,$safeeval);
     my $result;
+    undef %{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
     if ($target eq 'edit') {
 	$result.=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::text_arg('Answer:','answer',$token);
@@ -122,44 +123,44 @@ sub end_numericalresponse {
 		    my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
 		    my @values=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect);
 		    $response=$values[$response];
-		} else {
-		    $response =~ s/\\/\\\\/g;
-		    $response =~ s/\'/\\\'/g;
 		}
 		$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
-		&Apache::lonxml::debug("current $response");
-		my $expression="&caparesponse_check_list('".$response."','".
-		    $$parstack[-1];
+		my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
+		$$args_ref{'response'}=$response;
 		my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
 
+		foreach my $arg ('type','tol','sig','ans_fmt','unit','calc',
+				 'samples') {
+		    $$args_ref{$arg}=
+			&Apache::lonxml::get_param($arg,$parstack,$safeeval);
+		}
 		foreach my $key (keys(%Apache::inputtags::params)) {
-		    $expression.= ';my $__LC__'. #'
-			$key.'="'.$Apache::inputtags::params{$key}.'"';
+		    $$args_ref{$key}=$Apache::inputtags::params{$key};
 		}
 
 		#no way to enter units, with radio buttons
 		if ($Apache::lonhomework::type eq 'exam' ||
 		    lc($hideunit) eq "yes") {
-		    $expression.=';my $__LC__unit=undef;';
+		    delete($$args_ref{'unit'});
 		}
 		#sig fig don't make much sense either
 		if (($Apache::lonhomework::type eq 'exam' ||
 		     $ENV{'form.submitted'} eq 'scantron') &&
 		    $tag eq 'numericalresponse') {
-		    $expression.=';my $__LC__sig=undef;';
+		    delete($$args_ref{'sig'});
 		}
 
 		if ($tag eq 'formularesponse') {
-		    $expression.=';my $__LC__type="fml";';
+		    $$args_ref{'type'}='fml';
 		} elsif ($tag eq 'numericalresponse') {
-		    $expression.=';my $__LC__type="float";';
+		    $$args_ref{'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;
+		@{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=@answer;
 		
-		($result,my @msgs) = &Apache::run::run($expression,$safeeval);
+		($result,my @msgs) = 
+		    &Apache::run::run("&caparesponse_check_list()",$safeeval);
 		&Apache::lonxml::debug('msgs are'.join(':',@msgs));
 		my ($awards)=split(/:/,$result);
 		my (@awards) = split(/,/,$awards);
@@ -172,7 +173,6 @@ sub end_numericalresponse {
 		    &Apache::lonxml::debug("sigs bad $sig_u $sig_l ".
 					   $Apache::inputtags::params{'sig'});
 		}
-		&Apache::lonxml::debug("$expression");
 		&Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
 		&Apache::response::handle_previous(\%previous,$ad);
 		$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
@@ -605,7 +605,6 @@ sub end_stringresponse {
 								    $part,$id);
 		&Apache::lonxml::debug("submitted a $response<br>\n");
 		&Apache::lonxml::debug($$parstack[-1] . "\n<br>");
-		
 		$Apache::lonhomework::results{"resource.$part.$id.submission"}=
 		    $response;
 		my ($ad,$msg);
@@ -616,31 +615,29 @@ sub end_stringresponse {
 #		    if ($testans !~ m/^\s*\$/) {
 #			$answer=$token->[2]->{'answer'};
 #		    }
-		    ${$safeeval->varglob('LONCAPA_INTERNAL_response')}=
-			$response;
-		    $result = &Apache::run::run('return $LONCAPA_INTERNAL_response=~m'.$answer,$safeeval);
+		    ${$safeeval->varglob('LONCAPA::response')}=$response;
+		    $result = &Apache::run::run('return $LONCAPA::response=~m'.$answer,$safeeval);
 		    &Apache::lonxml::debug("current $response");
 		    &Apache::lonxml::debug("current $answer");
 		    $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';
 		} else {
-		    $response =~ s/\\/\\\\/g;
-		    $response =~ s/\'/\\\'/g;
+		    my $args_ref= 
+			\%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
+		
+		    $$args_ref{'response'}=$response;
 		    &Apache::lonxml::debug("current $response");
-		    my $expression="&caparesponse_check_list('".$response."','".
-			$$parstack[-1];
+		    $$args_ref{'type'}=
+			&Apache::lonxml::get_param('type',$parstack,$safeeval);
 		    foreach my $key (keys(%Apache::inputtags::params)) {
-			$expression.= ';my $'. #'
-			    $key.'="'.$Apache::inputtags::params{$key}.'"';
+			$$args_ref{$key}=$Apache::inputtags::params{$key};
 		    }
-		    $expression.="');";
 		    &Apache::lonxml::debug('answer is'.join(':',$answer));
-		    @{$safeeval->varglob('CAPARESPONSE_CHECK_LIST_answer')}=($answer);
-		    ($result, my @msgs) = &Apache::run::run($expression,$safeeval);
+		    @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=($answer);
+		    ($result, my @msgs)=&Apache::run::run("&caparesponse_check_list()",$safeeval);
 		    &Apache::lonxml::debug('msgs are'.join(':',@msgs));
 		    my ($awards)=split(/:/,$result);
 		    my (@awards) = split(/,/,$awards);
 		    ($ad,$msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
-		    &Apache::lonxml::debug("$expression");
 		    &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
 		}
 		&Apache::response::handle_previous(\%previous,$ad);