--- loncom/homework/caparesponse/caparesponse.pm	2003/05/13 15:27:45	1.98
+++ loncom/homework/caparesponse/caparesponse.pm	2003/09/22 20:49:01	1.114
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.98 2003/05/13 15:27:45 sakharuk Exp $
+# $Id: caparesponse.pm,v 1.114 2003/09/22 20:49:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -150,6 +150,10 @@ sub end_numericalresponse {
 		    $expression.=';my $type="float";';
 		}
 		$expression.="');";
+		my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
+		&Apache::lonxml::debug('answer is'.join(':',@answer));
+		@{$safeeval->varglob('CAPARESPONSE_CHECK_LIST_answer')}=@answer;
+		
 		$result = &Apache::run::run($expression,$safeeval);
 		my ($awards) = split /:/ , $result;
 		($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
@@ -165,20 +169,13 @@ sub end_numericalresponse {
 						     $safeeval);
 	my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
 	my $status = $Apache::inputtags::status['-1'];
-	if (   ($award =~ /^correct/
-                && lc($Apache::lonhomework::problemstatus) ne 'no')
-             || $status eq "SHOW_ANSWER"
-             || $ENV{'form.texaward'} eq 'SHOW_ANSWER') {
+	if (  &Apache::response::show_answer() ) {
 	    my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
 							 $safeeval);
 	    my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
 						    $safeeval);
 	    if ($target eq 'web') {
 		$result="<br />The correct answer is ";
-	    } elsif ($target eq 'tex') {
-		if ($ENV{'form.texaward'} eq 'SHOW_ANSWER') {
-		    $result='\vskip 0 mm The correct answer is \\texttt{ ';
-		}
 	    }
 	    for (my $i=0; $i <= $#answers; $i++) {
 		my $answer=$answers[$i];
@@ -190,15 +187,13 @@ sub end_numericalresponse {
 		}
 		my $formatted;
 		if ((defined($format)) && ($format ne '')) {
+		    $format=~s/e/E/g;
 		    &Apache::lonxml::debug("formatting with :$format: answer :$answer:");
 		    $formatted=sprintf('%.'.$format,$answer).',';
 		} else {
 		    &Apache::lonxml::debug("no format answer :$answer:");
 		    $formatted="$answer,";
 		}
-		if ($ENV{'form.texaward'} eq 'SHOW_ANSWER') {
-		    $result.=$formatted;
-		}
 		if ($target eq 'tex') {
 		    $formatted='';
 		    #$formatted=&Apache::lonxml::latex_special_symbols($formatted);
@@ -208,11 +203,6 @@ sub end_numericalresponse {
 	    chop $result;
 	    if ($target eq 'web') {
 		$result.=" $unit.<br />";
-	    } elsif ($target eq 'tex') {		
-		if ($ENV{'form.texaward'} eq 'SHOW_ANSWER') {
-		    $result.=&Apache::lonxml::latex_special_symbols($unit);
-		    $result.="}. \\vskip 0 mm ";
-		}
 	    }
 	}
 	if ($Apache::lonhomework::type eq 'exam') {
@@ -243,7 +233,7 @@ sub end_numericalresponse {
                            </textarea></font> <br /><br />';
 		}
 	    } elsif ($target eq 'tex') {
-		if (defined $unit and $Apache::lonhomework::type eq 'exam') {
+		if ((defined $unit) and ($unit=~/\S/) and ($Apache::lonhomework::type eq 'exam')) {
 		    $result.=' \textit{(in} \verb|'.$unit.'|\textit{)} ';
 		}
 		if ($$tagstack[-1] eq 'numericalresponse') {
@@ -309,7 +299,8 @@ sub end_numericalresponse {
 	    if ($Apache::inputtags::params{'sig'}) {
 		($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});
 	    }
-	    if ($fmt) {
+	    if ($fmt && $$tagstack[-1] eq 'numericalresponse') {
+		$fmt=~s/e/E/g;
 		$ans = sprintf('%.'.$fmt,$ans);
 		if ($high) {
 		    $high=sprintf('%.'.$fmt,$high);
@@ -317,12 +308,12 @@ sub end_numericalresponse {
 		}
 	    }
 	    if ($target eq 'answer') {
-		if ($high) { $ans.=' ['.$low.','.$high.']'; }
-		if ($sighigh) { 
-		    if ($ENV{'form.print_answer'} eq 'yes') {
-			$ans.= " Sig \\textit{$siglow - $sighigh}"; 
+		if ($high && $$tagstack[-1] eq 'numericalresponse') { $ans.=' ['.$low.','.$high.']'; }
+		if ($sighigh && $$tagstack[-1] eq 'numericalresponse') {
+		    if ($ENV{'form.answer_output_mode'} eq 'tex') {
+			$ans.= " Sig $siglow - $sighigh";
 		    } else {
-			$ans.= " Sig <i>$siglow - $sighigh</i>"; 
+			$ans.= " Sig <i>$siglow - $sighigh</i>";
 		    }
 		}
 		$result.=&Apache::response::answer_part($$tagstack[-1],$ans);
@@ -334,21 +325,21 @@ sub end_numericalresponse {
 		}
 	    }
 	}
-	if ($unit) {
+	if (defined($unit) and ($unit ne '') and
+	    $$tagstack[-1] eq 'numericalresponse') {
 	    if ($target eq 'answer') {
-		if ($ENV{'form.print_answer'} eq 'yes') {
+		if ($ENV{'form.answer_output_mode'} eq 'tex') {
 		    $result.=&Apache::response::answer_part($$tagstack[-1],
-							    "Unit: \\verb|$unit|");
+							    " Unit: $unit ");
 		} else {
 		    $result.=&Apache::response::answer_part($$tagstack[-1],
 							    "Unit: <b>$unit</b>");
 		}
 	    } elsif ($target eq 'analyze') {
-		push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} },
-		      $unit);
+		push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} }, $unit);
 	    }
 	}
-	if ($type || $token->[1] eq 'stringresponse') {
+	if ($type || $$tagstack[-1] eq 'stringresponse') {
 	    my $string='Case Insensitive';
 	    if ($type eq 'mc') {
 		$string='Multiple Choice';
@@ -360,10 +351,15 @@ sub end_numericalresponse {
 		$string='Formula';
 	    }
 	    if ($target eq 'answer') {
-		$result.=&Apache::response::answer_part($$tagstack[-1],
-							'<b>'.$string.'</b>');
+		if ($ENV{'form.answer_output_mode'} eq 'tex') {
+		    $result.=&Apache::response::answer_part($$tagstack[-1],
+							  "$string");
+		} else {
+		    $result.=&Apache::response::answer_part($$tagstack[-1],
+							    "<b>$string</b>");
+		}
 	    } elsif ($target eq 'analyze') {
-		push (@{ $Apache::lonhomework::analyze{"$part_id.type"} },
+		push (@{ $Apache::lonhomework::analyze{"$part_id.str_type"} },
 		      $type);
 	    }
 	}
@@ -407,12 +403,13 @@ sub format_number {
     my ($number,$format,$target)=@_;
     my $ans;
     if ($format ne '') {
+	$format=~s/e/E/g;
 	$ans = sprintf('%.'.$format,$number);
     } else {
 	my $format = '';
 	#What is the number? (integer,decimal,floating point)
 	if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) {
-	    $format = 'e'.$2;
+	    $format = '3e';
 	} elsif ($number=~/^(\d*)\.(\d*)$/) {
 	    $format = '4f';
 	} elsif ($number=~/^(\d*)$/) {
@@ -489,7 +486,9 @@ sub start_stringresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'meta') {
+	&Apache::response::start_response($parstack,$safeeval);
 	$result=&Apache::response::meta_package_write('stringresponse');
+	&Apache::response::end_response();
     } else {
 	$result.=&start_numericalresponse(@_);
     }
@@ -504,7 +503,9 @@ sub start_formularesponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'meta') {
+	&Apache::response::start_response($parstack,$safeeval);
 	$result=&Apache::response::meta_package_write('formularesponse');
+	&Apache::response::end_response();
     } else {
 	$result.=&start_numericalresponse(@_);
     }