--- loncom/homework/hint.pm 2002/10/28 23:31:48 1.30 +++ loncom/homework/hint.pm 2003/02/07 22:03:21 1.34 @@ -1,13 +1,13 @@ # The LearningOnline Network with CAPA # implements the tags that control the hints # -# $Id: hint.pm,v 1.30 2002/10/28 23:31:48 albertel Exp $ +# $Id: hint.pm,v 1.34 2003/02/07 22:03:21 albertel Exp $ # # Copyright Michigan State University Board of Trustees # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). # -# LON-CAPA is free software; you can redistribute it and/or modify +# LON-CAPA me&aree software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. @@ -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{'; @@ -123,6 +123,8 @@ sub start_numericalhint { $result = &Apache::edit::rebuild_tag($token); $result .= &Apache::edit::handle_insert(); } + } elsif ($target eq 'web') { + &Apache::response::reset_params(); } return $result; } @@ -131,6 +133,9 @@ sub end_numericalhint { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; if ($target eq 'web') { + if (!$Apache::lonxml::default_homework_loaded) { + &Apache::lonxml::default_homework_load($safeeval); + } $safeeval->share_from('capa',['&caparesponse_capa_check_answer']); my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); &Apache::response::setup_params('numericalhint'); @@ -211,10 +216,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); @@ -338,7 +343,7 @@ sub start_radiobuttonhint { return $result; } -sp;&end_radiobuttonhint { +sub end_radiobuttonhint { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; if ($target eq 'web') {