--- loncom/homework/radiobuttonresponse.pm	2001/05/04 21:19:37	1.17
+++ loncom/homework/radiobuttonresponse.pm	2001/08/06 20:33:23	1.22
@@ -10,9 +10,9 @@ sub BEGIN {
 }
 
 sub start_radiobuttonresponse {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   #when in a radiobutton response use these
-  &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil'));
+  &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
   my $id = &Apache::response::start_response($parstack,$safeeval);
   return '';
 }
@@ -25,7 +25,7 @@ sub end_radiobuttonresponse {
 %Apache::response::foilgroup={};
 sub start_foilgroup {
   %Apache::response::foilgroup={};
-  $Apache::optionresponse::conceptgroup=0;
+  $Apache::radiobuttonresponse::conceptgroup=0;
   &Apache::response::setrandomnumber();
   return '';
 }
@@ -45,13 +45,11 @@ sub storesurvey {
 }
 
 sub end_foilgroup {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
   my $result;
   if ($target ne 'meta') {
-    my $rrargs ='';
-    if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; }
-    my $style = &Apache::run::run("{$rrargs;".'return $style}',$safeeval);
+    my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval,'-2');
     if ( $style eq 'survey' ) {
       if ($target eq 'web') {
 	$result=&displayallfoils();
@@ -90,9 +88,7 @@ sub end_foilgroup {
 
 sub getfoilcounts {
   my ($parstack,$safeeval)=@_;
-  my $rrargs ='';
-  if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; }
-  my $max = &Apache::run::run("{$rrargs;".'return $max}',$safeeval);
+  my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
   my @names = @{ $Apache::response::foilgroup{'names'} };
   my $truecnt=0;
   my $falsecnt=0;
@@ -146,11 +142,12 @@ sub displayfoils {
       &Apache::lonxml::error("Unknown state $Apache::response::foilgroup{$name.'.value'} for $name in <foilgroup>");
     }
   }
-  my $whichtrue = rand $#truelist;
+  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)) {
-    my $afalse=rand $#falselist;
+    &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");
@@ -184,14 +181,14 @@ sub displayfoils {
 }
 
 sub start_conceptgroup {
-  $Apache::optionresponse::conceptgroup=1;  
+  $Apache::radiobuttonresponse::conceptgroup=1;
   %Apache::response::conceptgroup={};
   return '';
 }
 
 sub end_conceptgroup {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  $Apache::optionresponse::conceptgroup=0;  
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  $Apache::radiobuttonresponse::conceptgroup=0;
   if ($target eq 'web' || $target eq 'grade') {
     my @names = @{ $Apache::response::conceptgroup{'names'} };
     my $pick=int rand $#names+1;
@@ -199,9 +196,7 @@ sub end_conceptgroup {
     push @{ $Apache::response::foilgroup{'names'} }, $name;
     $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};
     $Apache::response::foilgroup{"$name.value"} = $Apache::response::conceptgroup{"$name.value"};
-    my $args;
-    if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-    my $concept = &Apache::run::run("{$args;".'return $concept}',$safeeval);
+    my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
     $Apache::response::foilgroup{"$name.concept"} = $concept;
     &Apache::lonxml::debug("Selecting $name in $concept");
   }
@@ -214,16 +209,23 @@ sub start_foil {
 }
 
 sub end_foil {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  my $foil=&Apache::lonxml::endredirection;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $text='';
+  if ($target eq 'web') { $text=&Apache::lonxml::endredirection; }
   if ($target eq 'web' || $target eq 'grade') {
-    my $args ='';
-    if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-    my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
-    push @{ $Apache::response::foilgroup{'names'} }, $name;
-    my $value = &Apache::run::run("{$args;".'return $value}',$safeeval);
-    $Apache::response::foilgroup{"$name.value"} = $value;
-    $Apache::response::foilgroup{"$name.text"} = $foil;
+    my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
+    if ($value ne 'unused') {
+      my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+      if ( $Apache::radiobuttonresponse::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;
+      }
+    }
   }
   return '';
 }