--- loncom/interface/lonnavmaps.pm	2003/02/07 21:55:44	1.140
+++ loncom/interface/lonnavmaps.pm	2003/02/20 22:08:55	1.144
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.140 2003/02/07 21:55:44 bowersj2 Exp $
+# $Id: lonnavmaps.pm,v 1.144 2003/02/20 22:08:55 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -463,6 +463,8 @@ The pre-packaged column names are refere
 
 =item * B<resource_part_count>: If true (default), the resource will show a part count if the full part list is not displayed. If false, the resource will never show a part count.
 
+=item * B<resource_no_folder_link>: If true, the resource's folder will not be clickable to open or close it. Default is false.
+
 =back
 
 =item B<communication_status>: Whether there is discussion on the resource, email for the user, or (lumped in here) perl errors in the execution of the problem. This is the second column in the main nav map.
@@ -491,7 +493,9 @@ Most of these parameters are only useful
 
 =over 4
 
-=item * B<iterator>: A reference to a fresh ::iterator to use from the navmaps. The rendering will reflect the options passed to the iterator, so you can use that to just render a certain part of the course, if you like. If one is not passed, the renderer will attempt to construct one from ENV{'form.filter'} and ENV{'form.condition'} information.
+=item * B<iterator>: A reference to a fresh ::iterator to use from the navmaps. The rendering will reflect the options passed to the iterator, so you can use that to just render a certain part of the course, if you like. If one is not passed, the renderer will attempt to construct one from ENV{'form.filter'} and ENV{'form.condition'} information, plus the 'iterator_map' parameter if any.
+
+=item * B<iterator_map>: If you are letting the renderer do the iterator handling, you can instruct the renderer to render only a particular map by passing it the source of the map you want to process, like '/res/103/jerf/navmap.course.sequence'.
 
 =item * B<navmap>: A reference to a navmap, used only if an iterator is not passed in. If this is necessary to make an iterator but it is not passed in, a new one will be constructed based on ENV info. This is useful to do basic error checking before passing it off to render.
 
@@ -521,6 +525,8 @@ Most of these parameters are only useful
 
 =item * B<printCloseAll>: If true, print the "Close all folders" or "open all folders" links. Default is true.
 
+=item * B<filterFunc>: A function that takes the resource object as its only parameter and returns a true or false value. If true, the resource is displayed. If false, it is simply skipped in the display. By default, all resources are showne.
+
 =back
 
 =head2 Additional Info
@@ -585,20 +591,31 @@ sub render_resource {
         if ($it->{CONDITION}) {
             $nowOpen = !$nowOpen;
         }
-        $icon = 'navmap.folder.' . ($nowOpen ? 'closed' : 'open') . '.gif';
-        $icon = "<img src='/adm/lonIcons/$icon' alt='' border='0' />";
-        
-        $linkopen = "<a href='" . $params->{'url'} . '?' . 
-            $params->{'queryString'} . '&filter=';
-        $linkopen .= ($nowOpen xor $it->{CONDITION}) ?
-            addToFilter($filter, $mapId) :
-            removeFromFilter($filter, $mapId);
-        $linkopen .= "&condition=" . $it->{CONDITION} . '&hereType='
-            . $params->{'hereType'} . '&here=' .
-            &Apache::lonnet::escape($params->{'here'}) . 
-            '&jumpType=' . SYMB() . '&jump=' .
-            &Apache::lonnet::escape($resource->symb()) . 
-            "&folderManip=1'>";
+
+        if (!$params->{'resource_no_folder_link'}) {
+            $icon = 'navmap.folder.' . ($nowOpen ? 'closed' : 'open') . '.gif';
+            $icon = "<img src='/adm/lonIcons/$icon' alt='' border='0' />";
+
+            $linkopen = "<a href='" . $params->{'url'} . '?' . 
+                $params->{'queryString'} . '&filter=';
+            $linkopen .= ($nowOpen xor $it->{CONDITION}) ?
+                addToFilter($filter, $mapId) :
+                removeFromFilter($filter, $mapId);
+            $linkopen .= "&condition=" . $it->{CONDITION} . '&hereType='
+                . $params->{'hereType'} . '&here=' .
+                &Apache::lonnet::escape($params->{'here'}) . 
+                '&jumpType=' . SYMB() . '&jump=' .
+                &Apache::lonnet::escape($resource->symb()) . 
+                "&folderManip=1'>";
+        } else {
+            # Don't allow users to manipulate folder
+            $icon = 'navmap.folder.' . ($nowOpen ? 'closed' : 'open') .
+                '.nomanip.gif';
+            $icon = "<img src='/adm/lonIcons/$icon' alt='' border='0' />";
+
+            $linkopen = "";
+            $linkclose = "";
+        }
     }
 
     if ($resource->randomout()) {
@@ -642,7 +659,11 @@ sub render_resource {
         $nonLinkedText .= ' (' . $resource->countParts() . ' parts)';
     }
 
-    $result .= "  $curMarkerBegin<a href='$link'>$title$partLabel</a>$curMarkerEnd $nonLinkedText</td>";
+    if (!$params->{'resource_nolink'}) {
+        $result .= "  $curMarkerBegin<a href='$link'>$title$partLabel</a>$curMarkerEnd $nonLinkedText</td>";
+    } else {
+        $result .= "  $curMarkerBegin$title$partLabel$curMarkerEnd $nonLinkedText</td>";
+    }
 
     return $result;
 }
