--- loncom/interface/lonnavmaps.pm	2003/01/13 22:41:20	1.126
+++ loncom/interface/lonnavmaps.pm	2003/03/20 22:30:38	1.129.2.3
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.126 2003/01/13 22:41:20 bowersj2 Exp $
+# $Id: lonnavmaps.pm,v 1.129.2.3 2003/03/20 22:30:38 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -273,12 +273,6 @@ sub real_handler {
     $mapIterator->next(); # discard the first BEGIN_MAP
     my $curRes = $mapIterator->next();
     my $counter = 0;
-<<<<<<< lonnavmaps.pm
-
-    # We only need to do this if we need to open the maps to show the
-    # current position
-    while ($depth > 0 && !$ENV{'form.alreadyHere'}) {
-=======
     my $foundJump = ($jumpType == $NOTHING); # look for jump point if we have one
     my $looped = 0; 
 
@@ -286,7 +280,6 @@ sub real_handler {
     # 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'}) {
->>>>>>> 1.122
         if ($curRes == $mapIterator->BEGIN_MAP()) { $depth++; }
         if ($curRes == $mapIterator->END_MAP()) { $depth--; }
 
@@ -305,9 +298,6 @@ sub real_handler {
             }
             $ENV{'form.alreadyHere'} = 1;
         }
-<<<<<<< lonnavmaps.pm
-            
-=======
         $looped = 1;
 
         $curRes = $mapIterator->next();
@@ -337,7 +327,6 @@ sub real_handler {
             $foundJump = 1;
         }
 
->>>>>>> 1.122
         $curRes = $mapIterator->next();
     }
     
@@ -414,13 +403,13 @@ sub real_handler {
                     # just display first
                     if (!$curRes->opendate("0")) {
                         # no parts are open, display as one part
-                        @parts = ("0");
+                        @parts = ();
                         $condensed = 1;
                     } else {
                         # Otherwise, only display part 0 if we want to 
                         # attach feedback or email information to it
                         if ($curRes->hasDiscussion() || $curRes->getFeedback()) {
-                            shift @parts;
+                            #shift @parts;
                         } else {
                             # Now, we decide whether to condense the
                             # parts due to similarity
@@ -452,23 +441,19 @@ sub real_handler {
                             if (($statusAllSame && defined($condenseStatuses{$status})) ||
                                 ($dueAllSame && $status == $curRes->OPEN && $statusAllSame)||
                                 ($openAllSame && $status == $curRes->OPEN_LATER && $statusAllSame) ){
-                                @parts = ($parts[1]);
+                                @parts = ();
                                 $condensed = 1;
                             }
                         }
                     }
                 }
 
-            } else {
-                $parts[0] = "0"; # this is to get past foreach loop below
-                 # you can consider a non-problem resource as a resource
-                  # with only one part without loss, and it simplifies the looping
             }
 
             # Is it a multipart problem with a single part, now in 
             # @parts with "0" filtered out? If so, 'forget' it's a multi-part
             # problem and treat it like a single-part problem.
