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

[sakharuk]

sakharuk		Tue Jul  1 16:13:30 2003 EDT

  Modified files:              
    /loncom/homework	matchresponse.pm 
  Log:
  Bug 1667 is fixed. Internal counter (works only for bubblesheet LaTeX exams) is
  implemented.
  
  
  
Index: loncom/homework/matchresponse.pm
diff -u loncom/homework/matchresponse.pm:1.19 loncom/homework/matchresponse.pm:1.20
--- loncom/homework/matchresponse.pm:1.19	Mon Jun 30 16:23:33 2003
+++ loncom/homework/matchresponse.pm	Tue Jul  1 16:13:30 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.19 2003/06/30 20:23:33 sakharuk Exp $
+# $Id: matchresponse.pm,v 1.20 2003/07/01 20:13:30 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -248,6 +248,7 @@
 	} elsif ( $target eq 'grade') {
 	    &grade_response($max,$randomize);
 	}
+	&Apache::lonxml::increment_counter(&getfoilcounts($max));
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::end_table();
     }
@@ -389,6 +390,7 @@
 	my %lastresponse=&Apache::lonnet::str2hash($lastresponse);    
 	my @alphabet=('A'..'Z');
 	my @used_letters=sort(keys(%letter_name_map));
+	my $internal_counter=$Apache::lonxml::counter;
 	foreach my $name (@whichfoils) {
 	    my $lastopt=$lastresponse{$name};
 	    my $last_letter=$name_letter_map{$lastopt};
@@ -428,7 +430,8 @@
 		    $question.=' '.$optionlist.$text."\n";
 		    my @emptyItems = ();
 		    for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
-		    $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut ';
+		    $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut ';
+		    $internal_counter++;
 	        } else {
 		    $question.=' \\\\ '.$optionlist.$text."\n";
 		}