@@ -917,7 +938,19 @@ sub render {
         # Paranoia: Make sure it's ready
         $navmap->init();
 
-        $args->{'iterator'} = $it = $navmap->getIterator(undef, undef, $filterHash, $condition);
+        # See if we're being passed a specific map
+        if ($args->{'iterator_map'}) {
+            my $map = $args->{'iterator_map'};
+            $map = &Apache::lonnet::clutter($map);
+            $map = $navmap->{NAV_HASH}->{'ids_' . $map};
+            $map = $navmap->getById($map);
+            my $firstResource = $map->map_start();
+            my $finishResource = $map->map_finish();
+
+            $args->{'iterator'} = $it = $navmap->getIterator($firstResource, $finishResource, $filterHash, $condition);
+        } else {
+            $args->{'iterator'} = $it = $navmap->getIterator(undef, undef, $filterHash, $condition);
+        }
     }
     
     my $showParts = setDefault($args->{'showParts'}, 1);
@@ -929,7 +962,9 @@ sub render {
     my $printKey = $args->{'printKey'};
     my $printCloseAll = $args->{'printCloseAll'};
     if (!defined($printCloseAll)) { $printCloseAll = 1; }
-
+    my $filterFunc = setDefault($args->{'filterFunc'},
+                                sub {return 1;});
+    
     # Print key?
     if ($printKey) {
         $result .= '<table border="0" cellpadding="2" cellspacing="0">';
@@ -962,6 +997,7 @@ sub render {
                 "&hereType=$hereType&here=" . Apache::lonnet::escape($here) . 
                 "\">Open All Folders</a>";
         }
+        $result .= "<br /><br />\n";
     }    
 
     if ($r) {
@@ -997,6 +1033,10 @@ sub render {
     my $in24Hours = $now + 24 * 60 * 60;
     my $rownum = 0;
 
+    # export "here" marker information
+    $args->{'here'} = $here;
+    $args->{'hereType'} = $hereType;
+
     while ($depth > 0) {
         if ($curRes == $it->BEGIN_MAP()) { $depth++; }
         if ($curRes == $it->END_MAP()) { $depth--; }
@@ -1023,6 +1063,13 @@ sub render {
 
         $args->{'counter'}++;
 
+        # If this has been filtered out, continue on
+        if (!(&$filterFunc($curRes))) {
+            $curRes = $it->next();
+            $args->{'isNewBranch'} = 0; # Don't falsely remember this
+            next;
+        } 
+
         # Does it have multiple parts?
         $args->{'multipart'} = 0;
         $args->{'condensed'} = 0;
@@ -2308,6 +2355,7 @@ These methods are useful for getting inf
 sub map_finish {
     my $self = shift;
     my $src = $self->src();
+    $src = Apache::lonnet::clutter($src);
     my $res = $self->navHash("map_finish_$src", 0);
     $res = $self->{NAV_MAP}->getById($res);
     return $res;
@@ -2320,6 +2368,7 @@ sub map_pc {
 sub map_start {
     my $self = shift;
     my $src = $self->src();
+    $src = Apache::lonnet::clutter($src);
     my $res = $self->navHash("map_start_$src", 0);
     $res = $self->{NAV_MAP}->getById($res);
     return $res;
@@ -2496,7 +2545,7 @@ sub getErrors {
 
 =pod
 
-=item * B<parts>(): Returns a list reference containing sorted strings corresponding to each part of the problem. To count the number of parts, use the list in a scalar context, and subtract one if greater then two. (One part problems have a part 0. Multi-parts have a part 0, plus a part for each part. Filtering part 0 if you want it is up to you.)
+=item * B<parts>(): Returns a list reference containing sorted strings corresponding to each part of the problem. To count the number of parts, use the list in a scalar context, and subtract one if greater than two. (One part problems have a part 0. Multi-parts have a part 0, plus a part for each part. Filtering part 0 if you want it is up to you.)
 
 =item * B<countParts>(): Returns the number of parts of the problem a student can answer. Thus, for single part problems, returns 1. For multipart, it returns the number of parts in the problem, not including psuedo-part 0. Thus, B<parts> may return an array with fewer parts in it then countParts might lead you to believe.