--- loncom/homework/caparesponse/caparesponse.pm	2000/12/19 23:22:22	1.21
+++ loncom/homework/caparesponse/caparesponse.pm	2000/12/28 00:17:32	1.22
@@ -9,7 +9,6 @@ sub BEGIN {
   &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse'));
 }
 
-$Apache::caparesponse::result='';
 sub start_caparesponse {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
   my $id = &Apache::response::start_response($parstack,$safeeval);
@@ -21,24 +20,27 @@ sub end_caparesponse {
   my $result = '';
   if ( $target eq 'grade' ) {
     if ( defined $ENV{'form.submit'}) {
-      $Apache::caparesponse::result='';
       $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
       my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
       if ( $response =~ /[^\s]/) {
-	#check_for_previous($response,$id,$response);
-	$Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"}=$response;
-	&Apache::lonxml::debug("submitted a $response<br>\n");
-	&Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
-	my $expression="&caparesponse_check('".$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;
-	$Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].awarddetail"}=$ad;
-	&Apache::lonxml::debug("$expression");
-	&Apache::lonxml::debug("\n<br>result:$Apache::caparesponse::result:$result:$Apache::lonxml::curdepth<br>\n");
+	my $previous= &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<br>\n");
+	  &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
+	  my $expression="&caparesponse_check('".$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;
+	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].awarddetail"}=$ad;
+	  &Apache::lonxml::debug("$expression");
+	  &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
+	}
       }
     }
   } else {
@@ -50,9 +52,42 @@ sub end_caparesponse {
 }
 
 sub start_numericalresponse {
+  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my $id = &Apache::response::start_response($parstack,$safeeval);
+  return '';
 }
 
 sub end_numericalresponse {
+  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my $result = '';
+  if ( $target eq 'grade' ) {
+    if ( defined $ENV{'form.submit'}) {
+      $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);
+	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<br>\n");
+	  &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
+	  my $expression="&caparesponse_check('".$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;
+	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].awarddetail"}=$ad;
+	  &Apache::lonxml::debug("$expression");
+	  &Apache::lonxml::debug("\n<br>result:$Apache::caparesponse::result:$result:$Apache::lonxml::curdepth<br>\n");
+	}
+      }
+    }
+  }
+  &Apache::response::end_response;
+  return $result;
 }
 
 1;