--- loncom/homework/rankresponse.pm	2004/11/08 22:56:05	1.41
+++ loncom/homework/rankresponse.pm	2005/03/15 16:55:22	1.45
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # rank style response
 #
-# $Id: rankresponse.pm,v 1.41 2004/11/08 22:56:05 albertel Exp $
+# $Id: rankresponse.pm,v 1.45 2005/03/15 16:55:22 albertel Exp $
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -177,7 +177,7 @@ sub displayanswers {
 
 sub check_response_order {
     my (%responsehash)=@_;
-    my @order=sort(values(%responsehash));
+    my @order=sort( {$a <=> $b} values(%responsehash));
     my $lastvalue=0;
     my $expected=1;
     my $malformed=0;
@@ -195,7 +195,7 @@ sub check_response_order {
 sub grade_response {
     my ($max,$randomize,$tol)=@_;
     my (@whichfoils)=&whichfoils($max,$randomize);
-    if (!defined($ENV{'form.submitted'})) { return; }
+    if (!&Apache::response::submitted()) { return; }
     my %responsehash;
     my %grade;
     my ($temp,$right,$wrong,$ignored)=(1,0,0,0);
@@ -419,10 +419,16 @@ 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:");
-	    if (!$name) { $name=$Apache::lonxml::curdepth; }
+	    if (!$name) {
+		&Apache::lonxml::error("Foils without names exist. This can cause problems to malfunction.");
+		$name=$Apache::lonxml::curdepth;
+	    }
 	    &Apache::lonxml::debug("Using a name of :$name:");
 	    if (defined($Apache::response::foilnames{$name})) {
 		&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
@@ -434,24 +440,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;
 	    }
 	}