--- loncom/homework/radiobuttonresponse.pm	2003/10/27 18:26:15	1.77
+++ loncom/homework/radiobuttonresponse.pm	2003/10/27 19:27:09	1.78
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.77 2003/10/27 18:26:15 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.78 2003/10/27 19:27:09 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,7 +25,6 @@
 #
 # http://www.lon-capa.org/
 #
-# 2/21 Guy
 
 package Apache::radiobuttonresponse;
 use strict;
@@ -74,7 +73,7 @@ sub start_radiobuttonresponse {
       }
       $result .= '\begin{enumerate}';
   } elsif ($target eq 'analyze') {
-      my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+      my $part_id="$Apache::inputtags::part.$id";
       push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
   }
   return $result;
@@ -175,16 +174,8 @@ sub end_foilgroup {
       } elsif ( $target eq 'grade') {
 	&grade_response($max,$randomize);
       }  elsif ( $target eq 'analyze') {
-	  my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
-	  foreach my $name (@{ $Apache::response::foilgroup{'names'} }) {
-	      if (defined($Apache::lonhomework::analyze{"$part_id.foil.value.$name"})) { next; }
-	      push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },$name);
-	      $Apache::lonhomework::analyze{"$part_id.foil.value.$name"} =
-		  $Apache::response::foilgroup{"$name.value"};
-	      $Apache::lonhomework::analyze{"$part_id.foil.text.$name"} =
-		  $Apache::response::foilgroup{"$name.text"};
-	  }
-	  push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} },&whichfoils($max,$randomize));
+	  my @shown = &whichfoils($max,$randomize);
+	  &Apache::response::analyze_store_foilgroup(\@shown,['text','value']);
       }
     }
   }
@@ -468,39 +459,12 @@ sub end_conceptgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::radiobuttonresponse::conceptgroup=0;
   my $result;
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'  || $target eq 'tex' || $target eq 'analyze') {
-    if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
-      my @names = @{ $Apache::response::conceptgroup{'names'} };
-      my $pick=int(&Math::Random::random_uniform() * ($#names+1));
-      my $name=$names[$pick];
-      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"};
-      $Apache::response::foilgroup{"$name.location"} = $Apache::response::conceptgroup{"$name.location"};
-      my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
-      $Apache::response::foilgroup{"$name.concept"} = $concept;
-      &Apache::lonxml::debug("Selecting $name in $concept");
-      my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
-      push(@{ $Apache::hint::radiobutton{"$part_id.concepts"} },$concept);
-      $Apache::hint::radiobutton{"$part_id.concept.$concept"}=
-	  $Apache::response::conceptgroup{'names'};
-      if ($target eq 'analyze') {
-	  push (@{ $Apache::lonhomework::analyze{"$part_id.concepts"} },
-		$concept);
-	  $Apache::lonhomework::analyze{"$part_id.concept.$concept"}=
-	      $Apache::response::conceptgroup{'names'};
-	  foreach my $name (@{ $Apache::response::conceptgroup{'names'} }) {
-	      push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },
-		    $name);
-	      $Apache::lonhomework::analyze{"$part_id.foil.value.$name"} =
-		  $Apache::response::conceptgroup{"$name.value"};
-	      $Apache::lonhomework::analyze{"$part_id.foil.text.$name"} =
-		  $Apache::response::conceptgroup{"$name.text"};
-	      $Apache::lonhomework::analyze{"$part_id.foil.location.$name"} =
-		  $Apache::response::conceptgroup{"$name.location"};
-	  }
-      }
-    }
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'  ||
+      $target eq 'tex' || $target eq 'analyze') {
+      &Apache::response::pick_foil_for_concept($target,
+					       ['value','text','location'],
+					       \%Apache::hint::radiobutton,
+					       $parstack,$safeeval);
   } elsif ($target eq 'edit') {
     $result=&Apache::edit::end_table();
   }