Diff for /loncom/interface/lonnavmaps.pm between versions 1.119 and 1.123

version 1.119, 2002/12/02 14:19:38 version 1.123, 2003/01/10 17:46:46
Line 274  sub real_handler { Line 274  sub real_handler {
     my $foundJump = ($jumpType == $NOTHING); # look for jump point if we have one      my $foundJump = ($jumpType == $NOTHING); # look for jump point if we have one
     my $looped = 0;       my $looped = 0; 
   
     $r->print($hereType);  
   
     # We only need to do this if we need to open the maps to show the      # 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      # current position. This will change the counter so we can't count
     # for the jump marker with this loop.      # for the jump marker with this loop.
     while ($depth > 0 && !$ENV{'form.alreadyHere'}) {      while ($depth > 0 && !$ENV{'form.alreadyHere'}) {
         if ($curRes == $mapIterator->BEGIN_MAP()) { $depth++; }          if ($curRes == $mapIterator->BEGIN_MAP()) { $depth++; }
         if ($curRes == $mapIterator->END_MAP()) { $depth--; }          if ($curRes == $mapIterator->END_MAP()) { $depth--; }
         $r->print($curRes . ' ');  
         if (ref($curRes) && !$ENV{'form.alreadyHere'} &&           if (ref($curRes) && !$ENV{'form.alreadyHere'} && 
             ($hereType == $SYMB && $curRes->symb() eq $here) ||              ($hereType == $SYMB && $curRes->symb() eq $here) ||
             (ref($curRes) && $hereType == $URL && $curRes->src() eq $here)) {              (ref($curRes) && $hereType == $URL && $curRes->src() eq $here)) {
Line 488  sub real_handler { Line 486  sub real_handler {
                     '"';                      '"';
   
                 my $title = $curRes->compTitle();                  my $title = $curRes->compTitle();
                   if ($src=~/^\/uploaded\//) {
       $nonLinkedText=$title;
                       $title='';
                   }
                 my $partLabel = "";                  my $partLabel = "";
                 my $newBranchText = "";                  my $newBranchText = "";
   
Line 983  sub new { Line 985  sub new {
         return undef;          return undef;
     }      }
   
     # Now copy the hashes for speed (?)      $self->{NAV_HASH} = \%navmaphash;
     my %realnav; my %realparm;      $self->{PARM_HASH} = \%parmhash;
     foreach (%navmaphash) { $realnav{$_} = $navmaphash{$_}; }  
     foreach (%parmhash) { $realparm{$_} = $navmaphash{$_}; }  
     $self->{NAV_HASH} = \%realnav;  
     $self->{PARM_HASH} = \%realparm;  
   
     bless($self);      bless($self);
     $self->untieHashes();      $self->untieHashes();

Removed from v.1.119  
changed lines
  Added in v.1.123


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>