--- loncom/homework/radiobuttonresponse.pm	2003/04/04 23:35:17	1.65
+++ loncom/homework/radiobuttonresponse.pm	2003/04/18 06:26:43	1.69
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.65 2003/04/04 23:35:17 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.69 2003/04/18 06:26:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -93,7 +93,7 @@ sub start_foilgroup {
 
 sub storesurvey {
   if ( !defined($ENV{'form.submitted'})) { return ''; }
-  my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
+  my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1']};
   &Apache::lonxml::debug("Here I am!:$response:");
   if ( $response !~ /[0-9]+/) { return ''; }
   my $id = $Apache::inputtags::response['-1'];
@@ -113,14 +113,9 @@ sub grade_response {
   if (!defined($ENV{'form.submitted'})) { return; }
   my $response;
   if ($ENV{'form.submitted'} eq 'scantron') {
-      my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,
-		      'H'=>7,'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,
-		      'O'=>14,'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,
-		      'V'=>21,'W'=>22,'X'=>23,'Y'=>24,'Z'=>25);
-      $response = $ENV{'scantron.'.$Apache::lonxml::counter.'.answer'};
-      $response = $let_to_num{$response};
+      $response=&Apache::response::getresponse();
   } else {
-      $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
+      $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1']};
   }
   if ( $response !~ /[0-9]+/) { return; }
   my $part=$Apache::inputtags::part;
@@ -169,9 +164,7 @@ sub end_foilgroup {
       }
     }
   }
-  if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
-      &Apache::lonxml::increment_counter();
-  }
+  &Apache::lonxml::increment_counter();
   return $result;
 }
 
@@ -218,7 +211,7 @@ sub displayallfoils {
   } else {
     foreach my $name (@names) {
       if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
-	$result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
+	$result.="<br /><input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";
 	if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
 	$result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
 	$temp++;
@@ -391,9 +384,7 @@ sub displayfoils {
     my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
     foreach my $name (@whichfoils) {
       if ($target ne 'tex') {
-          my $ValueForInput;
-	  if ($Apache::lonhomework::type ne 'exam') {$ValueForInput=$temp;} else {$ValueForInput=$alphabet[$temp];}
-	  $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$ValueForInput\" ";
+	  $result.="<br /><input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";
 	  if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
 	  $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
       } else {