version 1.126, 2003/01/13 22:41:20
|
version 1.127, 2003/01/14 01:42:52
|
Line 273 sub real_handler {
|
Line 273 sub real_handler {
|
$mapIterator->next(); # discard the first BEGIN_MAP |
$mapIterator->next(); # discard the first BEGIN_MAP |
my $curRes = $mapIterator->next(); |
my $curRes = $mapIterator->next(); |
my $counter = 0; |
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 $foundJump = ($jumpType == $NOTHING); # look for jump point if we have one |
my $looped = 0; |
my $looped = 0; |
|
|
Line 286 sub real_handler {
|
Line 280 sub real_handler {
|
# current position. This will change the counter so we can't count |
# current position. This will change the counter so we can't count |
# for the jump marker with this loop. |
# for the jump marker with this loop. |
while ($depth > 0 && !$ENV{'form.alreadyHere'}) { |
while ($depth > 0 && !$ENV{'form.alreadyHere'}) { |
>>>>>>> 1.122 |
|
if ($curRes == $mapIterator->BEGIN_MAP()) { $depth++; } |
if ($curRes == $mapIterator->BEGIN_MAP()) { $depth++; } |
if ($curRes == $mapIterator->END_MAP()) { $depth--; } |
if ($curRes == $mapIterator->END_MAP()) { $depth--; } |
|
|
Line 305 sub real_handler {
|
Line 298 sub real_handler {
|
} |
} |
$ENV{'form.alreadyHere'} = 1; |
$ENV{'form.alreadyHere'} = 1; |
} |
} |
<<<<<<< lonnavmaps.pm |
|
|
|
======= |
|
$looped = 1; |
$looped = 1; |
|
|
$curRes = $mapIterator->next(); |
$curRes = $mapIterator->next(); |
Line 337 sub real_handler {
|
Line 327 sub real_handler {
|
$foundJump = 1; |
$foundJump = 1; |
} |
} |
|
|
>>>>>>> 1.122 |
|
$curRes = $mapIterator->next(); |
$curRes = $mapIterator->next(); |
} |
} |
|
|
Line 699 sub real_handler {
|
Line 688 sub real_handler {
|
|
|
$navmap->untieHashes(); |
$navmap->untieHashes(); |
|
|
$r->print("<h1>Course Map Untied</h1></body></html>"); |
$r->print("<h1>Untied Hashes</h1></body></html>"); |
|
|
return OK; |
return OK; |
} |
} |
Line 1490 sub new {
|
Line 1479 sub new {
|
if ($curRes == $iterator->END_MAP()) { $depth--; } |
if ($curRes == $iterator->END_MAP()) { $depth--; } |
|
|
if (ref($curRes)) { |
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 |
# If there's only one resource, this will save it |
# we have to filter empty resources from consideration here, |
# we have to filter empty resources from consideration here, |
# or even "empty", redirecting maps have two (start & finish) |
# or even "empty", redirecting maps have two (start & finish) |
Line 1501 sub new {
|
Line 1486 sub new {
|
if($direction == FORWARD && $curRes->src()) { |
if($direction == FORWARD && $curRes->src()) { |
$resource = $curRes; $resourceCount++; |
$resource = $curRes; $resourceCount++; |
} |
} |
>>>>>>> 1.122 |
|
my $resultingVal = $curRes->{DATA}->{$valName}; |
my $resultingVal = $curRes->{DATA}->{$valName}; |
my $nextResources = $curRes->$nextResourceMethod(); |
my $nextResources = $curRes->$nextResourceMethod(); |
my $nextCount = scalar(@{$nextResources}); |
my $nextCount = scalar(@{$nextResources}); |