--- loncom/homework/hint.pm 2002/11/25 21:36:42 1.33
+++ loncom/homework/hint.pm 2003/02/13 23:48:27 1.35
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# implements the tags that control the hints
#
-# $Id: hint.pm,v 1.33 2002/11/25 21:36:42 albertel Exp $
+# $Id: hint.pm,v 1.35 2003/02/13 23:48:27 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -56,7 +56,7 @@ sub start_hintgroup {
if ($target eq 'web') {$result='
';}
}
if ($skiptoend) {
- &Apache::lonxml::get_all_text("/hintgroup",$$parser[$#$parser]);
+ &Apache::lonxml::get_all_text("/hintgroup",$parser);
}
} elsif ($target eq 'tex') {
$result .= '\keephidden{';
@@ -162,7 +162,7 @@ sub end_numericalhint {
if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') { push (@Apache::hint::which,$name); }
$result='';
} elsif ($target eq 'meta') {
- $result=&Apache::response::meta_package_write('numericalhint');
+ $result=&Apache::response::meta_package_write($token->[1]);
} elsif ($target eq 'edit') {
$result.=' |
'.&Apache::edit::end_table;
}
@@ -171,33 +171,19 @@ sub end_numericalhint {
}
sub start_stringhint {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- my $result;
- if ($target eq 'meta') {
- $result=&Apache::response::meta_package_write('stringhint');
- } else {
- $result.=&start_numericalhint(@_);
- }
- return $result;
+ return &start_numericalhint(@_);
}
sub end_stringhint {
- return end_numericalhint(@_);
+ return &end_numericalhint(@_);
}
sub start_formulahint {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- my $result;
- if ($target eq 'meta') {
- $result=&Apache::response::meta_package_write('formulahint');
- } else {
- $result.=&start_numericalhint(@_);
- }
- return $result;
+ return &start_numericalhint(@_);
}
sub end_formulahint {
- return end_numericalhint(@_);
+ return end_numericalhint(@_);
}
# a part shows if it is on, if no specific parts are on, then default shows
@@ -216,10 +202,10 @@ sub start_hintpart {
foreach $which (@Apache::hint::which) { if ($which eq $on) { $show = 1; last } }
}
if (!$show) {
- &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);
+ &Apache::lonxml::get_all_text("/hintpart",$parser);
}
} elsif ($target eq 'grade') {
- &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);
+ &Apache::lonxml::get_all_text("/hintpart",$parser);
} elsif ($target eq 'edit') {
$result.= &Apache::edit::tag_start($target,$token);
$result.= &Apache::edit::text_arg('On:','on',$token);