--- loncom/homework/matchresponse.pm	2003/03/18 21:26:33	1.6
+++ loncom/homework/matchresponse.pm	2003/03/20 18:06:07	1.10
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.6 2003/03/18 21:26:33 sakharuk Exp $
+# $Id: matchresponse.pm,v 1.10 2003/03/20 18:06:07 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,7 +33,7 @@ use HTML::Entities();
 use Math::Random();
 use Apache::optionresponse;
 
-my @Items;
+my @Items = ();
 
 BEGIN {
     &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
@@ -128,7 +128,7 @@ sub end_itemgroup {
     foreach my $name (@names) {
 	$letter_name_map{$alphabet[$i]}=$name;
 	$name_letter_map{$name}=$alphabet[$i];
-	push @Items, $alphabet[$i];
+	$Items[$i] = $alphabet[$i];
 	$i++;
     }
      $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map;
@@ -383,13 +383,22 @@ sub displayfoils {
 	my $id=$Apache::inputtags::response[-1];
 	my $part=$Apache::inputtags::part;
 	my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
-	my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
+	my %lastresponse=&Apache::lonnet::str2hash($lastresponse);    
+	my @alphabet=('A'..'Z');
+        my @Items_letter = splice @alphabet, 0, $#Items + 1;
 	foreach my $name (@whichfoils) {
 	    my $lastopt=$lastresponse{$name};
 	    my $last_letter=$name_letter_map{$lastopt};
 	    my $optionlist = '';
-	    if ($target ne 'tex') {$optionlist="<option></option>\n";} 
-	       else {$optionlist='\framebox[5 mm][s]{\tiny\strut}';}
+	    if ($target ne 'tex') {
+		$optionlist="<option></option>\n";
+	    } else {
+		if ($Apache::lonhomework::type ne 'exam') {
+		    $optionlist='\framebox[5 mm][s]{\tiny\strut}';
+		} else {
+		    $optionlist='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';
+		}
+	    }
 	    my $option;
 	    foreach $option (sort(keys(%letter_name_map))) {
 		if ($option eq $last_letter) {
@@ -409,13 +418,12 @@ sub displayfoils {
 	    if ($target ne 'tex') {
 		$question.='<br />'.$optionlist.$text."\n";
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $question.=&Apache::optionresponse::webbubbles(\@Items,\@Items);
+		    $question.=&Apache::optionresponse::webbubbles(\@Items_letter,\@Items);
 		}
 	    } else {		
 		if ($Apache::lonhomework::type eq 'exam') {
 		    $question.=' '.$optionlist.$text."\n";
-		    $question.='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]'.&Apache::optionresponse::bubbles(\@Items,\@Items).'\end{enumerate}\strut ';
-		    &Apache::lonxml::increment_counter();
+		    $question.=&Apache::optionresponse::bubbles(\@Items_letter,\@Items).'\end{enumerate} \vskip -7 mm \strut ';
 	        } else {
 		    $question.=' \\\\ '.$optionlist.$text."\n";
 		}