--- loncom/homework/hint.pm 2001/04/10 22:06:59 1.11 +++ loncom/homework/hint.pm 2001/08/11 17:06:52 1.17 @@ -11,7 +11,7 @@ sub BEGIN { @Apache::hint::which=(); sub start_hintgroup { - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $skiptoend='0'; my $result; @@ -36,7 +36,7 @@ sub start_hintgroup { } sub end_hintgroup { - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; if ($target eq 'web') { @@ -55,18 +55,18 @@ sub end_hintgroup { } sub start_numericalhint { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; #do everything in end, so intervening work + &Apache::response::start_hintresponse($parstack,$safeeval); return ''; } sub end_numericalhint { - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; if ($target eq 'web') { - my $args =''; $safeeval->share_from('capa',['&caparesponse_capa_check_answer']); - if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } - my $name = &Apache::run::run("{$args;".'return $name}',$safeeval); + my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); 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."','". @@ -80,20 +80,21 @@ sub end_numericalhint { my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards); 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'); } + &Apache::response::end_hintresponse(); return $result; } # a part shows if it is on, if no specific parts are on, then default shows sub start_hintpart { - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $show ='0'; if ($target eq 'web') { - my $args =''; - if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } - my $on = &Apache::run::run("{$args;".'return $on}',$safeeval); + my $on= &Apache::lonxml::get_param('on',$parstack,$safeeval); &Apache::lonxml::debug("hintpart sees $on and ,$#Apache::hint::which"); if ( $on eq 'default' && $#Apache::hint::which == '-1') { $show=1;