--- loncom/homework/hint.pm 2005/04/07 06:56:21 1.59 +++ loncom/homework/hint.pm 2005/12/01 18:46:31 1.61 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # implements the tags that control the hints # -# $Id: hint.pm,v 1.59 2005/04/07 06:56:21 albertel Exp $ +# $Id: hint.pm,v 1.61 2005/12/01 18:46:31 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -57,7 +57,7 @@ sub start_hintgroup { if ( ($showoncorrect ne 'yes' && &Apache::response::show_answer()) || ( $numtries < $hinttries) ) { &Apache::lonxml::debug("Grabbin all"); - &Apache::lonxml::get_all_text("/hintgroup",$parser); + &Apache::lonxml::get_all_text("/hintgroup",$parser,$style); } &Apache::lonxml::startredirection; } elsif ($target eq 'tex') { @@ -161,9 +161,9 @@ sub end_numericalhint { my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); &Apache::response::setup_params('numericalhint',$safeeval); my $partid=$Apache::inputtags::part; - my $id=$Apache::inputtags::response['-1']; + my $id=$Apache::inputtags::hint[-1]; #id submissions occured under - my $submitid=$Apache::inputtags::response['-2']; + my $submitid=$Apache::inputtags::response[-1]; my $response = $Apache::lonhomework::history{ "resource.$partid.$submitid.submission"}; &Apache::lonxml::debug("hintgroup is using $response
\n"); @@ -255,9 +255,9 @@ sub end_stringhint { my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); &Apache::response::setup_params('stringhint',$safeeval); my $partid=$Apache::inputtags::part; - my $id=$Apache::inputtags::response['-1']; + my $id=$Apache::inputtags::hint[-1]; #id submissions occured under - my $submitid=$Apache::inputtags::response['-2']; + my $submitid=$Apache::inputtags::response[-1]; my $response = $Apache::lonhomework::history{ "resource.$partid.$submitid.submission"}; &Apache::lonxml::debug("hintgroup is using $response
\n"); @@ -322,10 +322,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); + &Apache::lonxml::get_all_text("/hintpart",$parser,$style); } } elsif ($target eq 'grade') { - &Apache::lonxml::get_all_text("/hintpart",$parser); + &Apache::lonxml::get_all_text("/hintpart",$parser,$style); } elsif ($target eq 'edit') { $result.= &Apache::edit::tag_start($target,$token); $result.= &Apache::edit::text_arg('On:','on',$token); @@ -380,7 +380,7 @@ sub end_optionhint { my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); my $partid=$Apache::inputtags::part; #id submissions occured under - my $submitid=$Apache::inputtags::response['-2']; + my $submitid=$Apache::inputtags::response[-1]; my $part_id="$partid.$submitid"; my %answer; my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval); @@ -459,7 +459,7 @@ sub end_radiobuttonhint { eval('@answer ='.$answer); my $partid=$Apache::inputtags::part; #id submissions occured under - my $submitid=$Apache::inputtags::response['-2']; + my $submitid=$Apache::inputtags::response[-1]; my $part_id="$partid.$submitid"; my $response = $Apache::lonhomework::history{ "resource.$part_id.submission"};