--- loncom/homework/hint.pm	2001/02/07 00:27:32	1.7
+++ loncom/homework/hint.pm	2001/04/05 00:08:40	1.10
@@ -12,22 +12,23 @@ sub BEGIN {
 @Apache::hint::which=();
 sub start_hintgroup {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  my $skiptoend='1';
+  my $skiptoend='0';
   my $result;
   
-  if ($target ne 'meta' || $target ne 'grade') {
+  if ($target eq 'web') {
     my $id=$Apache::inputtags::part;
     my $numtries=$Apache::lonhomework::history{"resource.$id.tries"};
     if ( $numtries eq '') { $numtries = 0; }
     my $hinttries=&Apache::lonnet::EXT("resource.$id.hinttries");
     if ( $hinttries eq '') { $hinttries = 1; }
     &Apache::lonxml::debug("found :$id:$numtries:$hinttries:");
-    if ( $numtries >= $hinttries ) {
-      $skiptoend='0'; 
+    if ( $numtries <= $hinttries ) {
+      $skiptoend='1'; 
+    } else {
       if ($target eq 'web') {$result='<table bgcolor="#dddddd"><tr><td>';}
-    }	
+    }
   }
-  if ($skiptoend && $target ne 'meta') {
+  if ($skiptoend) {
     &Apache::lonxml::get_all_text("/hintgroup",$$parser[$#$parser]);
   }
   @Apache::hint::which=();
@@ -38,14 +39,14 @@ sub end_hintgroup {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   my $result;
 
-  if ($target ne 'meta' || $target ne 'grade') {
+  if ($target eq 'web') {
     my $id=$Apache::inputtags::part;
     my $numtries=$Apache::lonhomework::history{"resource.$id.tries"};
     if ( $numtries eq '') { $numtries = 0; }
     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>';}
     }	
   }
@@ -60,13 +61,13 @@ sub start_numericalhint {
 sub end_numericalhint {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   my $result;
-  if ($target ne 'meta' && $target ne 'grade') {
+  if ($target eq 'web') {
     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 $response = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};
-    &Apache::lonxml::debug("hintgroup is using $response<br>\n");
+    &Apache::lonxml::debug("hintgroup is using $response<br />\n");
     my $expression="&caparesponse_check_list('".$response."','".
       $$parstack[$#$parstack].
 	';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.
@@ -88,11 +89,13 @@ sub start_hintpart {
 
   my $show ='0';
 
-  if ($target ne 'meta' && $target ne 'grade') {
+  if ($target eq 'web') {
     my $args ='';
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
     my $on = &Apache::run::run("{$args;".'return $on}',$safeeval);
+    &Apache::lonxml::debug("hintpart sees $on and ,$#Apache::hint::which");
     if ( $on eq 'default' && $#Apache::hint::which == '-1') {
+      $show=1;
     } else {
       my $which;
       foreach $which (@Apache::hint::which) { if ($which eq $on) { $show = 1; last } }
@@ -100,7 +103,7 @@ sub start_hintpart {
     if (!$show) {
       &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);
     }
-  } else {
+  } elsif ($target eq 'grade') {
     &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);
   }
   return '';