--- loncom/homework/radiobuttonresponse.pm	2001/12/04 15:17:56	1.31
+++ loncom/homework/radiobuttonresponse.pm	2001/12/14 23:00:52	1.33
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.31 2001/12/04 15:17:56 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.33 2001/12/14 23:00:52 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,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;
 }
 
@@ -77,22 +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 =~ /[0-9]+/) {
-      my $id = $Apache::inputtags::response['-1'];
-      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");
-    }
-  }
+  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)=@_;
 
@@ -118,22 +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 =~ /[0-9]+/) {
-	    my $id = $Apache::inputtags::response['-1'];
-	    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';
-	    } else {
-	      $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='INCORRECT';
-	    }
-	  }
-	}
+	&grade_response($max,$answer);
       }
     }
   }
@@ -166,10 +176,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++;
     }
@@ -231,9 +243,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++;
     }