--- loncom/interface/lonnavmaps.pm 2003/01/30 21:36:57 1.132
+++ loncom/interface/lonnavmaps.pm 2003/01/31 22:46:50 1.133
@@ -2,7 +2,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.132 2003/01/30 21:36:57 bowersj2 Exp $
+# $Id: lonnavmaps.pm,v 1.133 2003/01/31 22:46:50 bowersj2 Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -49,6 +49,14 @@ use POSIX qw (floor strftime);
my %navmaphash;
my %parmhash;
+# symbolic constants
+sub SYMB { return 1; }
+sub URL { return 2; }
+sub NOTHING { return 3; }
+
+# Some data
+
+
sub cleanup {
if (tied(%navmaphash)){
&Apache::lonnet::logthis('Cleanup navmaps: navmaphash');
@@ -145,10 +153,9 @@ sub real_handler {
}
# Determine where the "here" marker is and where the screen jumps to.
- my $SYMB = 1; my $URL = 2; my $NOTHING = 3; # symbolic constants
- my $hereType; # the type of marker, $SYMB, $URL, or $NOTHING
+ my $hereType; # the type of marker, SYMB, URL, or NOTHING
my $here; # the actual URL or SYMB for the here marker
- my $jumpType; # The type of the thing we have a jump for, $SYMB or $URL
+ my $jumpType; # The type of the thing we have a jump for, SYMB or URL
my $jump; # the SYMB/URL of the resource we need to jump to
if ( $ENV{'form.alreadyHere'} ) { # we came from a user's manipulation of the nav page
@@ -156,7 +163,7 @@ sub real_handler {
# from the querystring, and get the new "jump" marker
$hereType = $ENV{'form.hereType'};
$here = $ENV{'form.here'};
- $jumpType = $ENV{'form.jumpType'} || $NOTHING;
+ $jumpType = $ENV{'form.jumpType'} || NOTHING();
$jump = $ENV{'form.jump'};
} else { # the user is visiting the nav map from the remote
# We're coming from the remote. We have either a url, a symb, or nothing,
@@ -164,7 +171,7 @@ sub real_handler {
# Preference: Symb
if ($ENV{'form.symb'}) {
- $hereType = $jumpType = $SYMB;
+ $hereType = $jumpType = SYMB();
$here = $jump = $ENV{'form.symb'};
} elsif ($ENV{'form.postdata'}) {
# couldn't find a symb, is there a URL?
@@ -172,11 +179,11 @@ sub real_handler {
$currenturl=~s/^http\:\/\///;
$currenturl=~s/^[^\/]+//;
- $hereType = $jumpType = $URL;
+ $hereType = $jumpType = URL;
$here = $jump = $currenturl;
} else {
# Nothing
- $hereType = $jumpType = $NOTHING;
+ $hereType = $jumpType = NOTHING();
}
}
@@ -291,7 +298,7 @@ sub real_handler {
$mapIterator->next(); # discard the first BEGIN_MAP
my $curRes = $mapIterator->next();
my $counter = 0;
- 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;
# We only need to do this if we need to open the maps to show the
@@ -302,8 +309,8 @@ sub real_handler {
if ($curRes == $mapIterator->END_MAP()) { $depth--; }
if (ref($curRes) && !$ENV{'form.alreadyHere'} &&
- ($hereType == $SYMB && $curRes->symb() eq $here) ||
- (ref($curRes) && $hereType == $URL && $curRes->src() eq $here)) {
+ ($hereType == SYMB() && $curRes->symb() eq $here) ||
+ (ref($curRes) && $hereType == URL() && $curRes->src() eq $here)) {
my $mapStack = $mapIterator->getStack();
# Ensure the parent maps are open
@@ -332,8 +339,8 @@ sub real_handler {
if (ref($curRes)) { $counter++; }
if (ref($curRes) &&
- (($jumpType == $SYMB && $curRes->symb() eq $jump) ||
- ($jumpType == $URL && $curRes->src() eq $jump))) {
+ (($jumpType == SYMB() && $curRes->symb() eq $jump) ||
+ ($jumpType == URL() && $curRes->src() eq $jump))) {
# If this is the correct resource, be sure to
# show it by making sure the containing maps
# are open.
@@ -542,7 +549,7 @@ sub real_handler {
removeFromFilter(\%filterHash, $mapId);
$linkopen .= "&condition=$condition&$queryAdd" .
"&hereType=$hereType&here=" .
- Apache::lonnet::escape($here) . "&jumpType=$SYMB&" .
+ Apache::lonnet::escape($here) . "&jumpType=".SYMB()."&" .
"jump=" . Apache::lonnet::escape($curRes->symb()) ."\">";
$linkclose = "";
@@ -591,8 +598,8 @@ sub real_handler {
# Is this the current resource?
if (!$displayedHereMarker &&
- (($hereType == $SYMB && $curRes->symb eq $here) ||
- ($hereType == $URL && $curRes->src eq $here))) {
+ (($hereType == SYMB() && $curRes->symb eq $here) ||
+ ($hereType == URL() && $curRes->src eq $here))) {
$curMarkerBegin = '> ';
$curMarkerEnd = ' <';
$displayedHereMarker = 1;
@@ -700,6 +707,13 @@ sub real_handler {
$r->print('');
}
+ # renderer call
+ $mapIterator = $navmap->getIterator(undef, undef, \%filterHash, 0);
+ my $render = render({ 'cols' => [0,1,2,3], 'iterator' => $mapIterator,
+ 'url' => '/adm/navmaps',
+ 'queryString' => 'alreadyHere=1' });
+ $r->print('|' . $render . '|');
+
$navmap->untieHashes();
$r->print("