--- loncom/homework/rankresponse.pm	2004/08/25 19:38:58	1.35
+++ loncom/homework/rankresponse.pm	2004/11/08 22:56:05	1.41
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # rank style response
 #
-# $Id: rankresponse.pm,v 1.35 2004/08/25 19:38:58 sakharuk Exp $
+# $Id: rankresponse.pm,v 1.41 2004/11/08 22:56:05 albertel Exp $
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -113,6 +113,9 @@ sub end_foilgroup {
 	    my @shown = &whichfoils($max,$randomize);
 	    &Apache::response::analyze_store_foilgroup(\@shown,
 						  ['text','value','location']);
+	    my $part_id=
+		"$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+	    $Apache::lonhomework::analyze{"$part_id.tol"}=$tol;
 	}
 	&Apache::lonxml::increment_counter(&getfoilcounts($max));
     } elsif ($target eq 'edit') {
@@ -198,7 +201,7 @@ sub grade_response {
     my ($temp,$right,$wrong,$ignored)=(1,0,0,0);
     my @correctorder=&get_correct_order($tol,@whichfoils);
     foreach my $name (@whichfoils) {
-	my $response = &Apache::response::getresponse($temp);
+	my $response = &Apache::response::getresponse($temp,'A is 1');
 	my $value=shift(@correctorder);
 	if ( $response =~ /[^\s]/) {
 	    $responsehash{$name}=$response;
@@ -235,9 +238,14 @@ sub grade_response {
 	    $ad='MISSING_ANSWER';
 	}
     }
+    if ($Apache::lonhomework::type eq 'survey' &&
+	($ad eq 'INCORRECT' || $ad eq 'EXACT_ANS') ) {
+	$ad='SUBMITTED';
+    } else {
+	$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
+    }
     $Apache::lonhomework::results{"resource.$part.$id.submission"}=
 	$responsestr;
-    $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
     $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
     &Apache::response::handle_previous(\%previous,$ad);
 }
@@ -300,7 +308,7 @@ sub displayfoils {
 	    } else {
 		if ($Apache::lonhomework::type eq 'exam') {
 		    $result.='\vskip 0 mm   '.$text.' \vskip 0 mm '."\n";
-		    $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@alp,\@whichopt,'rankresponce').'\end{enumerate} \vskip -8 mm \strut ';
+		    $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@alp,\@whichopt,'rankresponse').'\end{enumerate} \vskip -8 mm \strut ';
 		    $internal_counter++;
 		} else {
 		    $result.=' \vskip 0mm \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
@@ -376,6 +384,9 @@ sub start_foil {
     my $result='';
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
 	&Apache::lonxml::startredirection;
+	if ($target eq 'analyze') {
+	    &Apache::response::check_if_computed($token,$parstack,$safeeval,'value');
+	}
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::tag_start($target,$token,"Foil");
 	my $level='-2';