--- loncom/homework/caparesponse/caparesponse.pm	2004/06/02 21:23:21	1.145
+++ loncom/homework/caparesponse/caparesponse.pm	2004/06/04 22:06:07	1.146
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.145 2004/06/02 21:23:21 albertel Exp $
+# $Id: caparesponse.pm,v 1.146 2004/06/04 22:06:07 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,6 +86,39 @@ sub start_numericalresponse {
 						    $safeeval);
 	    if ($unit =~ /\S/) { $result.=" (in $unit) "; }
 	}
+	if (  &Apache::response::show_answer() ) {
+	    my $answertxt;
+	    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);
+	    for (my $i=0; $i <= $#answers; $i++) {
+		my $answer=$answers[$i];
+		my $format;
+		if ($#formats > 0) {
+		    $format=$formats[$i];
+		} else {
+		    $format=$formats[0];
+		}
+		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,";
+		}
+		$answertxt.=$formatted;
+	    }
+	    chop $answertxt;
+	    if ($target eq 'web') {
+		$answertxt.=" $unit.<br />";
+	    }
+	    $Apache::inputtags::answertxt{$id}=$answertxt;
+	}
     }
     return $result;
 }
@@ -185,42 +218,6 @@ sub end_numericalresponse {
 						     $safeeval);
 	my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
 	my $status = $Apache::inputtags::status['-1'];
-	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 />".&mt('The correct answer is')." ";
-	    }
-	    for (my $i=0; $i <= $#answers; $i++) {
-		my $answer=$answers[$i];
-		my $format;
-		if ($#formats > 0) {
-		    $format=$formats[$i];
-		} else {
-		    $format=$formats[0];
-		}
-		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 ($target eq 'tex') {
-		    $formatted='';
-		    #$formatted=&Apache::lonxml::latex_special_symbols($formatted);
-		}
-		$result.=$formatted;
-	    }
-	    chop $result;
-	    if ($target eq 'web') {
-		$result.=" $unit.<br />";
-	    }
-	}
 	if ($Apache::lonhomework::type eq 'exam') {
 	    my $partid=$Apache::inputtags::part;
 	    my $id=$Apache::inputtags::response[-1];
@@ -561,18 +558,21 @@ sub start_stringresponse {
 			 [['cs','Case Sensitive'],['ci','Case Insensitive'],
 			  ['mc','Case Insensitive, Any Order'],
 			  ['re','Regular Expression']],$token);
-	$result.=&Apache::edit::checked_arg('Answer Display:','answerdisplay',
-					    [['inline','Inline']],$token);
 	$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
-       my $constructtag;
-       $constructtag=&Apache::edit::get_new_args($token,$parstack,
-                                                 $safeeval,'answer',
-                                                 'type','answerdisplay');
-       if ($constructtag) {
-           $result = &Apache::edit::rebuild_tag($token);
-           $result.=&Apache::edit::handle_insert();
-       }
+	my $constructtag;
+	$constructtag=&Apache::edit::get_new_args($token,$parstack,
+						  $safeeval,'answer',
+						  'type','answerdisplay');
+	if ($constructtag) {
+	    $result = &Apache::edit::rebuild_tag($token);
+	    $result.=&Apache::edit::handle_insert();
+	}
+    } elsif ($target eq 'web') {
+	if (  &Apache::response::show_answer() ) {
+	    $Apache::inputtags::answertxt{$id}=
+		&Apache::lonxml::get_param('answer',$parstack,$safeeval);
+	} 
     } elsif ($target eq 'answer' || $target eq 'grade') {
 	&Apache::response::reset_params();
     }
@@ -648,13 +648,6 @@ sub end_stringresponse {
     } elsif ($target eq 'web' || $target eq 'tex') {
 	my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
 	my $status = $Apache::inputtags::status['-1'];
-	if (  &Apache::response::show_answer() ) {
-	    if ($target eq 'web') {
-		$result=($answerdisplay eq 'inline'?'':"<br />".&mt('The correct answer is')." ")
-		    .$answer;
-#		    join(', ',@answers).".<br />";
-	    }
-	}
 	if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') {
 	    $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';
 	    $increment = &Apache::response::repetition();