--- loncom/homework/caparesponse/caparesponse.pm	2000/10/13 14:59:31	1.10
+++ loncom/homework/caparesponse/caparesponse.pm	2000/12/08 20:53:45	1.18
@@ -11,56 +11,51 @@ sub BEGIN {
 
 $Apache::caparesponse::result='';
 sub start_caparesponse {
-  my $envkey;
-  
+  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);
+  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)=@_;
-  if ( defined $ENV{'form.'.$ENV{'form.request.prefix'}.'submit'}) {
-    $Apache::caparesponse::result='';
-    $safeeval->share('&caparesponse_capa_check_answer');
-    $safeeval->share('$Apache::caparesponse::result');
-    my $response = $ENV{'form.'.$ENV{'form.request.prefix'}.'HWVAL'.$Apache::inputtags::curvalue};
-    #Apache::lonxml::debug("submitted a $response<br>\n");
-    #Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
-    my $expression="caparesponse_check $response $$parstack[$#$parstack];";
-    #&Apache::run::run($expression,$safeeval);
-    
-    #&Apache::lonxml::debug("\n<br>result:$Apache::caparesponse::result:<br>\n");
-    my $args ='';
-    if ( $#$parstack > -1 ) {
-      $args=$$parstack[$#$parstack];
-    }
-    my $answer = &Apache::run::run("{$args;".'return $answer}',$safeeval);
-    if ( $answer == 1.0 * $answer ) {
-      my $tol = &Apache::run::run("{$args;".'return $tol}',$safeeval);
-      my $format = &Apache::run::run("{$args;".'return $format}',$safeeval);
-      my $formatedanswer = sprintf('%.'.$format,$answer);
-      my $difference = abs($answer - $formatedanswer);
-      my $studiff = abs($answer - $response);
-      if ( $difference > $studiff ) {
-	return "Correct, Computer had $answer<br></br>";
-      } else {
-	return "Incorrect, Computer had $answer<br></br>";
-      }
-    } else {  
-      if ( $answer eq $response ) {
-	return "Correct, Computer had $answer<br></br>";
-      } else {
-	return "Incorrect, Computer had $answer<br></br>";
+  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::curvalue};
+      if ( $response =~ /[^\s]/) {
+	$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");
       }
     }
   } 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");
-  return '';
+  pop @Apache::inputtags::response;
+  return $result;
 }
 
 1;