--- loncom/interface/lonnavmaps.pm 2003/04/18 13:51:46 1.176
+++ loncom/interface/lonnavmaps.pm 2003/04/22 18:42:47 1.180
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.176 2003/04/18 13:51:46 www Exp $
+# $Id: lonnavmaps.pm,v 1.180 2003/04/22 18:42:47 bowersj2 Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -169,30 +169,34 @@ sub real_handler {
return OK;
}
- # See if there's only one map in the top-level... if so,
- # automatically display it
- my $iterator = $navmap->getIterator(undef, undef, undef, 0);
- my $depth = 1;
- $iterator->next();
- my $curRes = $iterator->next();
- my $sequenceCount = 0;
- my $sequenceId;
- while ($depth > 0) {
- if ($curRes == $iterator->BEGIN_MAP()) { $depth++; }
- if ($curRes == $iterator->END_MAP()) { $depth--; }
-
- if (ref($curRes) && $curRes->is_sequence()) {
- $sequenceCount++;
- $sequenceId = $curRes->map_pc();
+ # See if there's only one map in the top-level, if we don't
+ # already have a filter... if so, automatically display it
+ if ($ENV{QUERY_STRING} !~ /filter/) {
+ my $iterator = $navmap->getIterator(undef, undef, undef, 0);
+ my $depth = 1;
+ $iterator->next();
+ my $curRes = $iterator->next();
+ my $sequenceCount = 0;
+ my $sequenceId;
+ while ($depth > 0) {
+ if ($curRes == $iterator->BEGIN_MAP()) { $depth++; }
+ if ($curRes == $iterator->END_MAP()) { $depth--; }
+
+ if (ref($curRes) && $curRes->is_sequence()) {
+ $sequenceCount++;
+ $sequenceId = $curRes->map_pc();
+ }
+
+ $curRes = $iterator->next();
+ }
+
+ if ($sequenceCount == 1) {
+ # The automatic iterator creation in the render call
+ # will pick this up. We know the condition because
+ # the defined($ENV{'form.filter'}) also ensures this
+ # is a fresh call.
+ $ENV{'form.filter'} = "$sequenceId";
}
-
- $curRes = $iterator->next();
- }
-
- if ($sequenceCount == 1) {
- # The automatic iterator creation in the render call
- # will pick this up.
- $ENV{'form.filter'} = "$sequenceId";
}
# renderer call
@@ -343,14 +347,9 @@ sub lastTry {
}
# This puts a human-readable name on the ENV variable.
-# FIXME: This needs better logic: Who gets the advanced view of navmaps?
-# As of 3-13-03, it's an open question. Guy doesn't want to check
-# roles directly because it should be a check of capabilities for future
-# role compatibity. There is no capability that matches this one for
-# now, so this is done. (A hack for 1.0 might be to simply check roles
-# anyhow.)
+
sub advancedUser {
- return $ENV{'user.adv'};
+ return $ENV{'request.role.adv'};
}
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.