--- loncom/homework/caparesponse/caparesponse.pm	2000/10/02 22:15:37	1.7
+++ loncom/homework/caparesponse/caparesponse.pm	2000/10/13 14:32:42	1.9
@@ -13,11 +13,11 @@ $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 {
@@ -27,14 +27,27 @@ sub end_caparesponse {
     $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>");
+    #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::run::run($expression,$safeeval);
     
-    &Apache::lonxml::debug("\n<br>result:$Apache::caparesponse::result:<br>\n");
+    #&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 eq $response ) {
+      return "Correct, Computer had $answer<br></br>";
+    } else {
+      return "Incorrect, Computer had $answer<br></br>";
+    }
+  } 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;