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

[raeburn]

raeburn		Mon May  7 19:43:45 2012 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm 
  Log:
  - Reverse changes in rev. 1.470 which were for debugging and/or 
    white space changes only.
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.483 loncom/interface/lonnavmaps.pm:1.484
--- loncom/interface/lonnavmaps.pm:1.483	Mon May  7 13:47:37 2012
+++ loncom/interface/lonnavmaps.pm	Mon May  7 19:43:44 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.483 2012/05/07 13:47:37 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.484 2012/05/07 19:43:44 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1398,7 +1398,6 @@
         }
     }
 
-
     # (re-)Locate the jump point, if any
     # Note this does not take filtering or hidden into account... need
     # to be fixed?
@@ -1655,7 +1654,6 @@
 	    $curRes = shift(@resources);
 	} else {
 	    $curRes = $it->next($closeAllPages);
-
 	}
 	if (!$curRes) { last; }
 
@@ -2026,7 +2024,7 @@
     # assume there are course hashes for the specific requested user at domamin:
     #
 
-    if ( ($self->{USERNAME} eq $env{'user.name'}) && ($self->{DOMAIN} eq $env{'user.domain'})) {
+    if (($self->{USERNAME} eq $env{'user.name'}) && ($self->{DOMAIN} eq $env{'user.domain'})) {
 	
 	# tie the nav hash
 	
@@ -2052,8 +2050,6 @@
 	$self->change_user($self->{USERNAME}, $self->{DOMAIN});
     }
 
-    my $d = Data::Dumper->new([$self]);
-
     return $self;
 }
 
@@ -2105,7 +2101,6 @@
     }
 
     $self->{PARM_HASH} = \%parm_hash;
-   
 
 
     
@@ -3099,15 +3094,12 @@
         my $firstResource = $resource->map_start();
         my $finishResource = $resource->map_finish();
 	my $result;
-	my $rdump  = Data::Dumper->new([$result]);
-	$result =  Apache::lonnavmaps::iterator->new($self->{NAV_MAP}, $firstResource,
-						     $finishResource, $self->{FILTER},
-						     $self->{ALREADY_SEEN}, 
-						     $self->{CONDITION},
-						     $self->{FORCE_TOP});
-	return $result;
-           
-        
+	return
+	    Apache::lonnavmaps::iterator->new($self->{NAV_MAP}, $firstResource,
+					      $finishResource, $self->{FILTER},
+					      $self->{ALREADY_SEEN}, 
+					      $self->{CONDITION},
+					      $self->{FORCE_TOP});
     }
 
     # Set up some bookkeeping information.
@@ -3126,8 +3118,6 @@
     $self->{ALREADY_SEEN}->{$self->{FIRST_RESOURCE}->{ID}} = 1;
 
     bless ($self);
-    my $selfDump = Data::Dumper->new([$self]);
-
     return $self;
 }
 
@@ -3143,7 +3133,6 @@
     if ($self->{RETURN_0} && !$self->{HAVE_RETURNED_0}) {
         $self->{HAVE_RETURNED_0} = 1;
 	my $nextTopLevel = $self->{NAV_MAP}->getById('0.0');
-
         return $self->{NAV_MAP}->getById('0.0');
     }
     if ($self->{RETURN_0} && !$self->{HAVE_RETURNED_0_BEGIN_MAP}) {
@@ -3169,7 +3158,6 @@
     if (defined($self->{FORCE_NEXT})) {
         my $tmp = $self->{FORCE_NEXT};
         $self->{FORCE_NEXT} = undef;
-
         return $tmp;
     }
 
@@ -3291,8 +3279,6 @@
         return $self->next($closeAllPages);
     }
 
-    my $hereResource = $self->{HERE};
-
     return $self->{HERE};
 
 }
@@ -3459,7 +3445,6 @@
     my $nextUnfiltered;
     if ($self->{DIRECTION} == FORWARD()) {
         $nextUnfiltered = $self->{HERE}->getNext();
-
     } else {
         $nextUnfiltered = $self->{HERE}->getPrevious();
     }