--- loncom/interface/loncommon.pm	2010/11/28 00:04:05	1.987
+++ loncom/interface/loncommon.pm	2010/12/18 23:53:57	1.989
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.987 2010/11/28 00:04:05 raeburn Exp $
+# $Id: loncommon.pm,v 1.989 2010/12/18 23:53:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3421,6 +3421,7 @@ sub get_previous_attempt {
 	my ($ign,@parts) = split(/\./,$key);
 	if ($#parts > 0) {
 	  my $data=$parts[-1];
+          next if ($data eq 'foilorder');
 	  pop(@parts);
           if ($data eq 'type') {
               unless ($showsurv) {
@@ -3457,6 +3458,7 @@ sub get_previous_attempt {
                            '<td>'.&mt('Transaction [_1]',$version).'</td>';
             if (@hidden) {
                 foreach my $key (sort(keys(%lasthash))) {
+                    next if ($key =~ /\.foilorder$/);
                     my $hide;
                     foreach my $id (@hidden) {
                         if ($key =~ /^\Q$id\E/) {
@@ -3485,6 +3487,7 @@ sub get_previous_attempt {
                 }
             } else {
 	        foreach my $key (sort(keys(%lasthash))) {
+                    next if ($key =~ /\.foilorder$/);
 		    my $value = &format_previous_attempt_value($key,
 			            $returnhash{$version.':'.$key});
 		    $prevattempts.='<td>'.$value.'&nbsp;</td>';
@@ -3496,6 +3499,7 @@ sub get_previous_attempt {
       my @currhidden = keys(%lasthidden);
       $prevattempts.=&start_data_table_row().'<td>'.&mt('Current').'</td>';
       foreach my $key (sort(keys(%lasthash))) {
+          next if ($key =~ /\.foilorder$/);
           if (%typeparts) {
               my $hidden;
               foreach my $id (@currhidden) {
@@ -3551,6 +3555,29 @@ sub format_previous_attempt_value {
 	$value = &Apache::lonlocal::locallocaltime($value);
     } elsif (ref($value) eq 'ARRAY') {
 	$value = '('.join(', ', @{ $value }).')';
+    } elsif ($key =~ /answerstring$/) {
+        my %answers = &Apache::lonnet::str2hash($value);
+        my @anskeys = sort(keys(%answers));
+        if (@anskeys == 1) {
+            my $answer = $answers{$anskeys[0]};
+            if ($answer =~ m{\Q\0\E}) {
+                $answer =~ s{\Q\0\E}{, }g;
+            }
+            my $tag_internal_answer_name = 'INTERNAL';
+            if ($anskeys[0] eq $tag_internal_answer_name) {
+                $value = $answer; 
+            } else {
+                $value = $anskeys[0].'='.$answer;
+            }
+        } else {
+            foreach my $ans (@anskeys) {
+                my $answer = $answers{$ans};
+                if ($answer =~ m{\Q\0\E}) {
+                    $answer =~ s{\Q\0\E}{, }g;
+                }
+                $value .=  $ans.'='.$answer.'<br />';;
+            } 
+        }
     } else {
 	$value = &unescape($value);
     }
@@ -8730,7 +8757,7 @@ sub upload_embedded {
         if ($context eq 'portfolio') {
             $output .= '<p>'.&mt('or').'</p>';
         } elsif ($context eq 'testbank') {
-            $output .=  '<p>'.&mt('Or [_1]continue[_2] the testbank import without modifying the references(s).','<a href="javascript:document.testbankForm.submit();">','</a>').'</p>';
+            $output .=  '<p>'.&mt('Or [_1]continue[_2] the testbank import without modifying the reference(s).','<a href="javascript:document.testbankForm.submit();">','</a>').'</p>';
             $returnflag = 'modify_orightml';
         }
     }