[LON-CAPA-cvs] cvs: loncom /homework matchresponse.pm

[albertel]

albertel		Wed Mar 26 17:41:34 2003 EDT

  Modified files:              
    /loncom/homework	matchresponse.pm 
  Log:
  - reintegrating dleted changed from version 1.12
  
  
Index: loncom/homework/matchresponse.pm
diff -u loncom/homework/matchresponse.pm:1.14 loncom/homework/matchresponse.pm:1.15
--- loncom/homework/matchresponse.pm:1.14	Wed Mar 26 13:43:15 2003
+++ loncom/homework/matchresponse.pm	Wed Mar 26 17:41:34 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.14 2003/03/26 18:43:15 sakharuk Exp $
+# $Id: matchresponse.pm,v 1.15 2003/03/26 22:41:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,7 +34,6 @@
 use Apache::optionresponse;
 
 my $flag_for_exam_printing = 1;
-my @Items = ();
 
 BEGIN {
     &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
@@ -90,6 +89,7 @@
     my $result;
     %Apache::response::itemgroup=();
     %Apache::matchresponse::itemtable=();
+
     if ($target eq 'edit') {
 	$result=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::select_arg('Randomize Order:','randomize',
@@ -129,10 +129,9 @@
     foreach my $name (@names) {
 	$letter_name_map{$alphabet[$i]}=$name;
 	$name_letter_map{$name}=$alphabet[$i];
-	$Items[$i] = $alphabet[$i];
 	$i++;
     }
-     $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map;
+    $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map;
     $Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map;
     if ($target eq 'web') {
 	my $table='<table>';
@@ -387,7 +386,7 @@
 	my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
 	my %lastresponse=&Apache::lonnet::str2hash($lastresponse);    
 	my @alphabet=('A'..'Z');
-        my @Items_letter = splice @alphabet, 0, $#Items + 1;
+	my @used_letters=sort(keys(%letter_name_map));
 	foreach my $name (@whichfoils) {
 	    my $lastopt=$lastresponse{$name};
 	    my $last_letter=$name_letter_map{$lastopt};
@@ -400,7 +399,7 @@
 		}
 	    }
 	    my $option;
-	    foreach $option (sort(keys(%letter_name_map))) {
+	    foreach $option (@used_letters) {
 		if ($option eq $last_letter) {
 		    if ($target ne 'tex') {$optionlist.="<option selected=\"on\">$option</option>\n";}
 		} else {
@@ -416,14 +415,14 @@
 	    if ($target ne 'tex') {
 		$question.='<br />'.$optionlist.$text."\n";
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $question.=&Apache::optionresponse::webbubbles(\@Items_letter,\@Items);
+		    $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters);
 		}
 	    } else {		
 		if ($Apache::lonhomework::type eq 'exam') {
 		    $question.=' '.$optionlist.$text."\n";
 		    my @emptyItems = ();
 		    for (my $i=0;$i<=$#Items;$i++) {push @emptyItems, ' ';}
-		    $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@Items_letter,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut ';
+		    $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@empthItems).'}\end{enumerate}} \vskip -10 mm \strut ';
 	        } else {
 		    $question.=' \\\\ '.$optionlist.$text."\n";
 		}