--- loncom/homework/caparesponse/caparesponse.pm 2000/12/28 00:17:32 1.22
+++ loncom/homework/caparesponse/caparesponse.pm 2001/01/03 00:14:47 1.23
@@ -23,7 +23,8 @@ sub end_caparesponse {
$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
if ( $response =~ /[^\s]/) {
- my $previous= &check_for_previous($response,$id,$response);
+ my $id = $Apache::inputtags::response['-1'];
+ my $previous= &Apache::response::check_for_previous($response,$id,$response);
if ( $previous ) {
$result = 'PREVIOUSLY_USED';
} else {
@@ -65,20 +66,22 @@ sub end_numericalresponse {
$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
if ( $response =~ /[^\s]/) {
- my $previous= &check_for_previous($response,$id,$response);
+ my $id = $Apache::inputtags::response['-1'];
+ my $previous= &Apache::response::check_for_previous($response,$id,$response);
if ( $previous ) {
$result = 'PREVIOUSLY_USED';
} else {
$Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"}=$response;
&Apache::lonxml::debug("submitted a $response
\n");
&Apache::lonxml::debug($$parstack[$#$parstack] . "\n
");
- my $expression="&caparesponse_check('".$response."','".
+ my $expression="&caparesponse_check_list('".$response."','".
$$parstack[$#$parstack].
';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.
';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.
"');";
$result = &Apache::run::run($expression,$safeeval);
- my ($ad) = split /:/ , $result;
+ my ($awards) = split /:/ , $result;
+ my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
$Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].awarddetail"}=$ad;
&Apache::lonxml::debug("$expression");
&Apache::lonxml::debug("\n
result:$Apache::caparesponse::result:$result:$Apache::lonxml::curdepth
\n");