--- loncom/homework/caparesponse/caparesponse.pm 2001/01/03 00:14:47 1.23
+++ loncom/homework/caparesponse/caparesponse.pm 2001/01/12 01:07:38 1.26
@@ -28,7 +28,7 @@ sub end_caparesponse {
if ( $previous ) {
$result = 'PREVIOUSLY_USED';
} else {
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"}=$response;
+ $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
&Apache::lonxml::debug("submitted a $response
\n");
&Apache::lonxml::debug($$parstack[$#$parstack] . "\n
");
my $expression="&caparesponse_check('".$response."','".
@@ -38,7 +38,7 @@ sub end_caparesponse {
"');";
$result = &Apache::run::run($expression,$safeeval);
my ($ad) = split /:/ , $result;
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].awarddetail"}=$ad;
+ $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$ad;
&Apache::lonxml::debug("$expression");
&Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n");
}
@@ -49,7 +49,7 @@ sub end_caparesponse {
}
#Apache::lonxml::debug("\n
\nreal end caparesponse
\n");
&Apache::response::end_response;
- return $result;
+ return '';
}
sub start_numericalresponse {
@@ -71,7 +71,7 @@ sub end_numericalresponse {
if ( $previous ) {
$result = 'PREVIOUSLY_USED';
} else {
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"}=$response;
+ $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
&Apache::lonxml::debug("submitted a $response
\n");
&Apache::lonxml::debug($$parstack[$#$parstack] . "\n
");
my $expression="&caparesponse_check_list('".$response."','".
@@ -82,12 +82,26 @@ sub end_numericalresponse {
$result = &Apache::run::run($expression,$safeeval);
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::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$ad;
&Apache::lonxml::debug("$expression");
- &Apache::lonxml::debug("\n
result:$Apache::caparesponse::result:$result:$Apache::lonxml::curdepth
\n");
+ &Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n");
+ $result='';
}
}
}
+ } elsif ($target eq 'web') {
+ my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
+ if ($award =~ /^correct/) {
+ my $answervar=&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval);
+ my (@answers)=&Apache::run::run("$answervar",$safeeval);
+ my $unit=&Apache::run::run("{$$parstack['-1'];".'return $unit}',$safeeval);
+
+ $result="
The computer got ";
+ my $answer;
+ foreach $answer (@answers) { $result.="$answer,"; }
+ chop $result;
+ $result.=" $unit.
";
+ }
}
&Apache::response::end_response;
return $result;