--- loncom/homework/radiobuttonresponse.pm 2001/04/23 17:15:13 1.15
+++ loncom/homework/radiobuttonresponse.pm 2001/05/31 22:34:33 1.18
@@ -12,7 +12,7 @@ sub BEGIN {
sub start_radiobuttonresponse {
my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
#when in a radiobutton response use these
- &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil'));
+ &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
my $id = &Apache::response::start_response($parstack,$safeeval);
return '';
}
@@ -25,18 +25,8 @@ sub end_radiobuttonresponse {
%Apache::response::foilgroup={};
sub start_foilgroup {
%Apache::response::foilgroup={};
- $Apache::optionresponse::conceptgroup=0;
- &setrandomnumber();
- return '';
-}
-
-sub setrandomnumber {
- my $rndseed=&Apache::lonnet::rndseed();
- $rndseed=unpack("%32i",$rndseed);
- $rndseed=$rndseed
- +&Apache::lonnet::numval($Apache::inputtags::part)
- +&Apache::lonnet::numval($Apache::inputtags::response['-1']);
- srand($rndseed);
+ $Apache::radiobuttonresponse::conceptgroup=0;
+ &Apache::response::setrandomnumber();
return '';
}
@@ -129,7 +119,7 @@ sub displayallfoils {
foreach my $name (@names) {
if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
$result.="
\n";
$temp++;
}
@@ -156,11 +146,12 @@ sub displayfoils {
&Apache::lonxml::error("Unknown state $Apache::response::foilgroup{$name.'.value'} for $name in ");
}
}
- my $whichtrue = rand $#truelist;
+ my $whichtrue = int(rand($#truelist+1));
&Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
my @whichfalse =();
while ((($#whichfalse+1) < $max) && ($#falselist > -1)) {
- my $afalse=rand $#falselist;
+ &Apache::lonxml::debug("Have $#whichfalse max is $max");
+ my $afalse=int(rand($#falselist+1));
&Apache::lonxml::debug("From $#falselist elms, picking $afalse");
$afalse=splice(@falselist,$afalse,1);
&Apache::lonxml::debug("Picked $afalse");
@@ -185,7 +176,7 @@ sub displayfoils {
my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
foreach $name (@whichfalse) {
$result.="
\n";
$temp++;
}
@@ -194,14 +185,14 @@ sub displayfoils {
}
sub start_conceptgroup {
- $Apache::optionresponse::conceptgroup=1;
+ $Apache::radiobuttonresponse::conceptgroup=1;
%Apache::response::conceptgroup={};
return '';
}
sub end_conceptgroup {
my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
- $Apache::optionresponse::conceptgroup=0;
+ $Apache::radiobuttonresponse::conceptgroup=0;
if ($target eq 'web' || $target eq 'grade') {
my @names = @{ $Apache::response::conceptgroup{'names'} };
my $pick=int rand $#names+1;
@@ -225,15 +216,24 @@ sub start_foil {
sub end_foil {
my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
- my $foil=&Apache::lonxml::endredirection;
+ 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 $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"} = $foil;
+ if ($value ne 'unused') {
+ my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
+ if ( $Apache::radiobuttonresponse::conceptgroup ) {
+ push @{ $Apache::response::conceptgroup{'names'} }, $name;
+ $Apache::response::conceptgroup{"$name.value"} = $value;
+ $Apache::response::conceptgroup{"$name.text"} = $text;
+ } else {
+ push @{ $Apache::response::foilgroup{'names'} }, $name;
+ $Apache::response::foilgroup{"$name.value"} = $value;
+ $Apache::response::foilgroup{"$name.text"} = $text;
+ }
+ }
}
return '';
}