--- loncom/homework/rankresponse.pm	2003/03/25 22:15:04	1.8
+++ loncom/homework/rankresponse.pm	2003/10/13 19:25:30	1.21
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # rank style response
 #
-# $Id: rankresponse.pm,v 1.8 2003/03/25 22:15:04 sakharuk Exp $
+# $Id: rankresponse.pm,v 1.21 2003/10/13 19:25:30 albertel Exp $
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -104,6 +104,9 @@ 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();
     }
     return $result;
 }
@@ -118,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;
@@ -235,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;
@@ -252,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='';
@@ -264,7 +268,7 @@ sub displayfoils {
 		    if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";}
 		}
 	    }
-	    if ($target ne 'tex') {
+	    if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
 		$optionlist='<select name="HWVAL_'.
 		    $Apache::inputtags::response[-1].':'.$temp.'">'.
 		        $optionlist."</select>\n";
@@ -273,16 +277,21 @@ sub displayfoils {
 	    }
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
 	    if ($target ne 'tex') {
-		$result.='<br />'.$optionlist.$text."\n";
+		if ($Apache::lonhomework::type ne 'exam') {
+		    $result.='<br />'.$optionlist.$text."\n";
+		} else {
+		    $result.='<br />'.$text."\n";
+		}
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $result.=&Apache::optionresponse::webbubbles(\@alp,\@whichopt);
+		    $result.=&Apache::optionresponse::webbubbles(\@alp,\@whichopt,$temp);
 		}
 	    } else {
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $result.='\vskip 0 mm   '.$text."\n";
-		    $result.='\vskip -1 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 0 mm   '.$text.' \vskip -3 mm '."\n";
+		    $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++;
@@ -304,52 +313,9 @@ sub getfoilcounts {
 
 sub whichfoils {
     my ($max,$randomize)=@_;
-    $max = &getfoilcounts($max);
- #   &Apache::lonxml::debug("man $max randomize $randomize");
-    if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
-    my @names = @{ $Apache::response::foilgroup{'names'} };
-    my @whichopt =();
-    my (%top,@toplist,%bottom,@bottomlist);
-    if (!(&Apache::response::showallfoils() || ($randomize eq 'no'))) {
-	my $current=0;
-	foreach my $name (@names) {
-	    $current++;
-	    if ($Apache::response::foilgroup{"$name.location"} eq 'top') {
-		$top{$name}=$current;
-	    } elsif ($Apache::response::foilgroup{"$name.location"} eq
-		     'bottom') {
-		$bottom{$name}=$current;
-	    }
-	}
-    }
-    while ((($#whichopt+1) < $max) && ($#names > -1)) {
-#	&Apache::lonxml::debug("Have $#whichopt max is $max");
-	my $aopt;
-	if (&Apache::response::showallfoils() || ($randomize eq 'no')) {
-	    $aopt=0;
-	} else {
-	    $aopt=int(&Math::Random::random_uniform() * ($#names+1));
-	}
-#	&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
-	$aopt=splice(@names,$aopt,1);
-#	&Apache::lonxml::debug("Picked $aopt");
-	if ($top{$aopt}) {
-	    $toplist[$top{$aopt}]=$aopt;
-	} elsif ($bottom{$aopt}) {
-	    $bottomlist[$bottom{$aopt}]=$aopt;
-	} else {
-	    push (@whichopt,$aopt);
-	}
-    }
-#    &Apache::lonxml::debug("Grr, ".$#whichopt.":".$#toplist.':'.$#bottomlist);
-    for (my $i=0;$i<=$#toplist;$i++) {
-	if ($toplist[$i]) { unshift(@whichopt,$toplist[$i]) }
-    }
-    for (my $i=0;$i<=$#bottomlist;$i++) {
-	if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) }
-    }
-    &Apache::lonxml::debug("Grr, ".$#whichopt.":".$#toplist.':'.$#bottomlist);
-    return @whichopt;
+    return &Apache::response::whichorder($max,$randomize,
+					 &Apache::response::showallfoils(),
+					 \%Apache::response::foilgroup);
 }
 
 sub start_conceptgroup {
@@ -457,12 +423,24 @@ sub end_foil {
 		 && !&Apache::response::showallfoils() ) {
 		push @{ $Apache::response::conceptgroup{'names'} }, $name;
 		$Apache::response::conceptgroup{"$name.value"} = $value;
-		$Apache::response::conceptgroup{"$name.text"} = $text;
+		if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
+		    $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
+		} else {
+		    $Apache::response::conceptgroup{"$name.text"} = $text;
+		}
 		$Apache::response::conceptgroup{"$name.location"} = $location;
 	    } else {
 		push @{ $Apache::response::foilgroup{'names'} }, $name;
 		$Apache::response::foilgroup{"$name.value"} = $value;
-		$Apache::response::foilgroup{"$name.text"} = $text;
+		if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
+		    $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
+		} else {
+		    if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
+			$Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;
+		    } else {
+			$Apache::response::foilgroup{"$name.text"} = $text;
+		    } 
+		}
 		$Apache::response::foilgroup{"$name.location"} = $location;
 	    }
 	}