--- loncom/homework/radiobuttonresponse.pm 2001/05/31 22:34:33 1.18 +++ loncom/homework/radiobuttonresponse.pm 2001/06/01 16:00:42 1.19 @@ -49,9 +49,7 @@ sub end_foilgroup { my $result; if ($target ne 'meta') { - my $rrargs =''; - if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; } - my $style = &Apache::run::run("{$rrargs;".'return $style}',$safeeval); + my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval,'-2'); if ( $style eq 'survey' ) { if ($target eq 'web') { $result=&displayallfoils(); @@ -90,9 +88,7 @@ sub end_foilgroup { sub getfoilcounts { my ($parstack,$safeeval)=@_; - my $rrargs =''; - if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; } - my $max = &Apache::run::run("{$rrargs;".'return $max}',$safeeval); + my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); my @names = @{ $Apache::response::foilgroup{'names'} }; my $truecnt=0; my $falsecnt=0; @@ -200,9 +196,7 @@ sub end_conceptgroup { push @{ $Apache::response::foilgroup{'names'} }, $name; $Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"}; $Apache::response::foilgroup{"$name.value"} = $Apache::response::conceptgroup{"$name.value"}; - my $args; - if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } - my $concept = &Apache::run::run("{$args;".'return $concept}',$safeeval); + my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval); $Apache::response::foilgroup{"$name.concept"} = $concept; &Apache::lonxml::debug("Selecting $name in $concept"); } @@ -219,11 +213,9 @@ sub end_foil { my $text=''; if ($target eq 'web') { $text=&Apache::lonxml::endredirection; } if ($target eq 'web' || $target eq 'grade') { - my $args =''; - if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } - my $value = &Apache::run::run("{$args;".'return $value}',$safeeval); + my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); if ($value ne 'unused') { - my $name = &Apache::run::run("{$args;".'return $name}',$safeeval); + my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); if ( $Apache::radiobuttonresponse::conceptgroup ) { push @{ $Apache::response::conceptgroup{'names'} }, $name; $Apache::response::conceptgroup{"$name.value"} = $value;