--- loncom/homework/optionresponse.pm	2007/04/05 10:29:58	1.140
+++ loncom/homework/optionresponse.pm	2007/04/17 23:25:09	1.143
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.140 2007/04/05 10:29:58 foxr Exp $
+# $Id: optionresponse.pm,v 1.143 2007/04/17 23:25:09 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -355,27 +355,6 @@ sub check_for_invalid {
     }
 }
 
-sub setup_prior_tries_hash {
-    my ($whichopt) = @_;
-    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"}));
-	my %lastresponse=
-	    &Apache::lonnet::str2hash($Apache::lonhomework::history{$key});
-	my $output;
-	foreach my $name (@$whichopt) {
-	    next if (!defined($lastresponse{$name}));
-	    $output .= '<td>'.$lastresponse{$name}.'</td>';
-	}
-	next if (!defined($output));
-	$output =
-	    '<table class="LC_optres_prior"><tr>'.$output.'</tr></table>';
-	$Apache::inputtags::submission_display{$key} = $output;
-    }
-}
-
 sub displayfoils {
   my ($target,$max,$randomize,$TeXlayout,@opt)=@_;
   if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
@@ -499,7 +478,9 @@ sub displayfoils {
   }
 
   if ($target eq 'web') {
-      &setup_prior_tries_hash(\@whichopt);
+      &Apache::response::setup_prior_tries_hash(\&Apache::rankresponse::format_prior_answer,
+						[\@whichopt,
+						 'submissiongrading']);
   }
 
   if ($target ne 'tex') {
@@ -567,20 +548,19 @@ sub bubbles {
     my $number_of_bubbles = $#opt + 1;
     my $current_length = 0;
     my $textwidth;
-    if ($max_width) {
+    if (defined($max_width)) {
 	$textwidth=$max_width;
-	&Apache::lonnet::logthis("Max width passed in: $max_width");
-    }
-    elsif ($env{'form.textwidth'} ne '') {
+	&Apache::lonxml::debug("Max width passed in: $max_width");
+    } elsif ($env{'form.textwidth'} ne '') {
 	$env{'form.textwidth'}=~/(\d+)/;
 	$textwidth=$1;
-	&Apache::lonnet::logthis("Max width from form: $textwidth");
+	&Apache::lonxml::debug("Max width from form: $textwidth");
     } else {
 	$env{'form.textwidth'}=~/(\d*)\.?(\d*)/;
 	$textwidth=$1.'.'.$2;
-	&Apache::lonnet::logthis("Max width defaults? $textwidth");
+	&Apache::lonxml::debug("Max width defaults? $textwidth");
     }
-    &Apache::lonnet::logthis("Final maxwidth: $textwidth");
+    &Apache::lonxml::debug("Final maxwidth: $textwidth");
     for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
 	my $leftmargin;
 	$opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]);