--- loncom/interface/lonnavmaps.pm	2004/06/15 15:50:03	1.262
+++ loncom/interface/lonnavmaps.pm	2004/06/29 22:32:11	1.264
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.262 2004/06/15 15:50:03 www Exp $
+# $Id: lonnavmaps.pm,v 1.264 2004/06/29 22:32:11 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3246,10 +3246,10 @@ sub is_sequence {
 sub is_survey {
     my $self = shift();
     my $part = shift();
-    if ($self->src() =~ /\.(survey)$/) {
+    if ($self->parmval('type',$part) eq 'survey') {
         return 1;
     }
-    if ($self->parmval('type',$part) eq 'survey') {
+    if ($self->src() =~ /\.(survey)$/) {
         return 1;
     }
     return 0;
@@ -3735,6 +3735,20 @@ sub extractParts {
                 }
             }
         }
+	my $resorder = &Apache::lonnet::metadata($self->src(),'responseorder');
+	if ($resorder) {
+	    my @resorder=split(/,/,$resorder);
+	    foreach my $part (keys(%responseIdHash)) {
+		my %resids = map { ($_,1) } @{ $responseIdHash{$part} };
+		my @neworder;
+		foreach my $possibleid (@resorder) {
+		    if (exists($resids{$possibleid})) {
+			push(@neworder,$possibleid);
+		    }
+		}
+		$responseIdHash{$part}=\@neworder;	
+	    }
+	}
         $self->{RESPONSE_IDS} = \%responseIdHash;
         $self->{RESPONSE_TYPES} = \%responseTypeHash;
     }