--- loncom/homework/caparesponse/caparesponse.pm	2003/05/19 21:40:04	1.103
+++ loncom/homework/caparesponse/caparesponse.pm	2003/10/15 19:54:45	1.107.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.103 2003/05/19 21:40:04 albertel Exp $
+# $Id: caparesponse.pm,v 1.107.2.2 2003/10/15 19:54:45 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,10 +169,7 @@ 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,
@@ -230,11 +231,16 @@ sub end_numericalresponse {
 		if ($$tagstack[-1] eq 'numericalresponse') {
 		    if ($unit=~/\S/) {$result.=' (in '.$unit.')<br /><br />';}
 		    $result.= '<table border="1"><tr>';
+		    my $previous=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.$id.submission"};
 		    for (my $ind=0;$ind<$number_of_bubbles;$ind++) {
+			my $checked='';
+			if ($previous eq $bubble_values[$ind]) {
+			    $checked=" checked='on' ";
+			}
 			$result.='<td><input type="radio" name="HWVAL_'.$id.
-			    '" value="'.$bubble_values[$ind].'"><b>'.
-				$alphabet[$ind].'</b>: '.
-				    $bubble_values[$ind].'</td>';
+			    '" value="'.$bubble_values[$ind].'" '.$checked
+			    .' /><b>'.$alphabet[$ind].'</b>: '.
+			    $bubble_values[$ind].'</td>';
 		    }
 		    $result.='</tr></table>';
 		} elsif ($$tagstack[-1] eq 'formularesponse') {
@@ -243,7 +249,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') {
@@ -320,7 +326,7 @@ sub end_numericalresponse {
 		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 \\textit{$siglow - $sighigh}";
+			$ans.= " Sig $siglow - $sighigh";
 		    } else {
 			$ans.= " Sig <i>$siglow - $sighigh</i>";
 		    }
@@ -339,7 +345,7 @@ sub end_numericalresponse {
 	    if ($target eq 'answer') {
 		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>");
@@ -494,7 +500,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(@_);
     }
@@ -509,7 +517,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(@_);
     }