--- loncom/homework/caparesponse/caparesponse.pm	2007/04/16 23:25:12	1.211
+++ loncom/homework/caparesponse/caparesponse.pm	2007/04/26 23:15:43	1.213
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.211 2007/04/16 23:25:12 albertel Exp $
+# $Id: caparesponse.pm,v 1.213 2007/04/26 23:15:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -465,7 +465,7 @@ sub add_in_tag_answer {
     my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval,
 					      $response_level);
     &Apache::lonxml::debug('answer is'.join(':',@answer));
-    if (@answer && defined($answer[0])) {
+    if (@answer && $answer[0] =~ /\S/) {
 	$answer{$tag_internal_answer_name}= {'type' => 'ordered',
 					     'answers' => [\@answer] };
     }
@@ -601,7 +601,7 @@ sub end_numericalresponse {
 		}
 	    }
 	}
-	&setup_prior_tries_hash();
+	&Apache::response::setup_prior_tries_hash(\&format_prior_response_numerical);
     } elsif ($target eq 'edit') {
 	$result.='</td></tr>'.&Apache::edit::end_table;
     } elsif ($target eq 'answer' || $target eq 'analyze') {
@@ -792,18 +792,20 @@ sub end_numericalresponse {
     return $result;
 }
 
-sub setup_prior_tries_hash {
-    #FIXME support multi answer numericals/formula
-    my $part=$Apache::inputtags::part;
-    my $id=$Apache::inputtags::response[-1];	
-    foreach my $i (1..$Apache::lonhomework::history{'version'}) {
-	my $key = "$i:resource.$part.$id.submission";
-	next if (!exists($Apache::lonhomework::history{"$key"}));
-	$Apache::inputtags::submission_display{$key} =
-	    '<span class="LC_prior_numerical">'.
-	    &HTML::Entities::encode($Apache::lonhomework::history{$key},
-				    '"<>&').'</span>';
+sub format_prior_response_numerical {
+    my ($mode,$answer) = @_;
+    if (ref($answer)) {
+	my $result = '<table class="LC_prior_numerical"><tr>';
+	foreach my $element (@{ $answer }) {
+	    $result.= '<td><span class="LC_prior_numerical">'.
+		&HTML::Entities::encode($element,'"<>&').'</span></td>';
+	}
+	$result.='</tr></table>';
+	return $result;
     }
+    return '<span class="LC_prior_numerical">'.
+	    &HTML::Entities::encode($answer,'"<>&').'</span>';
+
 }
 
 sub check_for_answer_errors {
@@ -1025,17 +1027,10 @@ sub get_sigrange {
     return ($sig_ubound,$sig_lbound);
 }
 
-sub setup_prior_tries_hash_string {
-    my $part=$Apache::inputtags::part;
-    my $id=$Apache::inputtags::response[-1];	
-    foreach my $i (1..$Apache::lonhomework::history{'version'}) {
-	my $key = "$i:resource.$part.$id.submission";
-	next if (!exists($Apache::lonhomework::history{"$key"}));
-	$Apache::inputtags::submission_display{$key} =
-	    '<span class="LC_prior_string">'.
-	    &HTML::Entities::encode($Apache::lonhomework::history{$key},
-				    '"<>&').'</span>';
-    }
+sub format_prior_response_string {
+    my ($mode,$answer) =@_;
+    return '<span class="LC_prior_string">'.
+	    &HTML::Entities::encode($answer,'"<>&').'</span>';
 }
 
 sub start_stringresponse {
@@ -1216,7 +1211,7 @@ sub end_stringresponse {
     } elsif ($target eq 'edit') {
 	$result.='</td></tr>'.&Apache::edit::end_table;
     } elsif ($target eq 'web' || $target eq 'tex') {
-	&setup_prior_tries_hash_string();
+	&Apache::response::setup_prior_tries_hash(\&format_prior_response_string);
     }
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
 	$target eq 'tex' || $target eq 'analyze') {