--- loncom/homework/matchresponse.pm	2011/11/08 01:48:51	1.81.2.1
+++ loncom/homework/matchresponse.pm	2011/09/13 21:42:58	1.82
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.81.2.1 2011/11/08 01:48:51 raeburn Exp $
+# $Id: matchresponse.pm,v 1.82 2011/09/13 21:42:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -131,11 +131,7 @@ sub end_itemgroup {
     my $result;
 
     if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
-    if (ref($Apache::response::itemgroup{'names'}) eq 'ARRAY') {
-        if(!@{ $Apache::response::itemgroup{'names'} }) { return; }
-    } else {
-        return;
-    }
+    if (!defined(@{ $Apache::response::itemgroup{'names'} })) { return; }
     my @names=@{ $Apache::response::itemgroup{'names'} };
     my $randomize =&Apache::lonxml::get_param('randomize',$parstack,$safeeval);
     if ($randomize ne 'no' ) {
@@ -177,9 +173,31 @@ sub end_itemgroup {
     } elsif ($target eq 'tex') {
 	my $table=' \begin{description}\setlength{\leftmargin}{2em}\setlength{\labelwidth}{1em}\setlength{\itemsep}{0.5pt plus1pt minus2pt}\setlength{\listparindent}{0em} ';
 	my $i=0;
+        my ($numrows,$bubbles_per_row);
+        if ($Apache::lonhomework::type eq 'exam') {
+            ($numrows,$bubbles_per_row) = 
+                &Apache::optionresponse::getnumrows(scalar(@names)); 
+        } else {
+            $numrows = 1;
+        }
 	foreach my $name (@names) {
 	    # $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
-	    $table.='\item['.$alphabet[$i].'] '.
+            my $item;
+            if (($numrows > 1) && ($bubbles_per_row > 0)) {
+                my $num = 1+int($i/$bubbles_per_row);
+                my $idx = int($i % $bubbles_per_row);
+                if ($idx == 0) {
+                    if ($num == 1) {
+                        $table .= '\item[\footnotesize {'.&mt('(first line)').'}]';
+                    } else {
+                        $table .= '\item[\footnotesize {'.&mt('(next line)').'}]';
+                    }
+                }
+                $item = $alphabet[$idx];
+            } else {
+                $item = $alphabet[$i];
+            }
+	    $table.='\item['.$item.'] '.
 		$Apache::response::itemgroup{$name.'.text'};
 	    $i++;
 	}
@@ -292,8 +310,20 @@ sub end_foilgroup {
 						 ['text','value','location']);
 	    #FIXME need to store options in some way
 	}
-	&Apache::lonxml::increment_counter(&getfoilcounts($max), 
-					   "$part.$response_id");
+        my ($numrows,$bubbles_per_row);
+        if (($target eq 'tex') && ($Apache::lonhomework::type eq 'exam')) {
+            my $numitems;
+            if (ref($Apache::response::itemgroup{'names'}) eq 'ARRAY') {
+                $numitems = scalar(@{ $Apache::response::itemgroup{'names'} });
+                ($numrows,$bubbles_per_row) =
+                    &Apache::optionresponse::getnumrows($numitems);
+            }
+        }
+        if ($numrows < 1) {
+            $numrows = 1;
+        }
+        my $increment = &getfoilcounts($max) * $numrows;
+	&Apache::lonxml::increment_counter($increment,"$part.$response_id");
 	if ($target eq 'analyze') {
 	    &Apache::lonhomework::set_bubble_lines();
 	}
@@ -315,22 +345,16 @@ sub whichfoils {
 
 sub displayanswers {
     my ($max,$randomize,@opt)=@_;
-    if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') {
-        if (!@{ $Apache::response::foilgroup{'names'} }) { return; }
-    } else {
-        return;
-    }
+    if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
     my @names = @{ $Apache::response::foilgroup{'names'} };
     my @whichfoils = &Apache::response::whichorder(&getfoilcounts($max),
 						   $randomize,
 					  &Apache::response::showallfoils(),
 					 \%Apache::response::foilgroup);
     my %name_letter_map;
-    if (ref($Apache::response::itemgroup{'name_letter_map'}) eq 'HASH') {
-        if (%{$Apache::response::itemgroup{'name_letter_map'}}) {
-            %name_letter_map=
-                %{ $Apache::response::itemgroup{'name_letter_map'} };
-        }
+    if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) {
+	%name_letter_map=
+	    %{ $Apache::response::itemgroup{'name_letter_map'} };
     }
     my $result;
     if ($Apache::lonhomework::type eq 'exam') {
@@ -367,15 +391,46 @@ sub grade_response {
     my %answerhash;
     my ($temp,$right,$wrong,$ignored)=(1,0,0,0);
     my %letter_name_map;
-    if (ref($Apache::response::itemgroup{'letter_name_map'}) eq 'HASH') {
-        if (%{$Apache::response::itemgroup{'letter_name_map'}}) {
-            %letter_name_map=
-                %{ $Apache::response::itemgroup{'letter_name_map'} };
-        }
+    if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) {
+	%letter_name_map=
+	    %{ $Apache::response::itemgroup{'letter_name_map'} };
     }
     my @items;
+    my $numitems = scalar(@{ $Apache::response::itemgroup{'names'} });
+    my ($numrows,$bubbles_per_row);
+    if ($Apache::lonhomework::scantronmode) {
+        my $numitems = scalar(@{ $Apache::response::itemgroup{'names'} });
+        ($numrows,$bubbles_per_row) =
+            &Apache::optionresponse::getnumrows($numitems);
+    }
+    if ($numrows < 1) {
+        $numrows = 1;
+    }
+    my @alphabet=('A'..'Z');
+    my %nums_from_letters;
+    for (my $i=0; $i<@alphabet; $i++) {
+        $nums_from_letters{$alphabet[$i]} = $i;
+    }
     foreach my $name (@whichfoils) {
-	my $response = &Apache::response::getresponse($temp,'letter');
+        my $response;
+        if ($numrows > 1) {
+            my $num = $temp;
+            my $totalnum;
+            for (my $i=0; $i<$numrows; $i++) {
+                my $item = &Apache::response::getresponse($num,'letter');
+                if ($item =~ /^\w$/) {
+                    $totalnum = $i*$bubbles_per_row + $nums_from_letters{$item};
+                }
+                $num ++;
+            }
+            if ($totalnum =~ /^\d+$/) {
+                $response = $alphabet[$totalnum];
+            }
+            $temp += $numrows;
+        } else {
+	    $response = &Apache::response::getresponse($temp,'letter');
+            $temp ++;
+        }
 	push(@items,$response);
 	my $responsename = $letter_name_map{$response};
 	my $value=$Apache::response::foilgroup{$name.'.value'};
@@ -393,7 +448,6 @@ sub grade_response {
 	} else {
 	    $ignored++;
 	}
-	$temp++;
     }
     my $part=$Apache::inputtags::part;
     my $id = $Apache::inputtags::response['-1'];
@@ -506,18 +560,14 @@ sub displayfoils {
     my $part=$Apache::inputtags::part;
     my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
     my %letter_name_map;
-    if (ref($Apache::response::itemgroup{'letter_name_map'}) eq 'HASH') {
-        if (%{$Apache::response::itemgroup{'letter_name_map'}}) {
-            %letter_name_map=
-                %{ $Apache::response::itemgroup{'letter_name_map'} };
-        }
+    if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) {
+	%letter_name_map=
+	    %{ $Apache::response::itemgroup{'letter_name_map'} };
     }
     my %name_letter_map;
-    if (ref($Apache::response::itemgroup{'name_letter_map'}) eq 'HASH') {
-        if (%{$Apache::response::itemgroup{'name_letter_map'}}) {
-            %name_letter_map=
-                %{ $Apache::response::itemgroup{'name_letter_map'} };
-        }
+    if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) {
+	%name_letter_map=
+	    %{ $Apache::response::itemgroup{'name_letter_map'} };
     }
     if ( &Apache::response::show_answer() && ($target ne 'tex')) {
 	foreach my $name (@whichfoils) {
@@ -551,6 +601,13 @@ sub displayfoils {
 	my @alphabet=('A'..'Z');
 	my @used_letters=sort(keys(%letter_name_map));
 	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(@used_letters));
+        } else {
+            $numrows = 1;
+        }
 	foreach my $name (@whichfoils) {
 	    my $lastopt=$lastresponse{$name};
 	    my $last_letter=$name_letter_map{$lastopt};
@@ -634,15 +691,27 @@ sub displayfoils {
 		    my @emptyItems = ();
 		    for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
 		    $question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}'
-			.'\item \hskip -3mm \textbf{'.$internal_counter.'}';
+			.'\item \hskip -3mm ';
+                    if ($numrows == 1) {
+                        $question .= '\textbf{'.$internal_counter.'}';
+                    } else {
+                        my $linetext;
+                        for (my $i=0; $i<$numrows; $i++) {
+                            $linetext .= $internal_counter+$i.', ';
+                        }
+                        $linetext =~ s/,\s$//;
+                        $question .= '\small {\textbf{'.$linetext.'}} '.
+                                     '\hskip 2 mm {\footnotesize '.
+                                     &mt('(Bubble once in [_1] lines)',$numrows).
+                                     '} \vskip 3 mm';
+                    }
+                    my $max_width;
 		    if (&itemdisplay('left') || &itemdisplay('right')) {
-			$question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize);
-		    }
-		    else {
-			$question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems);
-		    }
+                        $max_width = $righttabsize;
+                    }
+		    $question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems,'',$max_width,$numrows,$bubbles_per_row,$internal_counter);
 		    $question .= '\end{list} \vskip -8 mm \strut ';
-		    $internal_counter++;
+		    $internal_counter += $numrows;
 	        } else {
                     if($env{'form.pdfFormFields'} eq 'yes' 
                             && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') {
@@ -762,11 +831,9 @@ sub start_foil {
 	if ($$tagstack[-2] eq 'conceptgroup') { $level = '-3'; }
 	$result.=&Apache::edit::text_arg('Name:','name',$token);
 	my @names;
-        if (ref($Apache::response::itemgroup{'names'}) eq 'ARRAY') {
-            if (@{ $Apache::response::itemgroup{'names'} }) {
-                @names=@{ $Apache::response::itemgroup{'names'} };
-            }
-        }
+	if (defined(@{ $Apache::response::itemgroup{'names'} })) {
+	    @names=@{ $Apache::response::itemgroup{'names'} };
+	}
 	$result.= &Apache::edit::select_or_text_arg('Correct Option:','value',['unused',@names],$token,'15');
 	my $randomize=&Apache::lonxml::get_param('randomize',$parstack,
 						 $safeeval,'-3');
@@ -841,5 +908,6 @@ sub insert_foil {
 <endouttext />
 </foil>';
 }
+
 1;
 __END__