--- loncom/interface/lonnavmaps.pm	2004/07/26 22:22:03	1.267.2.1
+++ loncom/interface/lonnavmaps.pm	2004/09/20 15:26:04	1.267.2.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.267.2.1 2004/07/26 22:22:03 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.267.2.5 2004/09/20 15:26:04 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -513,7 +513,7 @@ sub timeToHumanString {
         }
 
         # Not this year, so show the year
-        my $timeStr = strftime("on %A, %b %e %G at %I:%M %P", localtime($time));
+        my $timeStr = strftime("on %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;
@@ -1260,7 +1260,7 @@ sub render {
         # We only need to do this if we need to open the maps to show the
         # current position. This will change the counter so we can't count
         # for the jump marker with this loop.
-        while (($curRes = $mapIterator->next()) && !$found) {
+        while ($here && ($curRes = $mapIterator->next()) && !$found) {
             if (ref($curRes) && $curRes->symb() eq $here) {
                 my $mapStack = $mapIterator->getStack();
                 
@@ -3982,6 +3982,7 @@ sub getCompletionStatus {
 
     # Left as separate if statements in case we ever do more with this
     if ($status eq 'correct_by_student') {return $self->CORRECT;}
+    if ($status eq 'correct_by_scantron') {return $self->CORRECT;}
     if ($status eq 'correct_by_override') {return $self->CORRECT_BY_OVERRIDE; }
     if ($status eq 'incorrect_attempted') {return $self->INCORRECT; }
     if ($status eq 'incorrect_by_override') {return $self->INCORRECT_BY_OVERRIDE; }
@@ -4132,7 +4133,7 @@ sub status {
 
     if ($dateStatus == PAST_DUE_ANSWER_LATER ||
         $dateStatus == PAST_DUE_NO_ANSWER ) {
-        return $suppressFeedback ? ANSWER_SUBMITTED ? $dateStatus; 
+        return $suppressFeedback ? ANSWER_SUBMITTED : $dateStatus; 
     }
 
     if ($dateStatus == ANSWER_OPEN) {