--- loncom/homework/radiobuttonresponse.pm	2001/11/12 20:36:41	1.29
+++ loncom/homework/radiobuttonresponse.pm	2002/01/07 18:03:57	1.34
@@ -1,5 +1,30 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
+#
+# $Id: radiobuttonresponse.pm,v 1.34 2002/01/07 18:03:57 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;
@@ -40,6 +65,7 @@ sub end_radiobuttonresponse {
   if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
   &Apache::response::end_response;
   pop @Apache::lonxml::namespace;
+  &Apache::lonxml::deregister('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
   return $result;
 }
 
@@ -52,19 +78,46 @@ sub start_foilgroup {
 }
 
 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]/) {
-      my $id = $Apache::inputtags::response['-1'];
-      $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
-      $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='SUBMITTED';
-      &Apache::lonxml::debug("submitted a $response<br />\n");
-    }
-  }
+  if ( !defined($ENV{'form.submitted'})) { return ''; }
+  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'];
+  my @whichfoils=@{ $Apache::response::foilgroup{'names'} };
+  my %responsehash;
+  $responsehash{$whichfoils[$response]}=$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");
   return '';
 }
 
+sub grade_response {
+  my ($max,$answer)=@_;
+  if (!defined($ENV{'form.submitted'})) { return; }
+  my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
+  if ( $response !~ /[0-9]+/) { return; }
+  my $part=$Apache::inputtags::part;
+  my $id = $Apache::inputtags::response['-1'];
+  my @whichfoils=&whichfoils($max,$answer);
+  my %responsehash;
+  $responsehash{$whichfoils[$response]}=$response;
+  my $responsestr=&Apache::lonnet::hash2str(%responsehash);
+  my %previous=&Apache::response::check_for_previous($responsestr,
+						     $part,$id);
+  $Apache::lonhomework::results{"resource.$part.$id.submission"}=
+    $responsestr;
+  &Apache::lonxml::debug("submitted a $response<br />\n");
+  my $ad;
+  if ($response == $answer) {
+    $ad='EXACT_ANS';
+  } else {
+    $ad='INCORRECT';
+  }
+  $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
+  &Apache::response::handle_previous(\%previous,$ad);
+}
+
 sub end_foilgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
@@ -72,7 +125,7 @@ sub end_foilgroup {
   if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') {
     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();
@@ -90,19 +143,7 @@ sub end_foilgroup {
       } elsif ($target eq 'answer' ) {
 	$result=&displayanswers($max,$answer);
       } elsif ( $target eq 'grade') {
-	if ( defined $ENV{'form.submitted'}) {
-	  my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
-	  if ( $response =~ /[^\s]/) {
-	    my $id = $Apache::inputtags::response['-1'];
-	    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
-	    &Apache::lonxml::debug("submitted a $response<br />\n");
-	    if ($response == $answer) {
-	      $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';
-	    } else {
-	      $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='INCORRECT';
-	    }
-	  }
-	}
+	&grade_response($max,$answer);
       }
     }
   }
@@ -112,11 +153,13 @@ sub end_foilgroup {
 sub getfoilcounts {
   my ($parstack,$safeeval)=@_;
   my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
-  my @names = @{ $Apache::response::foilgroup{'names'} };
+  my @names;
   my $truecnt=0;
   my $falsecnt=0;
   my $name;
-
+  if ( $Apache::response::foilgroup{'names'} ) {
+    @names= @{ $Apache::response::foilgroup{'names'} };
+  }
   foreach $name (@names) {
     if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
       $truecnt++;
@@ -135,10 +178,12 @@ sub displayallfoils {
   my $id=$Apache::inputtags::response['-1'];
   my $part=$Apache::inputtags::part;
   my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
+  my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
+  &Apache::lonhomework::showhash(%lastresponse);
   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\" ";
-      if ($lastresponse eq $temp) { $result .= 'checked="on"'; }
+      if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
       $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
       $temp++;
     }
@@ -152,7 +197,10 @@ sub whichfoils {
   my @truelist;
   my @falselist;
 
-  my @names = @{ $Apache::response::foilgroup{'names'} };
+  my @names;
+  if ( $Apache::response::foilgroup{'names'} ) {
+    @names= @{ $Apache::response::foilgroup{'names'} };
+  }
   foreach my $name (@names) {
     #result.="<br /><b>$name</b> is <i> $Apache::response::foilgroup{$name.'.value'} </i>";
     if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
@@ -200,9 +248,10 @@ sub displayfoils {
     my $id=$Apache::inputtags::response['-1'];
     my $part=$Apache::inputtags::part;
     my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
+    my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
     foreach my $name (@whichfoils) {
        $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
-      if ($lastresponse eq $temp) { $result .= 'checked="on"'; }
+      if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
       $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
       $temp++;
     }
@@ -212,7 +261,6 @@ sub displayfoils {
 
 sub displayanswers {
   my ($max,$answer)=@_;
-  my @names = @{ $Apache::response::foilgroup{'names'} };
   my @whichopt = &whichfoils($max,$answer);
   my $result=&Apache::response::answer_header('radiobuttonresponse');
   foreach my $name (@whichopt) {