--- loncom/homework/radiobuttonresponse.pm	2001/11/09 20:20:45	1.28
+++ loncom/homework/radiobuttonresponse.pm	2001/12/04 15:17:56	1.31
@@ -1,5 +1,30 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
+#
+# $Id: radiobuttonresponse.pm,v 1.31 2001/12/04 15:17:56 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # 2/21 Guy
 
 package Apache::radiobuttonresponse;
@@ -55,9 +80,12 @@ sub storesurvey {
   if ( defined $ENV{'form.submitted'}) {
     my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
     &Apache::lonxml::debug("Here I am!:$response:");
-    if ( $response =~ /[^\s]/) {
+    if ( $response =~ /[0-9]+/) {
       my $id = $Apache::inputtags::response['-1'];
-      $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
+      my @whichfoils=&whichfoils($max,$answer);
+      my %responsehash;
+      $responsehash{$whichfoil[$reponse]}=$response;
+      $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=&Apache::lonnet::hash2str(%responsehash);
       $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='SUBMITTED';
       &Apache::lonxml::debug("submitted a $response<br />\n");
     }
@@ -67,12 +95,12 @@ sub storesurvey {
 
 sub end_foilgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-  
+
   my $result;
   if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') {
-    my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval,'-2');
+    my $style = $Apache::lonhomework::type;
     if ( $style eq 'survey' ) {
-      if ($target eq 'web') {
+      if ($target eq 'web' || $target eq 'answer') {
 	$result=&displayallfoils();
       } elsif ( $target eq 'grade' ) {
 	$result=&storesurvey();
@@ -92,9 +120,12 @@ sub end_foilgroup {
       } elsif ( $target eq 'grade') {
 	if ( defined $ENV{'form.submitted'}) {
 	  my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
-	  if ( $response =~ /[^\s]/) {
+	  if ( $response =~ /[0-9]+/) {
 	    my $id = $Apache::inputtags::response['-1'];
-	    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
+	    my @whichfoils=&whichfoils($max,$answer);
+	    my %responsehash;
+	    $responsehash{$whichfoil[$reponse]}=$response;
+	    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=&Apache::lonnet::hash2str(%responsehash);
 	    &Apache::lonxml::debug("submitted a $response<br />\n");
 	    if ($response == $answer) {
 	      $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';