--- loncom/homework/radiobuttonresponse.pm 2001/01/12 01:07:13 1.5
+++ loncom/homework/radiobuttonresponse.pm 2001/01/15 21:44:21 1.8
@@ -26,6 +26,7 @@ sub end_radiobuttonresponse {
%Apache::response::foilgroup={};
sub start_foilgroup {
%Apache::response::foilgroup={};
+ return '';
}
sub setrandomnumber {
@@ -41,26 +42,31 @@ sub setrandomnumber {
#FIXME needs to stablely do random picks
sub end_foilgroup {
my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
- my $name;
+
my $result;
- &setrandomnumber();
- my $rrargs ='';
- if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; }
- my $max = &Apache::run::run("{$rrargs;".'return $max}',$safeeval);
- my $answer = int(rand $max);
- if ($target eq 'web') {
- $result=&displayfoils($max,$answer);
- } elsif ( $target eq 'grade') {
- if ( defined $ENV{'form.submit'}) {
- my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
- if ( $response =~ /[^\s]/) {
- my $id = $Apache::inputtags::response['-1'];
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
- &Apache::lonxml::debug("submitted a $response
\n");
- if ($response == $answer) {
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';
- } else {
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='INCORRECT';
+ if ($target ne 'meta') {
+ my $name;
+ &setrandomnumber();
+ my ($truecnt,$falsecnt,$max) = &getfoilcounts($parstack,$safeeval);
+ my $count=0;
+ # we will add in 1 of the true statements
+ if (($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; }
+ my $answer = int(rand ($count));
+ &Apache::lonxml::debug("Answer is $answer, $count from $max, $falsecnt");
+ if ($target eq 'web') {
+ $result=&displayfoils($max,$answer);
+ } elsif ( $target eq 'grade') {
+ if ( defined $ENV{'form.submitted'}) {
+ my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
+ if ( $response =~ /[^\s]/) {
+ my $id = $Apache::inputtags::response['-1'];
+ $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
+ &Apache::lonxml::debug("submitted a $response
\n");
+ if ($response == $answer) {
+ $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';
+ } else {
+ $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='INCORRECT';
+ }
}
}
}
@@ -68,6 +74,26 @@ sub end_foilgroup {
return $result;
}
+sub getfoilcounts {
+ my ($parstack,$safeeval)=@_;
+ my $rrargs ='';
+ if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; }
+ my $max = &Apache::run::run("{$rrargs;".'return $max}',$safeeval);
+ my @names = @{ $Apache::response::foilgroup{'names'} };
+ my $truecnt=0;
+ my $falsecnt=0;
+ my $name;
+
+ foreach $name (@names) {
+ if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+ $truecnt++;
+ } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
+ $falsecnt++;
+ }
+ }
+ return ($truecnt,$falsecnt,$max);
+}
+
sub displayfoils {
my ($max,$answer)=@_;
my @names = @{ $Apache::response::foilgroup{'names'} };