--- loncom/homework/rankresponse.pm 2003/07/01 20:13:14 1.15 +++ loncom/homework/rankresponse.pm 2003/09/23 01:52:57 1.17.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # rank style response # -# $Id: rankresponse.pm,v 1.15 2003/07/01 20:13:14 sakharuk Exp $ +# $Id: rankresponse.pm,v 1.17.2.1 2003/09/23 01:52:57 albertel Exp $ # Copyright Michigan State University Board of Trustees # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). @@ -121,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; @@ -241,7 +241,7 @@ sub displayfoils { 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() ) { foreach my $name (@whichfoils) { my $text=$Apache::response::foilgroup{$name.'.text'}; my $value=shift(@correctorder); @@ -291,7 +291,7 @@ sub displayfoils { $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++;