--- loncom/homework/caparesponse/caparesponse.pm	2001/07/23 22:40:59	1.37
+++ loncom/homework/caparesponse/caparesponse.pm	2001/08/03 22:12:07	1.38
@@ -90,32 +90,36 @@ sub end_numericalresponse {
   if ( $target eq 'grade' ) {
     if ( defined $ENV{'form.submitted'}) {
       $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
-      my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
+      my $partid = $Apache::inputtags::part;
+      my $id = $Apache::inputtags::response['-1'];
+      my $response = $ENV{'form.HWVAL'.$id};
       if ( $response =~ /[^\s]/) {
-	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.$id.submission"}=$response;
-	  &Apache::lonxml::debug("submitted a $response<br>\n");
-	  &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
-	  $response =~ s/\\/\\\\/g;
-	  $response =~ s/\'/\\\'/g;
-	  &Apache::lonxml::debug("current $response");
-	  my $expression="&caparesponse_check_list('".$response."','".
-	    $$parstack[$#$parstack].
-	      ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.
+	my %previous = &Apache::response::check_for_previous($response,$partid,$id);
+	$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
+	&Apache::lonxml::debug("submitted a $response<br>\n");
+	&Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
+	$response =~ s/\\/\\\\/g;
+	$response =~ s/\'/\\\'/g;
+	&Apache::lonxml::debug("current $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 ($awards) = split /:/ , $result;
-	  my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
-	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$ad;
-	  &Apache::lonxml::debug("$expression");
-	  &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
-	  $result='';
+	$result = &Apache::run::run($expression,$safeeval);
+	my ($awards) = split /:/ , $result;
+	my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
+	if ( $previous{'used'} && ($previous{'award'} eq $ad) ) {
+	  if ($previous{'last'}) {
+	    push(@Apache::inputtags::previous,'PREVIOUSLY_LAST');
+	  } else {
+	    push(@Apache::inputtags::previous,'PREVIOUSLY_USED');
+	  }
 	}
+	$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
+	&Apache::lonxml::debug("$expression");
+	&Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
+	$result='';
       }
     }
   } elsif ($target eq 'web') {