--- loncom/homework/caparesponse/caparesponse.pm	2000/09/13 20:36:47	1.4
+++ loncom/homework/caparesponse/caparesponse.pm	2000/11/21 18:42:12	1.12
@@ -9,12 +9,46 @@ sub BEGIN {
   &Apache::lonxml::register('Apache::caparesponse',('caparesponse'));
 }
 
+$Apache::caparesponse::result='';
 sub start_caparesponse {
-  print "real caparesponse<br>";
+  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my $args ='';
+  if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
+  my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);
+  push (@Apache::inputtags::response,$id);
+
+  #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 {
-  print "real end caparesponse<br>";
+  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my $result = '';
+  if ( defined $ENV{'form.'.$ENV{'form.request.prefix'}.'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.part$Apache::inputtags::part['-1'].response$Apache::inputtags::response['-1']"}=$response;
+    &Apache::lonxml::debug("submitted a $response<br>\n");
+    &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
+    my $tol=$Apache::inputtags::{'tol'};
+    my $expression="&caparesponse_check('".$response."','".
+      $$parstack[$#$parstack].
+	';my $tol='.$Apache::inputtags::{'tol'}.
+	  "');";
+    $result = &Apache::run::run($expression,$safeeval);
+    
+    &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";
+  }
+  #Apache::lonxml::debug("\n<br>\nreal end caparesponse<br>\n");
+  pop @Apache::inputtags::part;
+  return '';
 }
 
 1;