--- loncom/homework/rankresponse.pm	2004/09/03 18:35:52	1.37
+++ loncom/homework/rankresponse.pm	2004/12/04 00:41:26	1.42
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # rank style response
 #
-# $Id: rankresponse.pm,v 1.37 2004/09/03 18:35:52 albertel Exp $
+# $Id: rankresponse.pm,v 1.42 2004/12/04 00:41:26 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,8 +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) {
-	# get response returns a=>0, when we want a=>1
-	my $response = &Apache::response::getresponse($temp)+1;
+	my $response = &Apache::response::getresponse($temp,'A is 1');
 	my $value=shift(@correctorder);
 	if ( $response =~ /[^\s]/) {
 	    $responsehash{$name}=$response;
@@ -236,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);
 }
@@ -377,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';
@@ -409,6 +419,9 @@ sub end_foil {
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'tex' || $target eq 'analyze') {
 	my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
+	if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
+	    $text='\vskip 5mm $\triangleright$ '.$text;
+	}
 	if ($value ne 'unused') {
 	    my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
 	    &Apache::lonxml::debug("Got a name of :$name:");
@@ -424,24 +437,12 @@ sub end_foil {
 		 && !&Apache::response::showallfoils() ) {
 		push @{ $Apache::response::conceptgroup{'names'} }, $name;
 		$Apache::response::conceptgroup{"$name.value"} = $value;
-		if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
-		    $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
-		} else {
-		    $Apache::response::conceptgroup{"$name.text"} = $text;
-		}
+		$Apache::response::conceptgroup{"$name.text"} = $text;
 		$Apache::response::conceptgroup{"$name.location"} = $location;
 	    } else {
 		push @{ $Apache::response::foilgroup{'names'} }, $name;
 		$Apache::response::foilgroup{"$name.value"} = $value;
-		if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
-		    $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
-		} else {
-		    if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
-			$Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;
-		    } else {
-			$Apache::response::foilgroup{"$name.text"} = $text;
-		    } 
-		}
+		$Apache::response::foilgroup{"$name.text"} = $text;
 		$Apache::response::foilgroup{"$name.location"} = $location;
 	    }
 	}