--- loncom/homework/rankresponse.pm	2011/06/07 17:27:37	1.65
+++ loncom/homework/rankresponse.pm	2013/04/30 03:03:34	1.69
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # rank style response
 #
-# $Id: rankresponse.pm,v 1.65 2011/06/07 17:27:37 www Exp $
+# $Id: rankresponse.pm,v 1.69 2013/04/30 03:03:34 raeburn 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;
@@ -340,12 +377,28 @@ sub displayfoils {
                 $newvariation = 1;
             }
         }
-        unless (((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) || $newvariation) {
-            $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
+        unless ($newvariation) {
+            if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
+                (($env{'form.grade_username'} eq $env{'user.name'}) &&
+                 ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
+                $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
+            } else {
+                unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') ||
+                        ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) {
+                    $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;
+        my ($numrows,$bubbles_per_row);
+        if (($target eq 'tex') && ($Apache::lonhomework::type eq 'exam')) {
+            ($numrows,$bubbles_per_row) = 
+                &Apache::optionresponse::getnumrows(scalar(@alp));
+        } else {
+            $numrows = 1;
+        }
         if($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
             $result .= '\strut \\\\ \strut \\\\' ;
         }
@@ -398,12 +451,26 @@ sub displayfoils {
 		}
 	    } else {
 		if ($Apache::lonhomework::type eq 'exam') {
+                    my $itemlabel;
+                    if ($numrows == 1) {
+                        $itemlabel = '\item[\textbf{'.$internal_counter.'}]';
+                    } else {
+                        my $linetext;
+                        for (my $i=0; $i<$numrows; $i++) {
+                            $linetext .= $internal_counter+$i.', ';
+                        }
+                        $linetext =~ s/,\s$//;
+                        $itemlabel = '\item[\small {\textbf{'.$linetext.'}}]'.
+                                     ' {\footnotesize '.
+                                     &mt('(Bubble once in [_1] lines)',$numrows).
+                                     '} \hspace*{\fill} \\\\';
+                    }
 		    $result .= '\vskip 0 mm '.$text.' \vskip 0 mm '."\n";
 		    $result .= '\vskip -1 mm';
-		    $result .= '\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]';
-		    $result .= &Apache::optionresponse::bubbles(\@alp,\@whichopt,'rankresponse');
-		    $result .= '\end{enumerate} \vskip -8 mm \strut ';
-		    $internal_counter++;
+                    $result .= '\begin{enumerate}'.$itemlabel;
+		    $result .= &Apache::optionresponse::bubbles(\@alp,\@whichopt,'rankresponse',undef,$numrows,$bubbles_per_row,$internal_counter);
+                    $result .= '\end{enumerate} \vskip -8 mm \strut ';
+		    $internal_counter += $numrows;
 		} else {
                     if($env{'form.pdfFormFields'} ne 'yes') {
 		        $result.=' \vskip 0mm \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
@@ -538,9 +605,6 @@ sub end_foil {
 		$name=$Apache::lonxml::curdepth;
 	    }
 	    &Apache::lonxml::debug("Using a name of :$name:");
-            if ($name eq "0") {
-                &Apache::lonxml::error(&mt('Foil name [_1] is not supported. Please choose another name.','<b><tt>'.$name.'</tt></b>'));
-            }
 	    if (defined($Apache::response::foilnames{$name})) {
 		&Apache::lonxml::error(&mt('Foil name [_1] appears more than once. Foil names need to be unique.','<b><tt>'.$name.'</tt></b>'));
 	    }