--- loncom/interface/lonnavmaps.pm	2002/10/11 21:29:18	1.74
+++ loncom/interface/lonnavmaps.pm	2002/10/14 14:14:49	1.76
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.74 2002/10/11 21:29:18 bowersj2 Exp $
+# $Id: lonnavmaps.pm,v 1.76 2002/10/14 14:14:49 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -917,7 +917,13 @@ sub new_handle {
     my $currenturl = $ENV{'form.postdata'};
     $currenturl=~s/^http\:\/\///;
     $currenturl=~s/^[^\/]+//;
-    my $queryAdd = "postdata=" . &Apache::lonnet::escape($currenturl);
+    # alreadyHere allows us to only open the maps necessary to view
+    # the current location once, while at the same time remembering
+    # the current location. Without that check, the user would never
+    # be able to close those maps; the user would close it, and the
+    # currenturl scan would re-open it.
+    my $queryAdd = "postdata=" . &Apache::lonnet::escape($currenturl) .
+        "&alreadyHere=1";
 
     $r->print('<a href="navmaps?condition=1&filter=">Show All Resources</a><br /><br />');
 
@@ -935,7 +941,7 @@ sub new_handle {
     # loop should be obvious.
     # Here's a simple example of the iterator.
     # If there is a current resource
-    if ($currenturl) {
+    if ($currenturl && !$ENV{'form.alreadyHere'}) {
         # Give me every resource...
         my $mapIterator = $navmap->getIterator(undef, undef, {}, 1);
         my $found != 0;
@@ -1144,8 +1150,9 @@ sub new_handle {
 
                     # Special case in the navmaps: If in less then
                     # 24 hours, give it a bit of urgency
-                    if ($status == $curRes->OPEN() &&
-                        $curRes->duedate() < time()+(24*60*60)) {
+                    if ($status == $curRes->OPEN() && $curRes->duedate() &&
+                        $curRes->duedate() < time()+(24*60*60) && 
+                        $curRes->duedate() > time()) {
                         $color = $hurryUpColor;
                     }
                     if ($color ne "") {