--- loncom/homework/caparesponse/caparesponse.pm	2000/10/02 22:15:37	1.7
+++ loncom/homework/caparesponse/caparesponse.pm	2000/10/25 22:02:53	1.11
@@ -13,28 +13,30 @@ $Apache::caparesponse::result='';
 sub start_caparesponse {
   my $envkey;
   
-  foreach $envkey (sort keys %ENV) {
-    Apache::lonxml::debug("$envkey ---- $ENV{$envkey}<br>");
-  }
+  #foreach $envkey (sort keys %ENV) {
+  #  Apache::lonxml::debug("$envkey ---- $ENV{$envkey}<br>");
+  #}
   
-  Apache::lonxml::debug("\n<br>\nreal caparesponse<br>\n");
+  #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');
+    $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
     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("submitted a $response<br>\n");
+    &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
+    my $expression="&caparesponse_check('".$response."','".$$parstack[$#$parstack]."');";
+    my $result = &Apache::run::run($expression,$safeeval);
     
-    &Apache::lonxml::debug("\n<br>result:$Apache::caparesponse::result:<br>\n");
+    &Apache::lonxml::debug("\n<br>result:$Apache::caparesponse::result:$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");
+  return '';
 }
 
 1;