--- loncom/homework/hint.pm	2001/01/04 22:52:03	1.3
+++ loncom/homework/hint.pm	2001/01/22 19:58:09	1.6
@@ -2,6 +2,7 @@ package Apache::hinttags;
 
 use strict;
 use Apache::lonnet;
+use capa;
 
 sub BEGIN {
   &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint'));
@@ -21,7 +22,7 @@ sub start_hintgroup {
     my $hinttries=&Apache::lonnet::EXT("resource.$id.hinttries");
     if ( $hinttries eq '') { $hinttries = 1; }
     &Apache::lonxml::debug("found :$id:$numtries:$hinttries:");
-    if ( $numtries > $hinttries ) {
+    if ( $numtries >= $hinttries ) {
       $skiptoend='0'; 
       if ($target eq 'web') {$result='<table bgcolor="#dddddd"><tr><td>';}
     }	
@@ -44,7 +45,7 @@ sub end_hintgroup {
     my $hinttries=&Apache::lonnet::EXT("resource.$id.hinttries");
     if ( $hinttries eq '') { $hinttries = 1; }
     &Apache::lonxml::debug("found :$id:$numtries:$hinttries:");
-    if ( $numtries > $hinttries ) {
+    if ( $numtries >= $hinttries ) {
       if ($target eq 'web') {$result='</td></tr></table>';}
     }	
   }
@@ -61,9 +62,10 @@ sub end_numericalhint {
   my $result;
   if ($target ne 'meta' && $target ne 'grade') {
     my $args ='';
+    $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
     my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
-    my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};
+    my $response = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};
     &Apache::lonxml::debug("hintgroup is using $response<br>\n");
     my $expression="&caparesponse_check_list('".$response."','".
       $$parstack[$#$parstack].
@@ -71,10 +73,10 @@ sub end_numericalhint {
 	';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.
 	  "');";
     $result = &Apache::run::run($expression,$safeeval);
+    &Apache::lonxml::debug("$expression:result:$result:$Apache::lonxml::curdepth");
     my ($awards) = split /:/ , $result;
     my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
     if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') { push (@Apache::hint::which,$name); }
-    &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
     $result='';
   }
   return $result;
@@ -82,10 +84,10 @@ sub end_numericalhint {
 
 # a part shows if it is on, if no specific parts are on, then default shows
 sub start_hintpart {
-  return '';
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
 
   my $show ='0';
+
   if ($target ne 'meta' && $target ne 'grade') {
     my $args ='';
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
@@ -93,13 +95,13 @@ sub start_hintpart {
     if ( $on eq 'default' && $#Apache::hint::which == '-1') {
     } else {
       my $which;
-      foreeach $which (@Apache::hint::which) { if ($which eq $name) { $show = 1; last } }
+      foreach $which (@Apache::hint::which) { if ($which eq $on) { $show = 1; last } }
     }
     if (!$show) {
-      &Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
+      &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);
     }
   } else {
-    &Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
+    &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);
   }
   return '';
 }