--- loncom/interface/lonnavmaps.pm	2006/04/10 21:55:48	1.377
+++ loncom/interface/lonnavmaps.pm	2006/04/29 17:57:29	1.379
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.377 2006/04/10 21:55:48 www Exp $
+# $Id: lonnavmaps.pm,v 1.379 2006/04/29 17:57:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -679,7 +679,7 @@ sub timeToHumanString {
 
 	if($format ne '') {
 	    my $timeStr = strftime($format, localtime($time));
-	    return $timeStr.&Apache::lonlocal::gettimezone();
+	    return $timeStr.&Apache::lonlocal::gettimezone($time);
 	}
 
         # Less then 5 days away, display day of the week and
@@ -690,7 +690,7 @@ sub timeToHumanString {
             $timeStr =~ s/12:00 am/00:00/;
             $timeStr =~ s/12:00 pm/noon/;
             return ($inPast ? "last " : "this ") .
-                $timeStr.&Apache::lonlocal::gettimezone();
+                $timeStr.&Apache::lonlocal::gettimezone($time);
         }
         
 	my $conjunction='on';
@@ -705,14 +705,14 @@ sub timeToHumanString {
             my $timeStr = strftime("$conjunction %A, %b %e at %I:%M %P", localtime($time));
             $timeStr =~ s/12:00 am/00:00/;
             $timeStr =~ s/12:00 pm/noon/;
-            return $timeStr.&Apache::lonlocal::gettimezone();
+            return $timeStr.&Apache::lonlocal::gettimezone($time);
         }
 
         # Not this year, so show the year
         my $timeStr = strftime("$conjunction %A, %b %e %Y at %I:%M %P", localtime($time));
         $timeStr =~ s/12:00 am/00:00/;
         $timeStr =~ s/12:00 pm/noon/;
-        return $timeStr.&Apache::lonlocal::gettimezone();
+        return $timeStr.&Apache::lonlocal::gettimezone($time);
     }
 }
 
@@ -4385,9 +4385,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 +4399,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);
                     }
                 }
             }