--- loncom/homework/hint.pm 2001/02/19 20:32:36 1.8 +++ loncom/homework/hint.pm 2001/03/31 00:35:17 1.9 @@ -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' || $target eq 'grade') { 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='
';} - } + } } - if ($skiptoend && $target ne 'meta') { + if ($skiptoend) { &Apache::lonxml::get_all_text("/hintgroup",$$parser[$#$parser]); } @Apache::hint::which=(); @@ -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 '';