--- loncom/homework/caparesponse/caparesponse.pm 2001/01/04 22:52:29 1.25
+++ loncom/homework/caparesponse/caparesponse.pm 2001/01/15 21:44:21 1.27
@@ -19,7 +19,7 @@ sub end_caparesponse {
my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
if ( $target eq 'grade' ) {
- if ( defined $ENV{'form.submit'}) {
+ if ( defined $ENV{'form.submitted'}) {
$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
if ( $response =~ /[^\s]/) {
@@ -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");
}
@@ -62,7 +62,7 @@ sub end_numericalresponse {
my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
if ( $target eq 'grade' ) {
- if ( defined $ENV{'form.submit'}) {
+ if ( defined $ENV{'form.submitted'}) {
$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
if ( $response =~ /[^\s]/) {
@@ -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,7 +82,7 @@ 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:$result:$Apache::lonxml::curdepth
\n");
$result='';