--- loncom/homework/caparesponse/caparesponse.pm	2006/12/13 22:48:10	1.200
+++ loncom/homework/caparesponse/caparesponse.pm	2007/01/23 22:00:16	1.206
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.200 2006/12/13 22:48:10 albertel Exp $
+# $Id: caparesponse.pm,v 1.206 2007/01/23 22:00:16 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,7 @@ use Safe::Hole;
 use Apache::lonmaxima();
 use Apache::lonlocal;
 use Apache::lonnet;
+use Apache::response();
 use Storable qw(dclone);
 
 BEGIN {
@@ -40,6 +41,11 @@ BEGIN {
 }
 
 my %answer;
+my @answers;
+sub get_answer { return %answer; };
+sub push_answer{ push(@answers,dclone(\%answer)); undef(%answer) }
+sub pop_answer { %answer = %{pop(@answers)}; };
+
 my $cur_name;
 my $tag_internal_answer_name = 'INTERNAL';
 
@@ -231,6 +237,13 @@ sub set_answertext {
 	$response_level) = @_;
     &add_in_tag_answer($parstack,$safeeval,$response_level);
 
+    if ($name eq '' || !ref($answer{$name})) {
+	if (ref($answer{$tag_internal_answer_name})) {
+	    $name = $tag_internal_answer_name;
+	} else {
+	    $name = (sort(keys(%answer)))[0];
+	}
+    }
     return if ($name eq '' || !ref($answer{$name}));
 
     my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
@@ -372,6 +385,11 @@ sub add_in_tag_answer {
     }
 }
 
+sub capa_formula_fix {
+   my ($expression)=@_;
+   return &Apache::response::implicit_multiplication($expression);
+}
+
 sub end_numericalresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $increment=1;
@@ -384,7 +402,6 @@ sub end_numericalresponse {
     my $tag;
     my $safehole = new Safe::Hole;
     $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
-    $safehole->wrap(\&Apache::lonmaxima::maxima_check,$safeeval,'&maxima_check');
 
     if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }
     if ( $target eq 'grade' && &Apache::response::submitted() ) {
@@ -776,7 +793,18 @@ sub make_numerical_bubbles {
 	&Apache::response::get_response_param($part.'_'.$id,'numbubbles',8);
 
     my ($format)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
-    my ($answer)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
+    my $name = (exists($answer{$tag_internal_answer_name}) 
+		? $tag_internal_answer_name
+		: (sort(keys(%answer)))[0]);
+
+    if ( scalar(@{$answer{$name}{'answers'}}) > 1) {
+	&Apache::lonxml::error("Only answers with 1 component are supported in exam mode");
+    }
+    if (scalar(@{$answer{$name}{'answers'}[0]}) > 1) {
+	&Apache::lonxml::error("Vector answers are unsupported in exam mode.");
+    }
+
+    my $answer = $answer{$name}{'answers'}[0][0];
     my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,
 						   $safeeval);
     if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }