--- loncom/homework/radiobuttonresponse.pm	2002/04/03 19:32:36	1.39
+++ loncom/homework/radiobuttonresponse.pm	2002/05/03 20:13:14	1.41
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.39 2002/04/03 19:32:36 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.41 2002/05/03 20:13:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -200,35 +200,39 @@ sub whichfoils {
 
   my @truelist;
   my @falselist;
+  my @whichfalse =();
 
   my @names;
   if ( $Apache::response::foilgroup{'names'} ) {
     @names= @{ $Apache::response::foilgroup{'names'} };
   }
-  foreach my $name (@names) {
-    #result.="<br /><b>$name</b> is <i> $Apache::response::foilgroup{$name.'.value'} </i>";
-    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("Unknown state $Apache::response::foilgroup{$name.'.value'} for $name in <foilgroup>");
+  if (&Apache::response::showallfoils()) {
+    @whichfalse=@names;
+  } else {
+    foreach my $name (@names) {
+      #result.="<br /><b>$name</b> is <i> $Apache::response::foilgroup{$name.'.value'} </i>";
+      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(&HTML::Entites::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));
+      }
     }
+    my $whichtrue = int(rand($#truelist+1));
+    &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
+    while ((($#whichfalse+1) < $max-1) && ($#falselist > -1)) {
+      &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");
+      push (@whichfalse,$afalse);
+    }
+    splice(@whichfalse,$answer,0,$truelist[$whichtrue]);
+    &Apache::lonxml::debug("the true statement is $answer");
   }
-  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)) {
-    &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");
-    push (@whichfalse,$afalse);
-  }
-  splice(@whichfalse,$answer,0,$truelist[$whichtrue]);
-  &Apache::lonxml::debug("the true statement is $answer");
   return @whichfalse;
 }
 
@@ -357,7 +361,8 @@ sub end_foil {
     if ($value ne 'unused') {
       my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
       if (!$name) { $name=$Apache::lonxml::curdepth; }
-      if ( $Apache::radiobuttonresponse::conceptgroup ) {
+      if ( $Apache::radiobuttonresponse::conceptgroup
+	   && !&Apache::response::showallfoils() ) {
 	push @{ $Apache::response::conceptgroup{'names'} }, $name;
 	$Apache::response::conceptgroup{"$name.value"} = $value;
 	$Apache::response::conceptgroup{"$name.text"} = $text;