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

[raeburn]

raeburn		Mon Jan 20 01:39:33 2014 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm 
  Log:
  - Reverse change in rev. 1.485, which was an artifact of debugging.
    by reinstate part of changes in 1.484.
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.499 loncom/interface/lonnavmaps.pm:1.500
--- loncom/interface/lonnavmaps.pm:1.499	Sun Jan 19 21:17:04 2014
+++ loncom/interface/lonnavmaps.pm	Mon Jan 20 01:39:33 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.499 2014/01/19 21:17:04 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.500 2014/01/20 01:39:33 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -2118,9 +2118,7 @@
 
     $self->{PARM_HASH} = \%parm_hash;
 
-
-    
-} 
+}
 
 sub generate_course_user_opt {
     my $self = shift;
@@ -3329,15 +3327,11 @@
     if ($resourceCount == 1 && $resource->is_sequence() && !$self->{FORCE_TOP}) { 
         my $firstResource = $resource->map_start();
         my $finishResource = $resource->map_finish();
-	my $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.