--- loncom/interface/lonnavmaps.pm	2006/04/20 04:30:11	1.378
+++ loncom/interface/lonnavmaps.pm	2006/05/11 23:51:36	1.381
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.378 2006/04/20 04:30:11 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.381 2006/05/11 23:51:36 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3830,7 +3830,6 @@ sub contains_problem {
 }
 sub is_sequence {
     my $self=shift;
-    my $src = $self->src();
     return $self->navHash("is_map_", 1) && 
 	$self->navHash("map_type_" . $self->map_pc()) eq 'sequence';
 }
@@ -3905,7 +3904,7 @@ Returns a string with the type of the ma
 sub map_finish {
     my $self = shift;
     my $src = $self->src();
-    $src = Apache::lonnet::clutter($src);
+    $src = &Apache::lonnet::clutter($src);
     my $res = $self->navHash("map_finish_$src", 0);
     $res = $self->{NAV_MAP}->getById($res);
     return $res;
@@ -3918,7 +3917,7 @@ sub map_pc {
 sub map_start {
     my $self = shift;
     my $src = $self->src();
-    $src = Apache::lonnet::clutter($src);
+    $src = &Apache::lonnet::clutter($src);
     my $res = $self->navHash("map_start_$src", 0);
     $res = $self->{NAV_MAP}->getById($res);
     return $res;
@@ -4385,9 +4384,9 @@ sub extractParts {
         # So we have to use our knowlege of part names to figure out 
         # where the part names begin and end, and even then, it is possible
         # to construct ambiguous situations.
-        foreach (split /,/, $metadata) {
-            if ($_ =~ /^([a-zA-Z]+)response_(.*)/
-		|| $_ =~ /^(Task)_(.*)/) {
+        foreach my $data (split /,/, $metadata) {
+            if ($data =~ /^([a-zA-Z]+)response_(.*)/
+		|| $data =~ /^(Task)_(.*)/) {
                 my $responseType = $1;
                 my $partStuff = $2;
                 my $partIdSoFar = '';
@@ -4399,8 +4398,15 @@ sub extractParts {
                     if ($parts{$partIdSoFar}) {
                         my @otherChunks = @partChunks[$i+1..$#partChunks];
                         my $responseId = join('_', @otherChunks);
-                        push @{$responseIdHash{$partIdSoFar}}, $responseId;
-                        push @{$responseTypeHash{$partIdSoFar}}, $responseType;
+			if ($self->is_task()) {
+			    push(@{$responseIdHash{$partIdSoFar}},
+				 $partIdSoFar);
+			} else {
+			    push(@{$responseIdHash{$partIdSoFar}},
+				 $responseId);
+			}
+                        push(@{$responseTypeHash{$partIdSoFar}},
+			     $responseType);
                     }
                 }
             }