--- loncom/homework/radiobuttonresponse.pm 2001/01/08 21:52:04 1.2 +++ loncom/homework/radiobuttonresponse.pm 2001/01/08 22:06:48 1.3 @@ -7,10 +7,12 @@ package Apache::radiobuttonresponse; use strict; sub BEGIN { - &Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse','foilgroup','foil')); + &Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse')); } sub start_radiobuttonresponse { + #when in a radiobutton response use these + &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil')); } sub end_radiobuttonresponse { @@ -25,9 +27,21 @@ sub end_foilgroup { my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; my $name; my $result; - foreach $name ($Apache::response::foilgroup{'names'}) { + my @names = @{ $Apache::response::foilgroup{'names'} }; + my @truelist; + my @falselist; + foreach $name (@names) { $result.="
$name is $Apache::response::foilgroup{$name.'.value'} "; + if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { + push (@truelist,$name); + } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') { + push (@falselist,$name); + } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') { + } else { + &Apache::lonxml::error("Unknow state $Apache::response::foilgroup{$name.'.value'} for $name in "); + } } + my $whichtrue = rand $#truelist; return $result; } @@ -37,13 +51,16 @@ sub start_foil { sub end_foil { my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; - my $args =''; - if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } - my $name = &Apache::run::run("{$args;".'return $name}',$safeeval); - push @{ $Apache::response::foilgroup{'names'} }, $name; - my $value = &Apache::run::run("{$args;".'return $value}',$safeeval); - $Apache::response::foilgroup{"$name.value"} = $value; - $Apache::response::foilgroup{"$name.text"} = $Apache::lonxml::outputstack; + if ($target eq 'web' || $target eq 'grade') { + my $args =''; + if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } + my $name = &Apache::run::run("{$args;".'return $name}',$safeeval); + push @{ $Apache::response::foilgroup{'names'} }, $name; + my $value = &Apache::run::run("{$args;".'return $value}',$safeeval); + $Apache::response::foilgroup{"$name.value"} = $value; + $Apache::response::foilgroup{"$name.text"} = $Apache::lonxml::outputstack; + } + $Apache::lonxml::redirection--; return ''; }