--- loncom/homework/caparesponse/caparesponse.pm	2000/10/12 21:51:40	1.8
+++ loncom/homework/caparesponse/caparesponse.pm	2000/11/22 00:04:34	1.13
@@ -11,32 +11,43 @@ 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);
+  push (@Apache::inputtags::response,$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'}) {
+  my $result = '';
+  if ( defined $ENV{'form.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);
+    $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");
     
-    &Apache::lonxml::debug("\n<br>result:$Apache::caparesponse::result:<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 '';
 }