--- loncom/homework/optionresponse.pm	2002/01/25 16:12:18	1.33
+++ loncom/homework/optionresponse.pm	2002/03/29 18:32:46	1.34
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.33 2002/01/25 16:12:18 albertel Exp $
+# $Id: optionresponse.pm,v 1.34 2002/03/29 18:32:46 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,14 +53,15 @@ sub start_optionresponse {
     $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
         &Apache::edit::end_row().
 	&Apache::edit::start_spanning_row();
-  }
-  if ($target eq 'modified') {
+  } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,
 						 $safeeval,'max');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
-  }
-  if ($target eq 'meta') {
+  } 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]";
+    push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
   }
 #  if ($target eq 'tex') {$result .= '\begin{itemize}';}
   return $result;
@@ -159,6 +160,16 @@ sub end_foilgroup {
       $result.=&displayfoils($target,$count,@opt);
     } elsif ( $target eq 'answer') {
       $result.=&displayanswers($count,@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::conceptgroup{"$name.value"};
+	$Apache::lonhomework::analyze{"$part_id.foil.text.$name"} =
+	  $Apache::response::conceptgroup{"$name.text"};
+      }
     } elsif ( $target eq 'grade') {
       if ( defined $ENV{'form.submitted'}) {
 	my @whichopt = &whichfoils($count);
@@ -171,8 +182,8 @@ sub end_foilgroup {
 	  my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
 	  $responsehash{$name}=$response;
 	  if ( $response =~ /[^\s]/) {
-	    &Apache::lonxml::debug("submitted a $response<br />\n");
 	    my $value=$Apache::response::foilgroup{$name.'.value'};
+	    &Apache::lonxml::debug("submitted a $response for $value<br />\n");
 	    if ($value eq $response) {$right++;} else {$wrong++;}
 	  } else {
 	    $ignored++;
@@ -342,9 +353,21 @@ sub end_conceptgroup {
       $Apache::response::foilgroup{"$name.concept"} = $concept;
       &Apache::lonxml::debug("Selecting $name in $concept");
     }
-  }
-  if ($target eq 'edit') {
+  } elsif ($target eq 'edit') {
     $result=&Apache::edit::end_table();
+  } elsif ($target eq 'analyze') {
+    my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+    my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
+    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"};
+    }
   }
   return $result;
 }
@@ -357,7 +380,7 @@ sub insert_conceptgroup {
 sub start_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
-  if ($target eq 'web' || $target eq 'tex') {
+  if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze' ) {
     &Apache::lonxml::startredirection;
   } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token,"Foil");
@@ -384,7 +407,7 @@ sub end_foil {
       $text=&Apache::lonxml::endredirection; 
   }
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' 
-      || $target eq 'tex') {
+      || $target eq 'tex' || $target eq 'analyze') {
     my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
     if ($value ne 'unused') {
       my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);