--- loncom/homework/caparesponse/caparesponse.pm	2000/12/01 00:44:48	1.15
+++ loncom/homework/caparesponse/caparesponse.pm	2001/01/03 00:14:47	1.23
@@ -6,55 +6,93 @@ use strict;
 use capa;
 
 sub BEGIN {
-  &Apache::lonxml::register('Apache::caparesponse',('caparesponse'));
+  &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse'));
 }
 
-$Apache::caparesponse::result='';
 sub start_caparesponse {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
-  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);
+  my $id = &Apache::response::start_response($parstack,$safeeval);
   return '';
-  #my $envkey;
-  #foreach $envkey (sort keys %ENV) {
-  #  Apache::lonxml::debug("$envkey ---- $ENV{$envkey}<br>");
-  #}
-  #Apache::lonxml::debug("\n<br>\nreal caparesponse<br>\n");
 }
 
 sub end_caparesponse {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   my $result = '';
-  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.$Apache::inputtags::part.$Apache::inputtags::response['-1']"}=$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.awarddetail.$Apache::inputtags::part.$Apache::inputtags::response['-1']"}=$ad;
-    &Apache::lonxml::debug("$expression");
-    &Apache::lonxml::debug("\n<br>result:$Apache::caparesponse::result:$result:$Apache::lonxml::curdepth<br>\n");
-    
+  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 $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.$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 {
-    #return "The correct answer is ".&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval)."\n";
+    #$result .= "The correct answer is ".&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval)."\n";
   }
   #Apache::lonxml::debug("\n<br>\nreal end caparesponse<br>\n");
-  pop @Apache::inputtags::response;
+  &Apache::response::end_response;
+  return $result;
+}
+
+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 $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.$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_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.$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;
 __END__