--- loncom/homework/rankresponse.pm 2010/12/19 00:48:50 1.64 +++ loncom/homework/rankresponse.pm 2014/05/05 17:40:54 1.71 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # rank style response # -# $Id: rankresponse.pm,v 1.64 2010/12/19 00:48:50 raeburn Exp $ +# $Id: rankresponse.pm,v 1.71 2014/05/05 17:40:54 bisitz Exp $ # Copyright Michigan State University Board of Trustees # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). @@ -127,8 +127,17 @@ sub end_foilgroup { } my $part = $Apache::inputtags::part; my $id = $Apache::inputtags::response[-1]; - &Apache::lonxml::increment_counter(&getfoilcounts($max), - "$part.$id"); + my ($numrows,$bubbles_per_row); + if (($target eq 'tex') && ($Apache::lonhomework::type eq 'exam')) { + my (@whichfoils)=&whichfoils($max,$randomize); + ($numrows,$bubbles_per_row) = + &Apache::optionresponse::getnumrows(scalar(@whichfoils)); + } + if ($numrows < 1) { + $numrows = 1; + } + my $increment = &getfoilcounts($max) * $numrows; + &Apache::lonxml::increment_counter($increment,"$part.$id"); if ($target eq 'analyze') { &Apache::lonhomework::set_bubble_lines(); } @@ -177,8 +186,11 @@ sub get_correct_order { sub displayanswers { my ($max,$randomize,$tol,@opt)=@_; - if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } - my @names = @{ $Apache::response::foilgroup{'names'} }; + my @names; + if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') { + @names = @{ $Apache::response::foilgroup{'names'} }; + } + return if (!@names); my @whichfoils = &whichfoils($max,$randomize); my @correctorder=&get_correct_order($tol,@whichfoils); my $result; @@ -227,8 +239,34 @@ sub grade_response { my %grade; my ($temp,$right,$wrong,$ignored)=(1,0,0,0); my @correctorder=&get_correct_order($tol,@whichfoils); + my ($numrows,$bubbles_per_row); + if ($Apache::lonhomework::scantronmode) { + my $numitems = scalar(@whichfoils); + ($numrows,$bubbles_per_row) = + &Apache::optionresponse::getnumrows($numitems); + } + if ($numrows < 1) { + $numrows = 1; + } + foreach my $name (@whichfoils) { - my $response = &Apache::response::getresponse($temp,'A is 1'); + my $response; + if ($numrows > 1) { + my $num = $temp; + my $totalnum; + for (my $i=0; $i<$numrows; $i++) { + my $item = &Apache::response::getresponse($num,'A is 1'); + if ($item =~ /^\d+$/) { + $totalnum = $i*$bubbles_per_row + $item; + } + $num ++; + } + $response = $totalnum; + $temp += $numrows; + } else { + $response = &Apache::response::getresponse($temp,'A is 1'); + $temp ++; + } my $value=shift(@correctorder); if ( $response =~ /[^\s]/) { $responsehash{$name}=$response; @@ -241,7 +279,6 @@ sub grade_response { } else { $ignored++; } - $temp++; } my $malformed=&check_response_order(%responsehash); my $part=$Apache::inputtags::part; @@ -298,8 +335,11 @@ sub format_prior_answer { my %grading =&Apache::lonnet::str2hash($other_data->[1]); my $output; foreach my $name (@{ $foil_order }) { - next if (!defined($lastresponse{$name})); - $output .= '