--- loncom/homework/optionresponse.pm	2003/04/24 15:49:46	1.76
+++ loncom/homework/optionresponse.pm	2003/05/16 20:16:18	1.77
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.76 2003/04/24 15:49:46 albertel Exp $
+# $Id: optionresponse.pm,v 1.77 2003/05/16 20:16:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -265,52 +265,10 @@ sub getfoilcounts {
 }
 
 sub whichfoils {
-  my ($max,$randomize)=@_;
-  $max = &getfoilcounts($max);
-  &Apache::lonxml::debug("randomize $randomize");
-  if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
-  my @names = @{ $Apache::response::foilgroup{'names'} };
-  my @whichopt =();
-  my (%top,@toplist,%bottom,@bottomlist);
-  if (!(&Apache::response::showallfoils() || ($randomize eq 'no'))) {
-      my $current=0;
-      foreach my $name (@names) {
-	  $current++;
-	  if ($Apache::response::foilgroup{$name.'.location'} eq 'top') {
-	      $top{$name}=$current;
-	  } elsif ($Apache::response::foilgroup{$name.'.location'} eq
-		   'bottom') {
-	      $bottom{$name}=$current;
-	  }
-      }
-  }
-  while ((($#whichopt+1) < $max) && ($#names > -1)) {
-    &Apache::lonxml::debug("Have $#whichopt max is $max");
-    my $aopt;
-    if (&Apache::response::showallfoils() || ($randomize eq 'no')) {
-      $aopt=0;
-    } else {
-      $aopt=int(&Math::Random::random_uniform() * ($#names+1));
-    }
-    &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
-    $aopt=splice(@names,$aopt,1);
-    &Apache::lonxml::debug("Picked $aopt");
-    if ($top{$aopt}) {
-	$toplist[$top{$aopt}]=$aopt;
-    } elsif ($bottom{$aopt}) {
-	$bottomlist[$bottom{$aopt}]=$aopt;
-    } else {
-	push (@whichopt,$aopt);
-    }
-  }
-  for (my $i=0;$i<=$#toplist;$i++) {
-      if ($toplist[$i]) { unshift(@whichopt,$toplist[$i]) }
-  }
-  for (my $i=0;$i<=$#bottomlist;$i++) {
-      if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) }
-  }
-
-  return @whichopt;
+    my ($max,$randomize)=@_;
+    return &Apache::response::whichorder($max,$randomize,
+					 &Apache::response::showallfoils(),
+					 \%Apache::response::foilgroup);
 }
 
 sub displayanswers {