[LON-CAPA-cvs] cvs: loncom /interface lonnavmaps.pm

bowersj2 lon-capa-cvs@mail.lon-capa.org
Mon, 02 Dec 2002 14:19:38 -0000


bowersj2		Mon Dec  2 09:19:38 2002 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm 
  Log:
  I don't know why this is necessary, but it is. Prevents a crashw
  when first entering nav maps on this one course I have.
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.118 loncom/interface/lonnavmaps.pm:1.119
--- loncom/interface/lonnavmaps.pm:1.118	Mon Dec  2 09:04:52 2002
+++ loncom/interface/lonnavmaps.pm	Mon Dec  2 09:19:38 2002
@@ -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.119 2002/12/02 14:19:38 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -274,15 +274,18 @@
     my $foundJump = ($jumpType == $NOTHING); # look for jump point if we have one
     my $looped = 0; 
 
+    $r->print($hereType);
+
     # 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 ($depth > 0 && !$ENV{'form.alreadyHere'}) {
         if ($curRes == $mapIterator->BEGIN_MAP()) { $depth++; }
         if ($curRes == $mapIterator->END_MAP()) { $depth--; }
+        $r->print($curRes . ' ');
         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