--- loncom/homework/caparesponse/caparesponse.pm 2000/11/21 18:42:12 1.12
+++ loncom/homework/caparesponse/caparesponse.pm 2000/12/01 00:44:48 1.15
@@ -15,8 +15,10 @@ sub start_caparesponse {
my $args ='';
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);
+ if ($id eq '') { $id = $Apache::lonxml::curdepth; }
push (@Apache::inputtags::response,$id);
-
+ push (@Apache::inputtags::responselist,$id);
+ return '';
#my $envkey;
#foreach $envkey (sort keys %ENV) {
# Apache::lonxml::debug("$envkey ---- $ENV{$envkey}
");
@@ -27,27 +29,29 @@ sub start_caparesponse {
sub end_caparesponse {
my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ( defined $ENV{'form.'.$ENV{'form.request.prefix'}.'submit'}) {
+ if ( defined $ENV{'form.submit'}) {
$Apache::caparesponse::result='';
$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
my $response = $ENV{'form.HWVAL'.$Apache::inputtags::curvalue};
- $Apache::lonhomework::results{"resource.submission.part$Apache::inputtags::part['-1'].response$Apache::inputtags::response['-1']"}=$response;
+ $Apache::lonhomework::results{"resource.submission.$Apache::inputtags::part.$Apache::inputtags::response['-1']"}=$response;
&Apache::lonxml::debug("submitted a $response
\n");
&Apache::lonxml::debug($$parstack[$#$parstack] . "\n
");
- my $tol=$Apache::inputtags::{'tol'};
my $expression="&caparesponse_check('".$response."','".
$$parstack[$#$parstack].
- ';my $tol='.$Apache::inputtags::{'tol'}.
+ ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.
+ ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.
"');";
$result = &Apache::run::run($expression,$safeeval);
-
+ my ($ad) = split /:/ , $result;
+ $Apache::lonhomework::results{"resource.awarddetail.$Apache::inputtags::part.$Apache::inputtags::response['-1']"}=$ad;
+ &Apache::lonxml::debug("$expression");
&Apache::lonxml::debug("\n
result:$Apache::caparesponse::result:$result:$Apache::lonxml::curdepth
\n");
} else {
#return "The correct answer is ".&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval)."\n";
}
#Apache::lonxml::debug("\n
\nreal end caparesponse
\n");
- pop @Apache::inputtags::part;
+ pop @Apache::inputtags::response;
return '';
}