--- loncom/homework/radiobuttonresponse.pm	2005/06/27 21:51:29	1.103
+++ loncom/homework/radiobuttonresponse.pm	2006/03/27 21:18:16	1.106
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.103 2005/06/27 21:51:29 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.106 2006/03/27 21:18:16 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -234,7 +234,10 @@ sub displayallfoils {
     my ($direction)=@_;
     my $result;
     &Apache::lonxml::debug("survey style display");
-    my @names = @{ $Apache::response::foilgroup{'names'} };
+    my @names;
+    if ( $Apache::response::foilgroup{'names'} ) {
+	@names= @{ $Apache::response::foilgroup{'names'} };
+    }
     my $temp=0;
     my $id=$Apache::inputtags::response['-1'];
     my $part=$Apache::inputtags::part;
@@ -291,7 +294,7 @@ sub whichfoils {
     my ($truecnt,$falsecnt) = &getfoilcounts();
     my $count=0;
     # we will add in 1 of the true statements
-    if (($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; }
+    if ( $max>0 && ($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; $max=$count; }
     my $answer=int(&Math::Random::random_uniform() * ($count));
     &Apache::lonxml::debug("Count is $count, $answer is $answer");
     my @names;
@@ -507,7 +510,10 @@ sub displayfoils {
 }
 
 sub displayallanswers {
-    my @names = @{ $Apache::response::foilgroup{'names'} };
+    my @names;
+    if ( $Apache::response::foilgroup{'names'} ) {
+	@names= @{ $Apache::response::foilgroup{'names'} };
+    }
   
     my $result=&Apache::response::answer_header('radiobuttonresponse');
     foreach my $name (@names) {
@@ -522,10 +528,15 @@ sub displayanswers {
     my ($max,$randomize)=@_;
     my ($answer,@whichopt) = &whichfoils($max,$randomize);
     my $result=&Apache::response::answer_header('radiobuttonresponse');
+    if ($Apache::lonhomework::type eq 'exam') {
+	my $correct = ('A'..'Z')[$answer];
+	$result.=&Apache::response::answer_part('radiobuttonresponse',
+						$correct);
+    }
     foreach my $name (@whichopt) {
 	$result.=&Apache::response::answer_part('radiobuttonresponse',
-						$Apache::response::foilgroup{$name.'.value'})
-	}
+						$Apache::response::foilgroup{$name.'.value'});
+    }
     $result.=&Apache::response::answer_footer('radiobuttonresponse');
     return $result;
 }