--- loncom/homework/hint.pm 2001/01/04 22:52:03 1.3
+++ loncom/homework/hint.pm 2001/01/05 01:14:08 1.4
@@ -21,7 +21,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='
';}
}
@@ -44,7 +44,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=' |
';}
}
}
@@ -63,7 +63,7 @@ sub end_numericalhint {
my $args ='';
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
\n");
my $expression="&caparesponse_check_list('".$response."','".
$$parstack[$#$parstack].
@@ -82,10 +82,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,7 +93,7 @@ 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]);