--- loncom/interface/lonnavmaps.pm	2002/12/02 14:04:52	1.118
+++ loncom/interface/lonnavmaps.pm	2003/01/10 17:46:46	1.123
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.118 2002/12/02 14:04:52 bowersj2 Exp $
+# $Id: lonnavmaps.pm,v 1.123 2003/01/10 17:46:46 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -280,9 +280,10 @@ sub real_handler {
     while ($depth > 0 && !$ENV{'form.alreadyHere'}) {
         if ($curRes == $mapIterator->BEGIN_MAP()) { $depth++; }
         if ($curRes == $mapIterator->END_MAP()) { $depth--; }
+
         if (ref($curRes) && !$ENV{'form.alreadyHere'} && 
             ($hereType == $SYMB && $curRes->symb() eq $here) ||
-            ($hereType == $URL && $curRes->src() eq $here)) {
+            (ref($curRes) && $hereType == $URL && $curRes->src() eq $here)) {
             my $mapStack = $mapIterator->getStack();
             
             # Ensure the parent maps are open
@@ -485,6 +486,10 @@ sub real_handler {
                     '"';
 
                 my $title = $curRes->compTitle();
+                if ($src=~/^\/uploaded\//) {
+		    $nonLinkedText=$title;
+                    $title='';
+                }
                 my $partLabel = "";
                 my $newBranchText = "";
 
@@ -980,12 +985,8 @@ sub new {
         return undef;
     }
 
-    # Now copy the hashes for speed (?)
-    my %realnav; my %realparm;
-    foreach (%navmaphash) { $realnav{$_} = $navmaphash{$_}; }
-    foreach (%parmhash) { $realparm{$_} = $navmaphash{$_}; }
-    $self->{NAV_HASH} = \%realnav;
-    $self->{PARM_HASH} = \%realparm;
+    $self->{NAV_HASH} = \%navmaphash;
+    $self->{PARM_HASH} = \%parmhash;
 
     bless($self);
     $self->untieHashes();