--- loncom/homework/radiobuttonresponse.pm	2003/04/02 15:09:00	1.64
+++ loncom/homework/radiobuttonresponse.pm	2003/04/04 23:35:17	1.65
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.64 2003/04/02 15:09:00 sakharuk Exp $
+# $Id: radiobuttonresponse.pm,v 1.65 2003/04/04 23:35:17 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -87,7 +87,6 @@ sub start_foilgroup {
   &Apache::response::setrandomnumber();
   if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
       $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';
-      &Apache::lonxml::increment_counter();
   }
   return $result;
 }
@@ -112,7 +111,17 @@ sub grade_response {
   #keep the random numbers the same must always call this
   my ($answer,@whichfoils)=&whichfoils($max,$randomize);
   if (!defined($ENV{'form.submitted'})) { return; }
-  my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
+  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};
+  } else {
+      $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
+  }
   if ( $response !~ /[0-9]+/) { return; }
   my $part=$Apache::inputtags::part;
   my $id = $Apache::inputtags::response['-1'];
@@ -160,6 +169,9 @@ sub end_foilgroup {
       }
     }
   }
+  if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
+      &Apache::lonxml::increment_counter();
+  }
   return $result;
 }