| \n");
# Print the anchor if necessary
if ($counter == $currentUrlIndex - $currentUrlDelta) {
@@ -508,7 +497,7 @@ sub handler {
}
# print indentation
- for (my $i = 0; $i < $indentLevel - $deltalevel + $inlinedelta; $i++) {
+ for (my $i = 0; $i < $indentLevel - $deltalevel; $i++) {
$r->print($indentString);
}
@@ -1276,7 +1265,7 @@ getIterator behaves as follows:
=over 4
-=item * B(firstResource, finishResource, filterHash, condition): All parameters are optional. firstResource is a resource reference corresponding to where the iterator should start. It defaults to navmap->firstResource() for the corresponding nav map. finishResource corresponds to where you want the iterator to end, defaulting to navmap->finishResource(). filterHash is a hash used as a set containing strings representing the resource IDs, defaulting to empty. Condition is a 1 or 0 that sets what to do with the filter hash: If a 0, then only resource that exist IN the filterHash will be recursed on. If it is a 1, only resources NOT in the filterHash will be recursed on. Defaults to 0.
+=item * B(firstResource, finishResource, filterHash, condition, forceTop): All parameters are optional. firstResource is a resource reference corresponding to where the iterator should start. It defaults to navmap->firstResource() for the corresponding nav map. finishResource corresponds to where you want the iterator to end, defaulting to navmap->finishResource(). filterHash is a hash used as a set containing strings representing the resource IDs, defaulting to empty. Condition is a 1 or 0 that sets what to do with the filter hash: If a 0, then only resource that exist IN the filterHash will be recursed on. If it is a 1, only resources NOT in the filterHash will be recursed on. Defaults to 0. forceTop is a boolean value. If it is false (default), the iterator will only return the first level of map that is not just a single, 'redirecting' map. If true, the iterator will return all information, starting with the top-level map, regardless of content.
Thus, by default, only top-level resources will be shown. Change the condition to a 1 without changing the hash, and all resources will be shown. Changing the condition to 1 and including some values in the hash will allow you to selectively suppress parts of the navmap, while leaving it on 0 and adding things to the hash will allow you to selectively add parts of the nav map. See the handler code for examples.
@@ -1296,6 +1285,8 @@ The iterator will return either a refere
The tokens are retreivable via methods on the iterator object, i.e., $iterator->END_MAP.
+Maps can contain empty resources. The iterator will automatically skip over such resources, but will still treat the structure correctly. Thus, a complicated map with several branches, but consisting entirely of empty resources except for one beginning or ending resource, will cause a lot of BRANCH_STARTs and BRANCH_ENDs, but only one resource will be returned.
+
=back
=cut
@@ -1346,6 +1337,9 @@ sub new {
if (!defined($self->{ALREADY_SEEN})) { $self->{ALREADY_SEEN} = {} };
$self->{CONDITION} = shift;
+ # Do we want to automatically follow "redirection" maps?
+ $self->{FORCE_TOP} = shift;
+
# Now, we need to pre-process the map, by walking forward and backward
# over the parts of the map we're going to look at.
@@ -1361,6 +1355,11 @@ sub new {
my $maxDepth = 0; # tracks max depth
+ # If there is only one resource in this map, and it's a map, we
+ # want to remember that, so the user can ask for the first map
+ # that isn't just a redirector.
+ my $resource; my $resourceCount = 0;
+
# **1**
foreach my $pass (@iterations) {
@@ -1384,16 +1383,18 @@ sub new {
if ($curRes == $iterator->END_MAP()) { $depth--; }
if (ref($curRes)) {
+ # If there's only one resource, this will save it
+ if($direction == FORWARD) { $resource = $curRes; $resourceCount++; }
my $resultingVal = $curRes->{DATA}->{$valName};
my $nextResources = $curRes->$nextResourceMethod();
- my $resourceCount = scalar(@{$nextResources});
+ my $nextCount = scalar(@{$nextResources});
- if ($resourceCount == 1) { # **3**
+ if ($nextCount == 1) { # **3**
my $current = $nextResources->[0]->{DATA}->{$valName} || 999999999;
$nextResources->[0]->{DATA}->{$valName} = min($resultingVal, $current);
}
- if ($resourceCount > 1) { # **4**
+ if ($nextCount > 1) { # **4**
foreach my $res (@{$nextResources}) {
my $current = $res->{DATA}->{$valName} || 999999999;
$res->{DATA}->{$valName} = min($current, $resultingVal + 1);
@@ -1413,6 +1414,18 @@ sub new {
}
}
+ # Check: Was this only one resource, a map?
+ if ($resourceCount == 1 && $resource->is_map() && !$self->{FORCE_TOP}) {
+ my $firstResource = $resource->map_start();
+ my $finishResource = $resource->map_finish();
+ return
+ Apache::lonnavmaps::iterator->new($self->{NAV_MAP}, $firstResource,
+ $finishResource, $self->{FILTER},
+ $self->{ALREADY_SEEN},
+ $self->{CONDITION}, 0);
+
+ }
+
# Set up some bookkeeping information.
$self->{CURRENT_DEPTH} = 0;
$self->{MAX_DEPTH} = $maxDepth;
@@ -1562,6 +1575,11 @@ sub next {
$self->{ALREADY_SEEN}, $self->{CONDITION});
}
+ # If this is a blank resource, don't actually return it.
+ if (!$self->{HERE}->src()) {
+ return $self->next();
+ }
+
return $self->{HERE};
}
@@ -1745,6 +1763,11 @@ sub next {
$self->{CONDITION}, $self->{DIRECTION});
}
+ # If this is a blank resource, ignore it.
+ if (!$self->{HERE}->src()) {
+ return $self->next();
+ }
+
return $self->{HERE};
}
|