--- loncom/homework/rankresponse.pm	2003/06/06 04:26:44	1.14
+++ loncom/homework/rankresponse.pm	2003/10/15 19:40:42	1.22
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # rank style response
 #
-# $Id: rankresponse.pm,v 1.14 2003/06/06 04:26:44 albertel Exp $
+# $Id: rankresponse.pm,v 1.22 2003/10/15 19:40:42 albertel Exp $
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -104,6 +104,7 @@ sub end_foilgroup {
 	} elsif ( $target eq 'grade') {
 	    &grade_response($max,$randomize,$tol);
 	}
+	&Apache::lonxml::increment_counter(&getfoilcounts($max));
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::end_table();
     }
@@ -120,7 +121,7 @@ sub get_correct_order {
     }
     @value_names =
 	sort {
-	    if (abs($a->[0] - $b->[0]) > $tol) {return ($a->[0] cmp $b->[0]);}
+	    if (abs($a->[0] - $b->[0]) > $tol) {return ($a->[0] <=> $b->[0]);}
 	    return 0;
 	} @value_names;
     my @value_names_tmp=@value_names;
@@ -186,7 +187,7 @@ sub grade_response {
     my ($temp,$right,$wrong,$ignored)=(0,0,0,0);
     my @correctorder=&get_correct_order($tol,@whichfoils);
     foreach my $name (@whichfoils) {
-	my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
+	my $response = &Apache::response::getresponse($temp);
 	$responsehash{$name}=$response;
 	my $value=shift(@correctorder);
 	if ( $response =~ /[^\s]/) {
@@ -237,14 +238,14 @@ sub displayfoils {
     my (@whichfoils)=&whichfoils($max,$randomize);
     my $part=$Apache::inputtags::part;
     my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
-    my $status=$Apache::inputtags::status[-1];
     my @whichopt=(1..($#whichfoils+1));
     my @correctorder=&get_correct_order($tol,@whichfoils);
-    if (($solved =~ /^correct/) || ($status eq  'SHOW_ANSWER')) {
+    if ( &Apache::response::show_answer() && ($target ne 'tex')) {
 	foreach my $name (@whichfoils) {
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
 	    my $value=shift(@correctorder);
-	    $result.='<br />'.$value.':'.$text;
+	    if ($target eq 'web') {$result.='<br />';} else {$result.=' \strut\\\\\strut ';}
+	    $result.=$value.':'.$text;
 	}
     } else {
 	my $i = 0;
@@ -254,6 +255,7 @@ sub displayfoils {
 	my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
 	my %lastresponse=&Apache::lonnet::str2hash($lastresponse); 
 	my @alp = splice @alphabet, 0, $#whichopt + 1;
+	my $internal_counter=$Apache::lonxml::counter;
 	foreach my $name (@whichfoils) {
 	    my $lastopt=$lastresponse{$name};
 	    my $optionlist='';
@@ -281,14 +283,16 @@ sub displayfoils {
 		    $result.='<br />'.$text."\n";
 		}
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $result.=&Apache::optionresponse::webbubbles(\@alp,\@whichopt,$temp);
+		    my @values=(1..scalar(@whichopt));
+		    $result.=&Apache::optionresponse::webbubbles(\@values,\@whichopt,$temp,$lastopt);
 		}
 	    } else {
 		if ($Apache::lonhomework::type eq 'exam') {
 		    $result.='\vskip 0 mm   '.$text.' \vskip -3 mm '."\n";
-		    $result.='\vskip -5 mm\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@alp,\@whichopt).'}\end{enumerate} \vskip -5 mm \strut ';
+		    $result.='\vskip -5 mm\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@alp,\@whichopt).'}\end{enumerate} \vskip -5 mm \strut ';
+		    $internal_counter++;
 		} else {
-		    $result.=' \\\\ \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
+		    $result.=' \vskip 0mm \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
 		}
 	    }
 	    $temp++;