--- loncom/homework/caparesponse/caparesponse.pm	2002/10/04 06:35:28	1.64
+++ loncom/homework/caparesponse/caparesponse.pm	2002/10/14 20:37:27	1.65
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.64 2002/10/04 06:35:28 albertel Exp $
+# $Id: caparesponse.pm,v 1.65 2002/10/14 20:37:27 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -297,65 +297,94 @@ sub end_numericalresponse {
     }
   } elsif ($target eq 'edit') {
     $result.='</td></tr>'.&Apache::edit::end_table;
-  } elsif ($target eq 'answer') {
+  } elsif ($target eq 'answer' || $target eq 'analyze') {
 
-    &Apache::response::setup_params($$tagstack[-1]);
-    my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
-    my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
-    my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
-    my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);
+      my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+      if ($target eq 'analyze') {
+	  push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
+	  $Apache::lonhomework::analyze{"$part_id.type"} = $$tagstack[-1];
+      }
+      &Apache::response::setup_params($$tagstack[-1]);
+      my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
+      my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
+      my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
+      my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);
 
-    $result.=&Apache::response::answer_header($$tagstack[-1]);
-    for(my $i=0;$i<=$#answers;$i++) {
-      my $ans=$answers[$i];
-      my $fmt;
-      if (@formats) {
-	if ($#formats) {
-	  $fmt=$formats[$i];
-	} else {
-	  $fmt=$formats[0];
-	}
+      if ($target eq 'answer') {
+	  $result.=&Apache::response::answer_header($$tagstack[-1]);
       }
-      my ($high,$low);
-      if ($Apache::inputtags::params{'tol'}) {
-	($high,$low)=&get_tolrange($ans,$Apache::inputtags::params{'tol'});
-      }	
-      my ($sighigh,$siglow);
-      if ($Apache::inputtags::params{'sig'}) {
-	($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});
+      for(my $i=0;$i<=$#answers;$i++) {
+	  my $ans=$answers[$i];
+	  my $fmt;
+	  if (@formats) {
+	      if ($#formats) {
+		  $fmt=$formats[$i];
+	      } else {
+		  $fmt=$formats[0];
+	      }
+	  }
+	  my ($high,$low);
+	  if ($Apache::inputtags::params{'tol'}) {
+	      ($high,$low)=&get_tolrange($ans,$Apache::inputtags::params{'tol'});
+	  }
+	  my ($sighigh,$siglow);
+	  if ($Apache::inputtags::params{'sig'}) {
+	      ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});
+	  }
+	  if ($fmt) {
+	      $ans = sprintf('%.'.$fmt,$ans);
+	      if ($high) {
+		  $high = sprintf('%.'.$fmt,$high); $low = sprintf('%.'.$fmt,$low);
+	      }
+	  }
+	  if ($target eq 'answer') {
+	      if ($high) { $ans.=' ['.$low.','.$high.'] '; }
+	      if ($sighigh) { $ans.= "Sig <i>$siglow - $sighigh</i>"; }
+	      $result.=&Apache::response::answer_part($$tagstack[-1],$ans);
+	  } elsif ($target eq 'analyze') {
+	      push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} },
+		    $ans);
+	      if ($high) {
+		  push (@{ $Apache::lonhomework::analyze{"$part_id.ans_high"} }, $high);
+		  push (@{ $Apache::lonhomework::analyze{"$part_id.ans_low"} }, $low);
+	      }
+	  }
       }
-      if ($fmt) {
-	$ans = sprintf('%.'.$fmt,$ans);
-	if ($high) {
-	  $high = sprintf('%.'.$fmt,$high); $low = sprintf('%.'.$fmt,$low);
-	}
+      if ($unit) {
+	  if ($target eq 'answer') {
+	      $result.=&Apache::response::answer_part($$tagstack[-1],
+						      "Unit: <b>$unit</b>");
+	  } elsif ($target eq 'analyze') {
+	      push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} },
+		    $unit);
+	  }
       }
-      if ($high) { $ans.=' ['.$low.','.$high.'] '; }
-      if ($sighigh) { $ans.= "Sig <i>$siglow - $sighigh</i>"; }
-      $result.=&Apache::response::answer_part($$tagstack[-1],$ans);
-    }
-    if ($unit) {
-      $result.=&Apache::response::answer_part($$tagstack[-1],"Unit: <b>$unit</b>");
-    }
-    if ($type || $token->[1] eq 'stringresponse') {
-      my $string='Case Insensitive';
-      if ($type eq 'mc') {
-	$string='Multiple Choice';
-      } elsif ($type eq 'cs') {
-	$string='Case Sensitive';
-      } elsif ($type eq 'ci') {
-	$string='Case Insensitive';
-      } elsif ($type eq 'fml') {
-	$string='Formula';
+      if ($type || $token->[1] eq 'stringresponse') {
+	  my $string='Case Insensitive';
+	  if ($type eq 'mc') {
+	      $string='Multiple Choice';
+	  } elsif ($type eq 'cs') {
+	      $string='Case Sensitive';
+	  } elsif ($type eq 'ci') {
+	      $string='Case Insensitive';
+	  } elsif ($type eq 'fml') {
+	      $string='Formula';
+	  }
+	  if ($target eq 'answer') {
+	      $result.=&Apache::response::answer_part($$tagstack[-1],
+						      '<b>'.$string.'</b>');
+	  } elsif ($target eq 'analyze') {
+	      push (@{ $Apache::lonhomework::analyze{"$part_id.type"} },
+		    $type);
+	  }
+      }
+      if ($$tagstack[-1] eq 'formularesponse' && $target eq 'answer') {
+	  my $samples=&Apache::lonxml::get_param('samples',$parstack,$safeeval);
+	  $result.=&Apache::response::answer_part($$tagstack[-1],$samples);
+      }
+      if ($target eq 'answer') {
+	  $result.=&Apache::response::answer_footer($$tagstack[-1]);
       }
-      $result.=&Apache::response::answer_part($$tagstack[-1],
-					      '<b>'.$string.'</b>');
-    }
-    if ($$tagstack[-1] eq 'formularesponse') {
-      my $samples=&Apache::lonxml::get_param('samples',$parstack,$safeeval);
-      $result.=&Apache::response::answer_part($$tagstack[-1],$samples);
-    }
-    $result.=&Apache::response::answer_footer($$tagstack[-1]);
   }
   &Apache::response::end_response;
   return $result;