--- loncom/homework/radiobuttonresponse.pm	2003/06/20 04:05:13	1.72
+++ loncom/homework/radiobuttonresponse.pm	2003/10/27 18:26:15	1.77
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.72 2003/06/20 04:05:13 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.77 2003/10/27 18:26:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -73,6 +73,9 @@ sub start_radiobuttonresponse {
 	  $result .= ' \renewcommand{\labelenumi}{\roman{enumi}.}';
       }
       $result .= '\begin{enumerate}';
+  } elsif ($target eq 'analyze') {
+      my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+      push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
   }
   return $result;
 }
@@ -152,9 +155,9 @@ sub end_foilgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
   my $result;
-  if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') {
+  if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {
     my $style = $Apache::lonhomework::type;
-    if ( $style eq 'survey' ) {
+    if ( $style eq 'survey'  && $target ne 'analyze') {
       if ($target eq 'web' || $target eq 'answer' || $target eq 'tex') {
 	$result=&displayallfoils();
       } elsif ( $target eq 'grade' ) {
@@ -171,6 +174,17 @@ sub end_foilgroup {
 	$result=&displayanswers($max,$randomize);
       } 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));
       }
     }
   }
@@ -205,7 +219,7 @@ sub displayallfoils {
   my $part=$Apache::inputtags::part;
   my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
   my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
-  if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/)  || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {
+  if (&Apache::response::show_answer() ) {
     foreach my $name (@names) {
       if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
 	$result.="<br />".$Apache::response::foilgroup{$name.'.value'};
@@ -371,9 +385,8 @@ sub displayfoils {
   my ($answer,@whichfoils)=&whichfoils($max,$randomize);
   my $part=$Apache::inputtags::part;
   my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
-  my $status=$Apache::inputtags::status[-1];
   if ( ($target ne 'tex') &&
-       (($solved =~ /^correct/) || ($status eq  'SHOW_ANSWER')) ) {
+       &Apache::response::show_answer() ) {
     foreach my $name (@whichfoils) {
       if ($target ne 'tex') {
 	  $result.="<br />";
@@ -455,7 +468,7 @@ 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') {
+  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));
@@ -471,6 +484,22 @@ sub end_conceptgroup {
       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"};
+	  }
+      }
     }
   } elsif ($target eq 'edit') {
     $result=&Apache::edit::end_table();
@@ -486,7 +515,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);
@@ -511,8 +540,10 @@ sub start_foil {
 sub end_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $text='';
-  if ($target eq 'web' || $target eq 'tex') { $text=&Apache::lonxml::endredirection; }
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'  || $target eq 'tex') {
+  if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
+      $text=&Apache::lonxml::endredirection;
+  }
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'  || $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);