--- loncom/homework/radiobuttonresponse.pm	2011/09/16 23:14:28	1.148.2.1
+++ loncom/homework/radiobuttonresponse.pm	2011/06/07 17:27:37	1.149
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.148.2.1 2011/09/16 23:14:28 raeburn Exp $
+# $Id: radiobuttonresponse.pm,v 1.149 2011/06/07 17:27:37 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -555,13 +555,8 @@ sub whichfoils {
 	    $dosplice=0;
 	} else {
 	    if ($topcount>0 || $bottomcount>0) {
-                my $inc = 1;
-                if (($bottomcount > 0) && ($Apache::lonhomework::type ne 'exam')) {
-                    $inc = 2;
-                }
-                $answer=int(&Math::Random::random_uniform() * ($#whichfalse+$inc))
-                        + $topcount;
-
+		$answer = int(&Math::Random::random_uniform() * ($#whichfalse+1))
+		    + $topcount;
 	    }
 	}
 	&Apache::lonxml::debug("Answer now wants $answer");
@@ -820,6 +815,9 @@ sub end_foil {
 		&Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.'));
 		$name=$Apache::lonxml::curdepth;
 	    }
+            if ($name eq "0") {
+                &Apache::lonxml::error(&mt('Foil name [_1] is not supported. Please choose another name.','<b><tt>'.$name.'</tt></b>'));
+            }
 	    if (defined($Apache::response::foilnames{$name})) {
 		&Apache::lonxml::error(&mt('Foil name [_1] appears more than once. Foil names need to be unique.','<b><tt>'.$name.'</tt></b>'));
 	    }