--- loncom/interface/lonnavmaps.pm	2003/09/20 13:21:45	1.231
+++ loncom/interface/lonnavmaps.pm	2003/09/30 15:37:18	1.236
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.231 2003/09/20 13:21:45 www Exp $
+# $Id: lonnavmaps.pm,v 1.236 2003/09/30 15:37:18 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -107,9 +107,9 @@ sub real_handler {
     # Handle header-only request
     if ($r->header_only) {
         if ($ENV{'browser.mathml'}) {
-            $r->content_type('text/xml');
+            &Apache::loncommon::content_type($r,'text/xml');
         } else {
-            $r->content_type('text/html');
+            &Apache::loncommon::content_type($r,'text/html');
         }
         $r->send_http_header;
         return OK;
@@ -117,9 +117,9 @@ sub real_handler {
 
     # Send header, don't cache this page
     if ($ENV{'browser.mathml'}) {
-        $r->content_type('text/xml');
+        &Apache::loncommon::content_type($r,'text/xml');
     } else {
-        $r->content_type('text/html');
+        &Apache::loncommon::content_type($r,'text/html');
     }
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
@@ -127,7 +127,6 @@ sub real_handler {
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new();
 
-
     if (!defined($navmap)) {
         my $requrl = $r->uri;
         $ENV{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";
@@ -3369,7 +3368,7 @@ sub opendate {
 }
 sub problemstatus {
     (my $self, my $part) = @_;
-    return $self->parmval("problemstatus", $part);
+    return lc $self->parmval("problemstatus", $part);
 }
 sub sig {
     (my $self, my $part) = @_;
@@ -3547,7 +3546,11 @@ sub responseType {
     my $part = shift;
 
     $self->extractParts();
-    return $self->{RESPONSE_TYPES}->{$part};
+    if (defined($self->{RESPONSE_TYPES}->{$part})) {
+	return @{$self->{RESPONSE_TYPES}->{$part}};
+    } else {
+	return undef;
+    }
 }
 
 sub responseIds {
@@ -3555,7 +3558,11 @@ sub responseIds {
     my $part = shift;
 
     $self->extractParts();
-    return $self->{RESPONSE_IDS}->{$part};
+    if (defined($self->{RESPONSE_IDS}->{$part})) {
+	return @{$self->{RESPONSE_IDS}->{$part}};
+    } else {
+	return undef;
+    }
 }
 
 # Private function: Extracts the parts information, both part names and
@@ -3629,8 +3636,7 @@ sub extractParts {
                         my @otherChunks = @partChunks[$i+1..$#partChunks];
                         my $responseId = join('_', @otherChunks);
                         push @{$responseIdHash{$partIdSoFar}}, $responseId;
-                        $responseTypeHash{$partIdSoFar} = $responseType;
-                        last;
+                        push @{$responseTypeHash{$partIdSoFar}}, $responseType;
                     }
                 }
             }
@@ -3948,7 +3954,12 @@ sub status {
     #if ($self->{RESOURCE_ERROR}) { return NETWORK_FAILURE; }
     if ($completionStatus == NETWORK_FAILURE) { return NETWORK_FAILURE; }
 
-    my $suppressFeedback = lc($self->parmval("problemstatus", $part)) eq 'no';
+    my $suppressFeedback = $self->problemstatus($part) eq 'no';
+    # If there's an answer date and we're past it, don't
+    # suppress the feedback; student should know
+    if ($self->answerdate($part) && $self->answerdate($part) < time()) {
+	$suppressFeedback = 0;
+    }
 
     # There are a few whole rows we can dispose of:
     if ($completionStatus == CORRECT ||