--- loncom/homework/optionresponse.pm	2001/02/22 00:49:03	1.4
+++ loncom/homework/optionresponse.pm	2001/05/04 21:19:37	1.6
@@ -3,6 +3,7 @@
 # 2/21 Guy
 package Apache::optionresponse;
 use strict;
+use Apache::response;
 
 sub BEGIN {
   &Apache::lonxml::register('Apache::optionresponse',('optionresponse'));
@@ -24,16 +25,8 @@ sub end_optionresponse {
 %Apache::response::foilgroup={};
 sub start_foilgroup {
   %Apache::response::foilgroup={};
-  return '';
-}
-
-sub setrandomnumber {
-  my $rndseed=&Apache::lonnet::rndseed();
-  $rndseed=unpack("%32i",$rndseed);
-  $rndseed=$rndseed
-    +&Apache::lonnet::numval($Apache::inputtags::part)
-      +&Apache::lonnet::numval($Apache::inputtags::response['-1']);
-  srand($rndseed);
+  $Apache::optionresponse::conceptgroup=0;  
+  &Apache::response::setrandomnumber();
   return '';
 }
 
@@ -43,7 +36,6 @@ sub end_foilgroup {
   my $result;
   if ($target ne 'meta') {
     my $name;
-    &setrandomnumber();
     my ($count,$max) = &getfoilcounts($parstack,$safeeval);
     if ($count>$max) { $count=$max } 
     &Apache::lonxml::debug("Count is $count from $max");
@@ -97,9 +89,9 @@ sub whichfoils {
   my ($max)=@_;
   my @names = @{ $Apache::response::foilgroup{'names'} };
   my @whichopt =();
-  while ((($#whichopt+1) < $max) && ($#names > -1)) {
+  while ((($#whichopt) < $max) && ($#names > -1)) {
     my $aopt=int rand $#names;
-    &Apache::lonxml::debug("From $#names elms, picking $aopt");
+    &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
     $aopt=splice(@names,$aopt,1);
     &Apache::lonxml::debug("Picked $aopt");
     push (@whichopt,$aopt);
@@ -137,10 +129,30 @@ sub displayfoils {
   return $result."<br />";
 }
 
+
 sub start_conceptgroup {
+  $Apache::optionresponse::conceptgroup=1;  
+  %Apache::response::conceptgroup={};
+  return '';
 }
 
 sub end_conceptgroup {
+  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  $Apache::optionresponse::conceptgroup=0;  
+  if ($target eq 'web' || $target eq 'grade') {
+    my @names = @{ $Apache::response::conceptgroup{'names'} };
+    my $pick=int rand $#names+1;
+    my $name=$names[$pick];
+    push @{ $Apache::response::foilgroup{'names'} }, $name;
+    $Apache::response::foilgroup{"$name.value"} =  $Apache::response::conceptgroup{"$name.value"};
+    $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};
+    my $args;
+    if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
+    my $concept = &Apache::run::run("{$args;".'return $concept}',$safeeval);
+    $Apache::response::foilgroup{"$name.concept"} = $concept;
+    &Apache::lonxml::debug("Selecting $name in $concept");
+  }
+  return '';
 }
 
 sub start_foil {
@@ -159,11 +171,25 @@ sub end_foil {
     my $value = &Apache::run::run("{$args;".'return $value}',$safeeval);
     if ($value ne 'unused') {
       my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
-      push @{ $Apache::response::foilgroup{'names'} }, $name;
-      $Apache::response::foilgroup{"$name.value"} = $value;
-      $Apache::response::foilgroup{"$name.text"} = $text;
+      if ( $Apache::optionresponse::conceptgroup ) {
+	push @{ $Apache::response::conceptgroup{'names'} }, $name;
+	$Apache::response::conceptgroup{"$name.value"} = $value;
+	$Apache::response::conceptgroup{"$name.text"} = $text;	
+      } else {
+	push @{ $Apache::response::foilgroup{'names'} }, $name;
+	$Apache::response::foilgroup{"$name.value"} = $value;
+	$Apache::response::foilgroup{"$name.text"} = $text;
+      }
     }
   }
+  if ($target eq 'edit') {
+    my $args ='';
+    if ( $#$parstack > 1 ) { $args=$$parstack['-2']; }
+    my $options=&Apache::run::run("{$args;".'return $options}',$safeeval);
+    if (!$options && $#$parstack > 2 ) { $args=$$parstack['-2']; }
+    my @opt;
+    #eval '@opt ='.
+  }
   return '';
 }