--- loncom/homework/matchresponse.pm	2003/07/01 20:13:30	1.20
+++ loncom/homework/matchresponse.pm	2003/10/15 19:52:53	1.20.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.20 2003/07/01 20:13:30 sakharuk Exp $
+# $Id: matchresponse.pm,v 1.20.2.2 2003/10/15 19:52:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -295,7 +295,7 @@ sub grade_response {
 	    %{ $Apache::response::itemgroup{'letter_name_map'} };
     }
     foreach my $name (@whichfoils) {
-	my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
+	my $response = &Apache::response::getresponse($temp);
 	my $responsename = $letter_name_map{$response};
 	$responsehash{$name}=$responsename;
 	my $value=$Apache::response::foilgroup{$name.'.value'};
@@ -370,7 +370,7 @@ sub displayfoils {
 	%name_letter_map=
 	    %{ $Apache::response::itemgroup{'name_letter_map'} };
     }
-    if (($solved =~ /^correct/) || ($status eq  'SHOW_ANSWER')) {
+    if ( &Apache::response::show_answer() ) {
 	foreach my $name (@whichfoils) {
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
 	    my $value=$Apache::response::foilgroup{$name.'.value'};
@@ -423,7 +423,7 @@ sub displayfoils {
 		    $question.='<br />'.$text."\n";
 		}
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters,$temp);
+		    $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters,$temp,$last_letter);
 		}
 	    } else {		
 		if ($Apache::lonhomework::type eq 'exam') {