--- loncom/homework/optionresponse.pm	2003/10/15 19:51:29	1.84.2.2
+++ loncom/homework/optionresponse.pm	2003/10/27 19:27:09	1.93
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.84.2.2 2003/10/15 19:51:29 albertel Exp $
+# $Id: optionresponse.pm,v 1.93 2003/10/27 19:27:09 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,8 +25,6 @@
 #
 # http://www.lon-capa.org/
 #
-# 2/21 Guy
-# 01/18 Alex
 package Apache::optionresponse;
 use strict;
 use Apache::response;
@@ -63,7 +61,7 @@ sub start_optionresponse {
   } elsif ($target eq 'meta') {
     $result=&Apache::response::meta_package_write('optionresponse');
   } 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;
@@ -166,17 +164,10 @@ sub end_foilgroup {
     } elsif ( $target eq 'answer') {
       $result.=&displayanswers($max,$randomize,@opt);
     } 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.options"} },@opt);
-      push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} },&whichfoils($max,$randomize));
+	my @shown = &whichfoils($max,$randomize);
+	&Apache::response::analyze_store_foilgroup(\@shown,['text','value']);
+	my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+	push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
     } elsif ( $target eq 'grade') {
       if ( defined $ENV{'form.submitted'}) {
 	my @whichopt = &whichfoils($max,$randomize);
@@ -302,7 +293,6 @@ sub displayfoils {
   my $id=$Apache::inputtags::response[-1];
   my $break;
   my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
-  my $status=$Apache::inputtags::status[-1];
   if ( ($target ne 'tex') &&
        &Apache::response::show_answer() ) {
     my $temp=1;
@@ -441,7 +431,7 @@ sub optionlist_correction {
 
     my $texoptionlist = shift;
     if ($texoptionlist=~/<option selected/ or $texoptionlist=~/<option>[^<]+<\/option>/) {
-	$texoptionlist =~ s/<option><\/option>/\\item \[\] Choose from: /;
+	$texoptionlist =~ s/<option><\/option>/\\item \[\] Choices: /;
 	$texoptionlist =~ s/<option>/\{\\bf /g;
 	$texoptionlist =~ s/<option selected="on">/\{\\bf /g;
 	$texoptionlist =~ s/<\/option>/\},/g;
@@ -527,47 +517,13 @@ sub end_conceptgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::optionresponse::conceptgroup=0;
   my $result='';
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'
-      || $target eq 'tex' || $target eq 'analyze') {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+      $target eq 'tex' || $target eq 'analyze') {
     #if not there aren't any foils to display and thus no question
-    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.value"} =
-	$Apache::response::conceptgroup{"$name.value"};
-      $Apache::response::foilgroup{"$name.text"} =
-	$Apache::response::conceptgroup{"$name.text"};
-      $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");
-      if ($target eq 'analyze') {
-	my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
-        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"};
-	}
-      } elsif ($target eq 'web') {
-	  my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
-	  push(@{ $Apache::hint::option{"$part_id.concepts"} },
-	       $concept);
-	  $Apache::hint::option{"$part_id.concept.$concept"}=
-	      $Apache::response::conceptgroup{'names'};
-      }
-    }
+      &Apache::response::pick_foil_for_concept($target,
+					       ['value','text','location'],
+					       \%Apache::hint::option,
+					       $parstack,$safeeval);
   } elsif ($target eq 'edit') {
     $result=&Apache::edit::end_table();
   }
@@ -612,7 +568,7 @@ sub end_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $text ='';
   my $result = '';
-  if ($target eq 'web' || $target eq 'tex') { 
+  if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
       $text=&Apache::lonxml::endredirection;
       if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { $text = '\vspace*{-2 mm}\item '.$text; }
   }
@@ -632,11 +588,7 @@ sub end_foil {
 	if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
 	    $Apache::response::conceptgroup{"$name.text"} = '\vskip 4 mm $\triangleright$ '.$text;
 	} else {
-	    if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
-		$Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
-	    } else {
-		$Apache::response::conceptgroup{"$name.text"} = $text;
-	    }
+	    $Apache::response::conceptgroup{"$name.text"} = $text;
 	}
 	$Apache::response::conceptgroup{"$name.location"} = $location;
       } else {
@@ -645,11 +597,7 @@ sub end_foil {
 	if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
 	    $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
 	} else {
-	    if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
-		$Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;
-	    } else {
-		$Apache::response::foilgroup{"$name.text"} = $text;
-	    }
+	    $Apache::response::foilgroup{"$name.text"} = $text;
 	}
 	$Apache::response::foilgroup{"$name.location"} = $location;
       }