-            if ( scalar(@parts) == 1 ) {
+            if ( scalar(@parts) == 0 ) {
                 $multipart = 0;
             }
 
@@ -477,13 +462,16 @@ sub real_handler {
             # status, but if it's multipart, we're lost, since we can't
             # retreive the metadata to count the parts
             if ($curRes->{RESOURCE_ERROR}) {
-                @parts = ("0");
+                @parts = ();
             }
 
             # Step Two: Print the actual data.
 
             # For each part we intend to display...
-            foreach my $part (@parts) {
+            foreach my $part ('', @parts) {
+                if ($part eq '0') {
+                    next;
+                }
 
                 my $nonLinkedText = ""; # unlinked stuff after title
                 
@@ -518,7 +506,7 @@ sub real_handler {
 
                 my $icon = "<img src=\"/adm/lonIcons/html.gif\" alt=\"\" border=\"0\" />";
                 if ($curRes->is_problem()) { 
-                    if ($part eq "0" || $condensed) {
+                    if ($part eq "" || $condensed) {
                         $icon = '<img src="/adm/lonIcons/problem.gif" alt="" border=\"0\" />'; 
                     } else {
                         $icon = $indentString;
@@ -595,11 +583,11 @@ sub real_handler {
                     $displayedHereMarker = 1;
                 }
 
-                if ($curRes->is_problem() && $part ne "0" && !$condensed) { 
+                if ($curRes->is_problem() && $part ne "" && !$condensed) { 
                     $partLabel = " (Part $part)"; 
                     $title = "";
                 }
-                if ($multipart && $condensed) {
+                if ($condensed && $curRes->countParts() > 1) {
                     $nonLinkedText .= ' (' . $curRes->countParts() . ' parts)';
                 }
 
@@ -699,7 +687,7 @@ sub real_handler {
 
     $navmap->untieHashes();
 
-    $r->print("<h1>Course Map Untied</h1></body></html>");
+    $r->print("</body></html>");
 
     return OK;
 }
@@ -1010,11 +998,11 @@ sub new {
         return undef;
     }
 
+    $self->{HASH_TIED} = 1;
     $self->{NAV_HASH} = \%navmaphash;
     $self->{PARM_HASH} = \%parmhash;
 
     bless($self);
-    $self->untieHashes();
         
     return $self;
 }
@@ -1490,10 +1478,6 @@ sub new {
             if ($curRes == $iterator->END_MAP()) { $depth--; }
         
             if (ref($curRes)) {
-<<<<<<< lonnavmaps.pm
-                # If there's only one resource, this will save it
-                $resource = $curRes; $resourceCount++;
-=======
                 # If there's only one resource, this will save it
                 # we have to filter empty resources from consideration here,
                 # or even "empty", redirecting maps have two (start & finish)
@@ -1501,7 +1485,6 @@ sub new {
                 if($direction == FORWARD && $curRes->src()) { 
                     $resource = $curRes; $resourceCount++; 
                 }
->>>>>>> 1.122
                 my $resultingVal = $curRes->{DATA}->{$valName};
                 my $nextResources = $curRes->$nextResourceMethod();
                 my $nextCount = scalar(@{$nextResources});
@@ -1695,7 +1678,7 @@ sub next {
     # If this is a blank resource, don't actually return it.
     # Should you ever find you need it, make sure to add an option to the code
     #  that you can use; other things depend on this behavior.
-    if (!$self->{HERE}->src()) {
+    if (!$self->{HERE}->src() || !$self->{HERE}->browsePriv()) {
         return $self->next();
     }
 
@@ -2304,14 +2287,16 @@ sub countParts {
     my $self = shift;
     
     my $parts = $self->parts();
+    my $delta = 0;
+    for my $part (@$parts) {
+        if ($part eq '0') { $delta--; }
+    }
 
     if ($self->{RESOURCE_ERROR}) {
         return 0;
     }
 
-    if (scalar(@{$parts}) < 2) { return 1;}
-
-    return scalar(@{$parts}) - 1;
+    return scalar(@{$parts}) + $delta;
 }
 
 # Private function: Extracts the parts information and saves it
@@ -2325,7 +2310,7 @@ sub extractParts {
 
     # Retrieve part count, if this is a problem
     if ($self->is_problem()) {
-        my $metadata = &Apache::lonnet::metadata($self->src(), 'allpossiblekeys');
+        my $metadata = &Apache::lonnet::metadata($self->src(), 'packages');
         if (!$metadata) {
             $self->{RESOURCE_ERROR} = 1;
             $self->{PARTS} = [];
@@ -2333,7 +2318,7 @@ sub extractParts {
         }
         
         foreach (split(/\,/,$metadata)) {
-            if ($_ =~ /^parameter\_(.*)\_opendate$/) {
+            if ($_ =~ /^part_(.*)$/) {
                 push @{$self->{PARTS}}, $1;
             }
         }
@@ -2634,16 +2619,7 @@ sub getNext {
         my $next = $choice->goesto();
         $next = $self->{NAV_MAP}->getById($next);
 
-        # Don't remember it if the student doesn't have browse priviledges
-        # future note: this may properly belong in the client of the resource
-        my $browsePriv = $self->{BROWSE_PRIV};
-        if (!defined($browsePriv)) {
-            $browsePriv = &Apache::lonnet::allowed('bre', $self->src);
-            $self->{BROWSE_PRIV} = $browsePriv;
-        }
-        if (!($browsePriv ne '2' && $browsePriv ne 'F')) {
-            push @branches, $next;
-        }
+        push @branches, $next;
     }
     return \@branches;
 }
@@ -2657,20 +2633,20 @@ sub getPrevious {
         my $prev = $choice->comesfrom();
         $prev = $self->{NAV_MAP}->getById($prev);
 
-        # Don't remember it if the student doesn't have browse priviledges
-        # future note: this may properly belong in the client of the resource
-        my $browsePriv = $self->{BROWSE_PRIV};
-        if (!defined($browsePriv)) {
-            $browsePriv = &Apache::lonnet::allowed('bre', $self->src);
-            $self->{BROWSE_PRIV} = $browsePriv;
-        }
-        if (!($browsePriv ne '2' && $browsePriv ne 'F')) {
-            push @branches, $prev;
-        }
+        push @branches, $prev;
     }
     return \@branches;
 }
 
+sub browsePriv {
+    my $self = shift;
+    if (defined($self->{BROWSE_PRIV})) {
+        return $self->{BROWSE_PRIV};
+    }
+
+    $self->{BROWSE_PRIV} = &Apache::lonnet::allowed('bre', $self->src());
+}
+
 =pod
 
 =back