loncom/interface/lonnavmaps.pm - diff

Return to lonnavmaps.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonnavmaps.pm between versions 1.509.2.14.2.9 and 1.553

version 1.509.2.14.2.9, 2023/07/06 20:32:17	version 1.553, 2021/07/19 15:48:26
Line 2	Line 2
# Navigate Maps Handler	# Navigate Maps Handler
#	#
# $Id$	# $Id$

#	#
# Copyright Michigan State University Board of Trustees	# Copyright Michigan State University Board of Trustees
#	#
Line 52 described at http://www.lon-capa.org.	Line 51 described at http://www.lon-capa.org.
X<lonnavmaps, overview> When a user enters a course, LON-CAPA examines the	X<lonnavmaps, overview> When a user enters a course, LON-CAPA examines the
course structure and caches it in what is often referred to as the	course structure and caches it in what is often referred to as the
"big hash" X<big hash>. You can see it if you are logged into	"big hash" X<big hash>. You can see it if you are logged into
LON-CAPA, in a course, by going to /adm/test. (You may need to	LON-CAPA, in a course, by going to /adm/test. The content of
tweak the /home/httpd/lonTabs/htpasswd file to view it.) The	the hash will be under the heading "Big Hash".
content of the hash will be under the heading "Big Hash".
	Access to /adm/test is controlled by a domain configuration,
	which a Domain Coordinator will set for a server's default domain
	via: Main Menu > Set domain configuration > Display (Access to
	server status pages checked), and entering a username:domain
	or IP address in the "Show user environment" row. Users with
	an unexpired domain coordinator role in the server's domain
	automatically receive access to /adm/test.

Big Hash contains, among other things, how resources are related	Big Hash contains, among other things, how resources are related
to each other (next/previous), what resources are maps, which	to each other (next/previous), what resources are maps, which
Line 65 processed.	Line 71 processed.

Apache::lonnavmaps provides an object model for manipulating this	Apache::lonnavmaps provides an object model for manipulating this
information in a higher-level fashion than directly manipulating	information in a higher-level fashion than directly manipulating
the hash. It also provides access to several auxilary functions	the hash. It also provides access to several auxiliary functions
that aren't necessarily stored in the Big Hash, but are a per-	that aren't necessarily stored in the Big Hash, but are a per-
resource sort of value, like whether there is any feedback on	resource sort of value, like whether there is any feedback on
a given resource.	a given resource.
Line 78 Apache::lonnavmaps also provides fairly	Line 84 Apache::lonnavmaps also provides fairly
rendering navmaps, and last but not least, provides the navmaps	rendering navmaps, and last but not least, provides the navmaps
view for when the user clicks the NAV button.	view for when the user clicks the NAV button.

B<Note>: Apache::lonnavmaps I<only> works for the "currently	B<Note>: Apache::lonnavmaps by default will show information
logged in user"; if you want things like "due dates for another	for the "currently logged in user". However, if information
student" lonnavmaps can not directly retrieve information like	about resources is needed for a different user, e.g., a bubblesheet
that. You need the EXT function. This module can still help,	exam which uses randomorder, or randompick needs to be printed or
because many things, such as the course structure, are constant	graded for named user(s) or specific CODEs, then the username,
	domain, or CODE can be passed as arguments when creating a new
	navmap object.

	Note if you want things like "due dates for another student",
	you would use the EXT function instead of lonnavmaps.
	That said, the lonnavmaps module can still help, because many
	things, such as the course structure, are usually constant
between users, and Apache::lonnavmaps can help by providing	between users, and Apache::lonnavmaps can help by providing
symbs for the EXT call.	symbs for the EXT call.

Line 92 all, then documents the Apache::lonnavma	Line 105 all, then documents the Apache::lonnavma
is the key to accessing the Big Hash information, covers the use	is the key to accessing the Big Hash information, covers the use
of the Iterator (which provides the logic for traversing the	of the Iterator (which provides the logic for traversing the
somewhat-complicated Big Hash data structure), documents the	somewhat-complicated Big Hash data structure), documents the
Apache::lonnavmaps::Resource objects that are returned by	Apache::lonnavmaps::Resource objects that are returned singularly
	by: getBySymb(), getById(), getByMapPc(), and getResourceByUrl()
	(can also be as an array), or in an array by retrieveResources().

=head1 Subroutine: render	=head1 Subroutine: render

Line 342 user into thinking that if the sequence	Line 357 user into thinking that if the sequence
under it; for example, see the "Show Uncompleted Homework" view on the	under it; for example, see the "Show Uncompleted Homework" view on the
B<NAV> screen.	B<NAV> screen.

=item * B<suppressNavmap>: default: false	=item * B<suppressNavmaps>: default: false

If true, will not display Navigate Content resources.	If true, will not display Navigate Content resources.

Line 534 my %colormap =	Line 549 my %colormap =
$resObj->EXCUSED => '#3333FF',	$resObj->EXCUSED => '#3333FF',
$resObj->PAST_DUE_ANSWER_LATER => '',	$resObj->PAST_DUE_ANSWER_LATER => '',
$resObj->PAST_DUE_NO_ANSWER => '',	$resObj->PAST_DUE_NO_ANSWER => '',
$resObj->PAST_DUE_ATMPT_ANS => '',
$resObj->PAST_DUE_ATMPT_NOANS => '',
$resObj->PAST_DUE_NO_ATMT_ANS => '',
$resObj->PAST_DUE_NO_ATMT_NOANS => '',
$resObj->ANSWER_OPEN => '#006600',	$resObj->ANSWER_OPEN => '#006600',
$resObj->OPEN_LATER => '',	$resObj->OPEN_LATER => '',
$resObj->TRIES_LEFT => '',	$resObj->TRIES_LEFT => '',
Line 683 sub getDescription {	Line 694 sub getDescription {
return &Apache::lonhtmlcommon::direct_parm_link(&mt("Open, no due date"),$res->symb(),'duedate',$part).$slotinfo;	return &Apache::lonhtmlcommon::direct_parm_link(&mt("Open, no due date"),$res->symb(),'duedate',$part).$slotinfo;
}	}
}	}
if (($status == $res->PAST_DUE_ANSWER_LATER) \|\| ($status == $res->PAST_DUE_ATMPT_ANS) \|\| ($status == $res->PAST_DUE_NO_ATMT_ANS)) {	if ($status == $res->PAST_DUE_ANSWER_LATER) {
return &mt("Answer open [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($answer,'start'),$res->symb(),'answerdate',$part));	return &mt("Answer open [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($answer,'start'),$res->symb(),'answerdate',$part));
}	}
if (($status == $res->PAST_DUE_NO_ANSWER) \|\| ($status == $res->PAST_DUE_ATMPT_NOANS) \|\| ($status == $res->PAST_DUE_NO_ATMT_NOANS)) {	if ($status == $res->PAST_DUE_NO_ANSWER) {
if ($res->is_practice()) {	if ($res->is_practice()) {
return &mt("Closed [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'answerdate,duedate',$part));	return &mt("Closed [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'answerdate,duedate',$part));
} else {	} else {
Line 956 sub render_resource {	Line 967 sub render_resource {
$newBranchText = "<img src='$location/branch.gif' alt=".mt('Branch')." />";	$newBranchText = "<img src='$location/branch.gif' alt=".mt('Branch')." />";
}	}

# links to open and close the folder

my $whitespace = $location.'/whitespace_21.gif';	my $whitespace = $location.'/whitespace_21.gif';
my ($nomodal,$linkopen,$linkclose);	my ($nomodal,$linkopen,$linkclose);
unless ($resource->is_map() \|\| $params->{'resource_nolink'}) {	unless ($resource->is_map() \|\| $params->{'resource_nolink'}) {
Line 1011 sub render_resource {	Line 1020 sub render_resource {
if ($it->{CONDITION}) {	if ($it->{CONDITION}) {
$nowOpen = !$nowOpen;	$nowOpen = !$nowOpen;
}	}
my $folderType;
if (&advancedUser() && $resource->is_missing_map()) {	my $folderType = $resource->is_sequence() ? 'folder' : 'page';
$folderType = 'none';
} else {
$folderType = $resource->is_sequence() ? 'folder' : 'page';
}
my $title=$resource->title;	my $title=$resource->title;
$title=~s/\"/\&qout;/g;	$title=~s/\"/\&qout;/g;
if (!$params->{'resource_no_folder_link'}) {	if (!$params->{'resource_no_folder_link'}) {
Line 1049 sub render_resource {	Line 1054 sub render_resource {
}	}
}	}
if (((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) \|\|	if (((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) \|\|
(&Apache::lonnet::allowed('cev',$env{'request.course.id'}))) &&	(&Apache::lonnet::allowed('cev',$env{'request.course.id'}))) &&
($resource->symb=~/\_\_\_[^\_]+\_\_\_uploaded/)) {	($resource->symb=~/\_\_\_[^\_]+\_\_\_uploaded/)) {
if (!$params->{'map_no_edit_link'}) {	if (!$params->{'map_no_edit_link'}) {
my $icon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png';	my $icon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png';
Line 1248 sub render_long_status {	Line 1253 sub render_long_status {
}	}
}	}
}	}

if (($resource->kind() eq "res") &&	if (($resource->kind() eq "res") &&
($resource->is_raw_problem() \|\| $resource->is_gradable()) &&	($resource->is_raw_problem() \|\| $resource->is_gradable()) &&
!$firstDisplayed) {	!$firstDisplayed) {
Line 1408 sub render {	Line 1413 sub render {
# Without renaming the filterfunc, the server seems to go into	# Without renaming the filterfunc, the server seems to go into
# an infinite loop	# an infinite loop
my $oldFilterFunc = $filterFunc;	my $oldFilterFunc = $filterFunc;
$filterFunc = sub { my $res = shift; return !$res->randomout() &&	$filterFunc = sub { my $res = shift; return !$res->randomout() &&
($res->deeplink($args->{'caller'}) ne 'absent') &&	($res->deeplink($args->{'caller'}) ne 'absent') &&
($res->deeplink($args->{'caller'}) ne 'grades') &&	($res->deeplink($args->{'caller'}) ne 'grades') &&
!$res->deeplinkout() &&	!$res->deeplinkout() &&
Line 1418 sub render {	Line 1423 sub render {
my $condition = 0;	my $condition = 0;
if ($env{'form.condition'}) {	if ($env{'form.condition'}) {
$condition = 1;	$condition = 1;
} elsif (($env{'request.deeplink.login'}) && ($env{'request.course.id'}) && (!$userCanSeeHidden)) {
if (!defined($navmap)) {
$navmap = Apache::lonnavmaps::navmap->new();
}
if (defined($navmap)) {
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my $symb = &Apache::loncommon::symb_from_tinyurl($env{'request.deeplink.login'},$cnum,$cdom);
if ($symb) {
my $deeplink;
my $res = $navmap->getBySymb($symb);
if ($res->is_map()) {
my $mapname = &Apache::lonnet::declutter($res->src());
$mapname = &Apache::lonnet::deversion($mapname);
$deeplink = $navmap->get_mapparam(undef,$mapname,"0.deeplink");
} else {
$deeplink = $res->deeplink();
}
if ($deeplink ne '') {
if ((split(/,/,$deeplink))[1] eq 'hide') {
if ($res->is_map()) {
map { $filterHash->{$_} = 1 if $_ } split(/,/,$res->map_hierarchy());
} else {
my $mapurl = (&Apache::lonnet::decode_symb($symb))[0];
my $map = $navmap->getResourceByUrl($mapurl);
map { $filterHash->{$_} = 1 if $_ } split(/,/,$map->map_hierarchy());
}
}
}
}
}
}	}

if (!$env{'form.folderManip'} && !defined($args->{'iterator'}) && !$args->{'nocurrloc'}) {	if (!$env{'form.folderManip'} && !defined($args->{'iterator'})) {
# Step 1: Check to see if we have a navmap	# Step 1: Check to see if we have a navmap
if (!defined($navmap)) {	if (!defined($navmap)) {
$navmap = Apache::lonnavmaps::navmap->new();	$navmap = Apache::lonnavmaps::navmap->new();
Line 1472 sub render {	Line 1446 sub render {
my $currenturl = $env{'form.postdata'};	my $currenturl = $env{'form.postdata'};
#$currenturl=~s/^http\:\/\///;	#$currenturl=~s/^http\:\/\///;
#$currenturl=~s/^[^\/]+//;	#$currenturl=~s/^[^\/]+//;
unless ($args->{'caller'} eq 'sequence') {	unless ($args->{'caller'} eq 'sequence') {
$here = $jump = &Apache::lonnet::symbread($currenturl);	$here = $jump = &Apache::lonnet::symbread($currenturl);
}	}
}	}
if (($here eq '') && ($args->{'caller'} ne 'sequence')) {	if (($here eq '') && ($args->{'caller'} ne 'sequence')) {
my $last;	my $last;
if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',	if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
&GDBM_READER(),0640)) {	&GDBM_READER(),0640)) {
Line 1490 sub render {	Line 1464 sub render {
my $mapIterator = $navmap->getIterator(undef, undef, undef, 1);	my $mapIterator = $navmap->getIterator(undef, undef, undef, 1);
my $curRes;	my $curRes;
my $found = 0;	my $found = 0;
my $here_is_navmaps = 0;
if ($here =~ m{___\d+___adm/navmaps$}) {
$here_is_navmaps = 1;
}

# We only need to do this if we need to open the maps to show the	# We only need to do this if we need to open the maps to show the
# 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 ($here && ($curRes = $mapIterator->next()) && !$found && !$here_is_navmaps) {	while ($here && ($curRes = $mapIterator->next()) && !$found) {
if (ref($curRes) && $curRes->symb() eq $here) {	if (ref($curRes) && $curRes->symb() eq $here) {
my $mapStack = $mapIterator->getStack();	my $mapStack = $mapIterator->getStack();

Line 1615 sub render {	Line 1585 sub render {
'&here='.&escape($here);	'&here='.&escape($here);
$text='Open all folders';	$text='Open all folders';
}	}
	if ($env{'form.register'}) {
	$link .= '&register='.$env{'form.register'};
	}
if ($args->{'caller'} eq 'navmapsdisplay') {	if ($args->{'caller'} eq 'navmapsdisplay') {
unless ($args->{'notools'}) {	unless ($args->{'notools'}) {
&add_linkitem($args->{'linkitems'},'changefolder',	&add_linkitem($args->{'linkitems'},'changefolder',
Line 1638 sub render {	Line 1611 sub render {
<input type="hidden" name="navurl" value="$querystr" />	<input type="hidden" name="navurl" value="$querystr" />
<input type="hidden" name="navtime" value="$time" />	<input type="hidden" name="navtime" value="$time" />
END	END
	if ($env{'form.register'}) {
	$result .= '<input type="hidden" name="register" value="'.$env{'form.register'}.'" />';
	}
if ($args->{'sort'} eq 'discussion') {	if ($args->{'sort'} eq 'discussion') {
my $totdisc = 0;	my $totdisc = 0;
my $haveDisc = '';	my $haveDisc = '';
Line 1658 END	Line 1634 END
}	}
$result.='</form>';	$result.='</form>';
}	}
if (($args->{'caller'} eq 'navmapsdisplay') && ($env{'request.course.id'})) {	if (($args->{'caller'} eq 'navmapsdisplay') &&
	((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) \|\|
	(&Apache::lonnet::allowed('cev',$env{'request.course.id'})))) {
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
if ($env{'course.'.$env{'request.course.id'}.'.url'} eq	if ($env{'course.'.$env{'request.course.id'}.'.url'} eq
"uploaded/$cdom/$cnum/default.sequence") {	"uploaded/$cdom/$cnum/default.sequence") {
if ((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) \|\|	&add_linkitem($args->{'linkitems'},'edittoplevel',
(&Apache::lonnet::allowed('cev',$env{'request.course.id'}))) {	"javascript:gocmd('/adm/coursedocs','editdocs');",
&add_linkitem($args->{'linkitems'},'edittoplevel',	'Content Editor');
"javascript:gocmd('/adm/coursedocs','editdocs');",
'Content Editor');
}
if ($counter) {
&add_linkitem($args->{'linkitems'},'printout',
"javascript:gopost('/adm/printout','/adm/navmaps');",
'Prepare a printable document');
}
}	}
}	}

Line 1716 END	Line 1686 END
# We also do this even if $args->{'suppressEmptySequences'}	# We also do this even if $args->{'suppressEmptySequences'}
# is not true, so we can hide empty sequences for which the	# is not true, so we can hide empty sequences for which the
# hiddenresource parameter is set to yes (at map level), or	# hiddenresource parameter is set to yes (at map level), or
# mark as hidden for users who have $userCanSeeHidden.	# mark as hidden for users who have $userCanSeeHidden.
# Use DFS for speed, since structure actually doesn't matter,	# Use DFS for speed, since structure actually doesn't matter,
# except what map has what resources.	# except what map has what resources.
#
# To ensure the "Selected Resources from selected folder in course"
# printout generation option will work in sessions launched via a
# deep link, the value of $args->{'filterFunc'} included in the
# call to lonnavmaps::render() is omitted from the filter function
# used with the DFS Iterator when $args->{'caller'} is 'printout'.
#
# As a result $sequence->{DATA}->{HAS_VISIBLE_CHILDREN} can be
# set to 1 for folder(s) which include resources only accessible
# for sessions launched via a deep link, when the current session
# is of that type.

my $dfsit = Apache::lonnavmaps::DFSiterator->new($navmap,	my $dfsit = Apache::lonnavmaps::DFSiterator->new($navmap,
$it->{FIRST_RESOURCE},	$it->{FIRST_RESOURCE},
$it->{FINISH_RESOURCE},	$it->{FINISH_RESOURCE},
{}, undef, 1);	{}, undef, 1);

my $dfsFilterFunc;
if ($args->{'caller'} eq 'printout') {
$dfsFilterFunc = sub { my $res = shift; return !$res->randomout() &&
($res->deeplink($args->{'caller'}) ne 'absent') &&
($res->deeplink($args->{'caller'}) ne 'grades') &&
!$res->deeplinkout();};
} else {
$dfsFilterFunc = $filterFunc;
}
my $depth = 0;	my $depth = 0;
$dfsit->next();	$dfsit->next();
my $curRes = $dfsit->next();	my $curRes = $dfsit->next();
Line 1752 END	Line 1701 END
if ($curRes == $dfsit->BEGIN_MAP()) { $depth++; }	if ($curRes == $dfsit->BEGIN_MAP()) { $depth++; }
if ($curRes == $dfsit->END_MAP()) { $depth--; }	if ($curRes == $dfsit->END_MAP()) { $depth--; }

if (ref($curRes)) {	if (ref($curRes)) {
# Parallel pre-processing: Do sequences have non-filtered-out children?	# Parallel pre-processing: Do sequences have non-filtered-out children?
if ($curRes->is_map()) {	if ($curRes->is_map()) {
$curRes->{DATA}->{HAS_VISIBLE_CHILDREN} = 0;	$curRes->{DATA}->{HAS_VISIBLE_CHILDREN} = 0;
Line 1763 END	Line 1712 END
} elsif ($curRes->src()) {	} elsif ($curRes->src()) {
# Not a sequence: if it's filtered, ignore it, otherwise	# Not a sequence: if it's filtered, ignore it, otherwise
# rise up the stack and mark the sequences as having children	# rise up the stack and mark the sequences as having children
if (&$dfsFilterFunc($curRes)) {	if (&$filterFunc($curRes)) {
for my $sequence (@{$dfsit->getStack()}) {	for my $sequence (@{$dfsit->getStack()}) {
next unless ($sequence->is_map());
$sequence->{DATA}->{HAS_VISIBLE_CHILDREN} = 1;	$sequence->{DATA}->{HAS_VISIBLE_CHILDREN} = 1;
}	}
}	}
Line 1895 END	Line 1843 END
next;	next;
} else {	} else {
my $mapname = &Apache::lonnet::declutter($curRes->src());	my $mapname = &Apache::lonnet::declutter($curRes->src());
$mapname = &Apache::lonnet::deversion($mapname);	$mapname = &Apache::lonnet::deversion($mapname);
if (lc($navmap->get_mapparam(undef,$mapname,"0.hiddenresource")) eq 'yes') {	if (lc($navmap->get_mapparam(undef,$mapname,"0.hiddenresource")) eq 'yes') {
if ($userCanSeeHidden) {	if ($userCanSeeHidden) {
$args->{'mapHidden'} = 1;	$args->{'mapHidden'} = 1;
Line 1910 END	Line 1858 END
}	}
} else {	} else {
my $deeplink = $navmap->get_mapparam(undef,$mapname,"0.deeplink");	my $deeplink = $navmap->get_mapparam(undef,$mapname,"0.deeplink");
my ($state,$others,$listed) = split(/,/,$deeplink);	if ($deeplink =~ /^(absent\|grades),/) {
if (($listed eq 'absent') \|\| ($listed eq 'grades')) {
if ($userCanSeeHidden) {	if ($userCanSeeHidden) {
$args->{'mapUnlisted'} = 1;	$args->{'mapUnlisted'} = 1;
} else {	} else {
Line 1990 END	Line 1937 END
} else {	} else {
$args->{'resource_nolink'} = 1;	$args->{'resource_nolink'} = 1;
}	}

# If the multipart problem was condensed, "forget" it was multipart	# If the multipart problem was condensed, "forget" it was multipart
if (scalar(@parts) == 1) {	if (scalar(@parts) == 1) {
$args->{'multipart'} = 0;	$args->{'multipart'} = 0;
Line 2034 END	Line 1981 END
}	}
}	}
if (defined($anchor)) { $anchor='#'.$anchor; }	if (defined($anchor)) { $anchor='#'.$anchor; }
if (($args->{'caller'} eq 'sequence') && ($curRes->is_map())) {	if (($args->{'caller'} eq 'sequence') && ($curRes->is_map())) {
$args->{"resourceLink"} = $src.($srcHasQuestion?'&':'?') .'navmap=1';	$args->{"resourceLink"} = $src.($srcHasQuestion?'&':'?') .'navmap=1';
} else {	} else {
$args->{"resourceLink"} = $src.	$args->{"resourceLink"} = $src.
($srcHasQuestion?'&':'?') .	($srcHasQuestion?'&':'?') .
'symb=' . &escape($symb).$inhibitmenu.$anchor;	'symb=' . &escape($symb).$inhibitmenu.$anchor;
}	}
}	}
# Now, we've decided what parts to show. Loop through them and	# Now, we've decided what parts to show. Loop through them and
# show them.	# show them.
Line 2142 sub show_linkitems_toolbar {	Line 2089 sub show_linkitems_toolbar {
$result .= '<td align="left">'."\n".	$result .= '<td align="left">'."\n".
'<ul id="LC_toolbar">';	'<ul id="LC_toolbar">';
my @linkorder = ('firsthomework','everything','uncompleted',	my @linkorder = ('firsthomework','everything','uncompleted',
'changefolder','clearbubbles','printout','edittoplevel');	'changefolder','clearbubbles','edittoplevel');
foreach my $link (@linkorder) {	foreach my $link (@linkorder) {
if (ref($args->{'linkitems'}{$link}) eq 'HASH') {	if (ref($args->{'linkitems'}{$link}) eq 'HASH') {
if ($args->{'linkitems'}{$link}{'text'} ne '') {	if ($args->{'linkitems'}{$link}{'text'} ne '') {
Line 2361 sub change_user {	Line 2308 sub change_user {



# Now clear the parm cache and reconstruct the parm hash fromt he big_hash	# Now clear the parm cache and reconstruct the parm hash from the big_hash
# param.xxxx keys.	# param.xxxx keys.

$self->{PARM_CACHE} = {};	$self->{PARM_CACHE} = {};
Line 2826 sub parmval {	Line 2773 sub parmval {
return $self->{PARM_CACHE}->{$hashkey};	return $self->{PARM_CACHE}->{$hashkey};
}	}
}	}

my $result = $self->parmval_real($what, $symb, $recurse);	my $result = $self->parmval_real($what, $symb, $recurse);
$self->{PARM_CACHE}->{$hashkey} = $result;	$self->{PARM_CACHE}->{$hashkey} = $result;
if (wantarray) {	if (wantarray) {
Line 2863 sub parmval_real {	Line 2811 sub parmval_real {
if ($fn =~ /ext\.tool$/) {	if ($fn =~ /ext\.tool$/) {
$toolsymb = $symb;	$toolsymb = $symb;
}	}
	my ($recursed,@recurseup);

# ----------------------------------------------------- Cascading lookup scheme	# ----------------------------------------------------- Cascading lookup scheme
my $rwhat=$what;	my $rwhat=$what;
$what=~s/^parameter\_//;	$what=~s/^parameter\_//;
$what=~s/\_/\./;	$what=~s/\_/\./;

my $symbparm=$symb.'.'.$what;	my $symbparm=$symb.'.'.$what;
	my $recurseparm=$mapname.'___(rec).'.$what;
my $mapparm=$mapname.'___(all).'.$what;	my $mapparm=$mapname.'___(all).'.$what;
my $usercourseprefix=$cid;	my $usercourseprefix=$cid;



my $grplevel=$usercourseprefix.'.['.$cgroup.'].'.$what;	my $grplevel=$usercourseprefix.'.['.$cgroup.'].'.$what;
my $grplevelr=$usercourseprefix.'.['.$cgroup.'].'.$symbparm;	my $grplevelr=$usercourseprefix.'.['.$cgroup.'].'.$symbparm;
	my $grpleveli=$usercourseprefix.'.['.$cgroup.'].'.$recurseparm;
my $grplevelm=$usercourseprefix.'.['.$cgroup.'].'.$mapparm;	my $grplevelm=$usercourseprefix.'.['.$cgroup.'].'.$mapparm;


my $seclevel= $usercourseprefix.'.['.$csec.'].'.$what;	my $seclevel= $usercourseprefix.'.['.$csec.'].'.$what;
my $seclevelr=$usercourseprefix.'.['.$csec.'].'.$symbparm;	my $seclevelr=$usercourseprefix.'.['.$csec.'].'.$symbparm;
	my $secleveli=$usercourseprefix.'.['.$csec.'].'.$recurseparm;
my $seclevelm=$usercourseprefix.'.['.$csec.'].'.$mapparm;	my $seclevelm=$usercourseprefix.'.['.$csec.'].'.$mapparm;


my $courselevel= $usercourseprefix.'.'.$what;	my $courselevel= $usercourseprefix.'.'.$what;
my $courselevelr=$usercourseprefix.'.'.$symbparm;	my $courselevelr=$usercourseprefix.'.'.$symbparm;
	my $courseleveli=$usercourseprefix.'.'.$recurseparm;
my $courselevelm=$usercourseprefix.'.'.$mapparm;	my $courselevelm=$usercourseprefix.'.'.$mapparm;


Line 2897 sub parmval_real {	Line 2851 sub parmval_real {
if ($uname and defined($useropt)) {	if ($uname and defined($useropt)) {
if (defined($$useropt{$courselevelr})) { return [$$useropt{$courselevelr},'resource']; }	if (defined($$useropt{$courselevelr})) { return [$$useropt{$courselevelr},'resource']; }
if (defined($$useropt{$courselevelm})) { return [$$useropt{$courselevelm},'map']; }	if (defined($$useropt{$courselevelm})) { return [$$useropt{$courselevelm},'map']; }
	if (defined($$useropt{$courseleveli})) { return [$$useropt{$courseleveli},'map']; }
	unless ($recursed) {
	@recurseup = $self->recurseup_maps($mapname);
	$recursed = 1;
	}
	foreach my $item (@recurseup) {
	my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what;
	if (defined($$useropt{$norecursechk})) {
	if ($what =~ /\.(encrypturl\|hiddenresource)$/) {
	return [$$useropt{$norecursechk},'map'];
	} else {
	last;
	}
	}
	my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what;
	if (defined($$useropt{$recursechk})) { return [$$useropt{$recursechk},'map']; }
	}
if (defined($$useropt{$courselevel})) { return [$$useropt{$courselevel},'course']; }	if (defined($$useropt{$courselevel})) { return [$$useropt{$courselevel},'course']; }
}	}

Line 2904 sub parmval_real {	Line 2875 sub parmval_real {
if ($cgroup ne '' and defined($courseopt)) {	if ($cgroup ne '' and defined($courseopt)) {
if (defined($$courseopt{$grplevelr})) { return [$$courseopt{$grplevelr},'resource']; }	if (defined($$courseopt{$grplevelr})) { return [$$courseopt{$grplevelr},'resource']; }
if (defined($$courseopt{$grplevelm})) { return [$$courseopt{$grplevelm},'map']; }	if (defined($$courseopt{$grplevelm})) { return [$$courseopt{$grplevelm},'map']; }
	if (defined($$courseopt{$grpleveli})) { return [$$courseopt{$grpleveli},'map']; }
	unless ($recursed) {
	@recurseup = $self->recurseup_maps($mapname);
	$recursed = 1;
	}
	foreach my $item (@recurseup) {
	my $norecursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(all).'.$what;
	if (defined($$courseopt{$norecursechk})) {
	if ($what =~ /\.(encrypturl\|hiddenresource)$/) {
	return [$$courseopt{$norecursechk},'map'];
	} else {
	last;
	}
	}
	my $recursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(rec).'.$what;
	if (defined($$courseopt{$recursechk})) { return [$$courseopt{$recursechk},'map']; }
	}
if (defined($$courseopt{$grplevel})) { return [$$courseopt{$grplevel},'course']; }	if (defined($$courseopt{$grplevel})) { return [$$courseopt{$grplevel},'course']; }
}	}

if ($csec and defined($courseopt)) {	if ($csec ne '' and defined($courseopt)) {
if (defined($$courseopt{$seclevelr})) { return [$$courseopt{$seclevelr},'resource']; }	if (defined($$courseopt{$seclevelr})) { return [$$courseopt{$seclevelr},'resource']; }
if (defined($$courseopt{$seclevelm})) { return [$$courseopt{$seclevelm},'map']; }	if (defined($$courseopt{$seclevelm})) { return [$$courseopt{$seclevelm},'map']; }
	if (defined($$courseopt{$secleveli})) { return [$$courseopt{$secleveli},'map']; }
	unless ($recursed) {
	@recurseup = $self->recurseup_maps($mapname);
	$recursed = 1;
	}
	foreach my $item (@recurseup) {
	my $norecursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(all).'.$what;
	if (defined($$courseopt{$norecursechk})) {
	if ($what =~ /\.(encrypturl\|hiddenresource)$/) {
	return [$$courseopt{$norecursechk},'map'];
	} else {
	last;
	}
	}
	my $recursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(rec).'.$what;
	if (defined($$courseopt{$recursechk})) { return [$$courseopt{$recursechk},'map']; }
	}
if (defined($$courseopt{$seclevel})) { return [$$courseopt{$seclevel},'course']; }	if (defined($$courseopt{$seclevel})) { return [$$courseopt{$seclevel},'course']; }
}	}

Line 2933 sub parmval_real {	Line 2938 sub parmval_real {
# --------------------------------------------------- fifth, check more course	# --------------------------------------------------- fifth, check more course
if (defined($courseopt)) {	if (defined($courseopt)) {
if (defined($$courseopt{$courselevelm})) { return [$$courseopt{$courselevelm},'map']; }	if (defined($$courseopt{$courselevelm})) { return [$$courseopt{$courselevelm},'map']; }
	if (defined($$courseopt{$courseleveli})) { return [$$courseopt{$courseleveli},'map']; }
	unless ($recursed) {
	@recurseup = $self->recurseup_maps($mapname);
	$recursed = 1;
	}
	foreach my $item (@recurseup) {
	my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what;
	if (defined($$courseopt{$norecursechk})) {
	if ($what =~ /\.(encrypturl\|hiddenresource)$/) {
	return [$$courseopt{$norecursechk},'map'];
	} else {
	last;
	}
	}
	my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what;
	if (defined($$courseopt{$recursechk})) {
	return [$$courseopt{$recursechk},'map'];
	}
	}
if (defined($$courseopt{$courselevel})) {	if (defined($$courseopt{$courselevel})) {
my $ret = [$$courseopt{$courselevel},'course'];	my $ret = [$$courseopt{$courselevel},'course'];
return $ret;	return $ret;
Line 2997 sub recursed_crumbs {	Line 3021 sub recursed_crumbs {
my $pc = $map->map_pc();	my $pc = $map->map_pc();
next if ((!$pc) \|\| ($pc == 1));	next if ((!$pc) \|\| ($pc == 1));
push(@links,$map);	push(@links,$map);
my $text = $map->title();	push(@revmapinfo,{'href' => $env{'request.use_absolute'}.$map->link().'?navmap=1','text' => $map->title(),'no_mt' => 1,});
if ($text eq '') {	$totallength += length($map->title());
$text = '...';
}
push(@revmapinfo,{'href' => $env{'request.use_absolute'}.$map->link().'?navmap=1','text' => $text,'no_mt' => 1,});
$totallength += length($text);
}	}
my $numlinks = scalar(@links);	my $numlinks = scalar(@links);
if ($numlinks) {	if ($numlinks) {
Line 3014 sub recursed_crumbs {	Line 3034 sub recursed_crumbs {
}	}
@revmapinfo = ();	@revmapinfo = ();
foreach my $map (@links) {	foreach my $map (@links) {
my $title = $map->title();	my $showntitle = &truncate_crumb_text($map->title(),$avg);
if ($title eq '') {
$title = '...';
}
my $showntitle = &truncate_crumb_text($title,$avg);
if ($showntitle ne '') {	if ($showntitle ne '') {
push(@revmapinfo,{'href' => $env{'request.use_absolute'}.$map->link().'?navmap=1','text' => $showntitle,'no_mt' => 1,});	push(@revmapinfo,{'href' => $env{'request.use_absolute'}.$map->link().'?navmap=1','text' => $showntitle,'no_mt' => 1,});
}	}
Line 3077 sub map_printdates {	Line 3093 sub map_printdates {


my $opendate = $self->get_mapparam($res->symb(),'',"$part.printstartdate");	my $opendate = $self->get_mapparam($res->symb(),'',"$part.printstartdate");
my $closedate= $self->get_mapparam($res->symb(),'', "$part.printenddate");	my $closedate= $self->get_mapparam($res->symb(),'',"$part.printenddate");


return ($opendate, $closedate);	return ($opendate, $closedate);
Line 3107 sub get_mapparam {	Line 3123 sub get_mapparam {
my $result='';	my $result='';
my ($recursed,@recurseup);	my ($recursed,@recurseup);


# Figure out which map we are in.	# Figure out which map we are in.

if ($symb && !$mapname) {	if ($symb && !$mapname) {
Line 3115 sub get_mapparam {	Line 3132 sub get_mapparam {
$mapname = &Apache::lonnet::deversion($mapname);	$mapname = &Apache::lonnet::deversion($mapname);
}	}


my $rwhat=$what;	my $rwhat=$what;
$what=~s/^parameter\_//;	$what=~s/^parameter\_//;
$what=~s/\_/\./;	$what=~s/\_/\./;

# Build the hash keys for the lookup:	# Build the hash keys for the lookup:

my $symbparm=$symb.'.'.$what;
my $mapparm=$mapname.'___(all).'.$what;	my $mapparm=$mapname.'___(all).'.$what;
	my $recurseparm=$mapname.'___(rec).'.$what;
my $usercourseprefix=$cid;	my $usercourseprefix=$cid;


my $grplevel = "$usercourseprefix.[$cgroup].$mapparm";	my $grplevelm = "$usercourseprefix.[$cgroup].$mapparm";
my $seclevel = "$usercourseprefix.[$csec].$mapparm";	my $seclevelm = "$usercourseprefix.[$csec].$mapparm";
my $courselevel = "$usercourseprefix.$mapparm";	my $courselevelm = "$usercourseprefix.$mapparm";

	my $grpleveli = "$usercourseprefix.[$cgroup].$recurseparm";
	my $secleveli = "$usercourseprefix.[$csec].$recurseparm";
	my $courseleveli = "$usercourseprefix.$recurseparm";

# Get handy references to the hashes we need in $self:	# Get handy references to the hashes we need in $self:

Line 3142 sub get_mapparam {	Line 3163 sub get_mapparam {


if ($uname and defined($useropt)) {	if ($uname and defined($useropt)) {
if (defined($$useropt{$courselevel})) {	if (defined($$useropt{$courselevelm})) {
return $$useropt{$courselevel};	return $$useropt{$courselevelm};
}	}
if ($what =~ /\.(encrypturl\|hiddenresource)$/) {	if (defined($$useropt{$courseleveli})) {
unless ($recursed) {	return $$useropt{$courseleveli};
@recurseup = $self->recurseup_maps($mapname);	}
$recursed = 1;	unless ($recursed) {
}	@recurseup = $self->recurseup_maps($mapname);
foreach my $item (@recurseup) {	$recursed = 1;
my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what;	}
if (defined($$useropt{$norecursechk})) {	foreach my $item (@recurseup) {
if ($what =~ /\.(encrypturl\|hiddenresource)$/) {	my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what;
return $$useropt{$norecursechk};	if (defined($$useropt{$norecursechk})) {
}	if ($what =~ /\.(encrypturl\|hiddenresource)$/) {
	return $$useropt{$norecursechk};
	} else {
	last;
}	}
}	}
	my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what;
	if (defined($$useropt{$recursechk})) {
	return $$useropt{$recursechk};
	}
}	}
}	}

Line 3166 sub get_mapparam {	Line 3194 sub get_mapparam {


if ($cgroup ne '' and defined ($courseopt)) {	if ($cgroup ne '' and defined ($courseopt)) {
if (defined($$courseopt{$grplevel})) {	if (defined($$courseopt{$grplevelm})) {
return $$courseopt{$grplevel};	return $$courseopt{$grplevelm};
}	}
if ($what =~ /\.(encrypturl\|hiddenresource)$/) {	if (defined($$courseopt{$grpleveli})) {
unless ($recursed) {	return $$courseopt{$grpleveli};
@recurseup = $self->recurseup_maps($mapname);	}
$recursed = 1;	unless ($recursed) {
}	@recurseup = $self->recurseup_maps($mapname);
foreach my $item (@recurseup) {	$recursed = 1;
my $norecursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(all).'.$what;	}
if (defined($$courseopt{$norecursechk})) {	foreach my $item (@recurseup) {
if ($what =~ /\.(encrypturl\|hiddenresource)$/) {	my $norecursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(all).'.$what;
return $$courseopt{$norecursechk};	if (defined($$courseopt{$norecursechk})) {
}	if ($what =~ /\.(encrypturl\|hiddenresource)$/) {
	return $$courseopt{$norecursechk};
	} else {
	last;
}	}
}	}
	my $recursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(rec).'.$what;
	if (defined($$courseopt{$recursechk})) {
	return $$courseopt{$recursechk};
	}
}	}
}	}

# Check course -- section	# Check course -- section


	if ($csec ne '' and defined($courseopt)) {
	if (defined($$courseopt{$seclevelm})) {
	return $$courseopt{$seclevelm};
if ($csec and defined($courseopt)) {
if (defined($$courseopt{$seclevel})) {
return $$courseopt{$seclevel};
}	}
if ($what =~ /\.(encrypturl\|hiddenresource)$/) {	if (defined($$courseopt{$secleveli})) {
unless ($recursed) {	return $$courseopt{$secleveli};
@recurseup = $self->recurseup_maps($mapname);	}
$recursed = 1;	unless ($recursed) {
}	@recurseup = $self->recurseup_maps($mapname);
foreach my $item (@recurseup) {	$recursed = 1;
my $norecursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(all).'.$what;	}
if (defined($$courseopt{$norecursechk})) {	foreach my $item (@recurseup) {
if ($what =~ /\.(encrypturl\|hiddenresource)$/) {	my $norecursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(all).'.$what;
return $$courseopt{$norecursechk};	if (defined($$courseopt{$norecursechk})) {
}	if ($what =~ /\.(encrypturl\|hiddenresource)$/) {
	return $$courseopt{$norecursechk};
	} else {
	last;
}	}
}	}
	my $recursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(rec).'.$what;
	if (defined($$courseopt{$recursechk})) {
	return $$courseopt{$recursechk};
	}
}	}
}	}
# Check the map parameters themselves:	# Check the map parameters themselves:
Line 3216 sub get_mapparam {	Line 3255 sub get_mapparam {
my $symbparm=$symb.'.'.$what;	my $symbparm=$symb.'.'.$what;
my $thisparm = $$parmhash{$symbparm};	my $thisparm = $$parmhash{$symbparm};
if (defined($thisparm)) {	if (defined($thisparm)) {
return $thisparm;	return $thisparm;
}	}
}	}

Line 3224 sub get_mapparam {	Line 3263 sub get_mapparam {
# Additional course parameters:	# Additional course parameters:

if (defined($courseopt)) {	if (defined($courseopt)) {
if (defined($$courseopt{$courselevel})) {	if (defined($$courseopt{$courselevelm})) {
return $$courseopt{$courselevel};	return $$courseopt{$courselevelm};
}	}
if ($what =~ /\.(encrypturl\|hiddenresource)$/) {	if (defined($$courseopt{$courseleveli})) {
unless ($recursed) {	return $$courseopt{$courseleveli};
@recurseup = $self->recurseup_maps($mapname);	}
$recursed = 1;	unless ($recursed) {
}	@recurseup = $self->recurseup_maps($mapname);
	$recursed = 1;
	}
	if (@recurseup) {
foreach my $item (@recurseup) {	foreach my $item (@recurseup) {
my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what;	my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what;
if (defined($$courseopt{$norecursechk})) {	if (defined($$courseopt{$norecursechk})) {
if ($what =~ /\.(encrypturl\|hiddenresource)$/) {	if ($what =~ /\.(encrypturl\|hiddenresource)$/) {
return $$courseopt{$norecursechk};	return $$courseopt{$norecursechk};
	} else {
	last;
}	}
}	}
	my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what;
	if (defined($$courseopt{$recursechk})) {
	return $$courseopt{$recursechk};
	}
}	}
}	}
}	}
return undef; # Unefined if we got here.	return undef; # Undefined if we got here.
}	}

sub course_printdates {	sub course_printdates {
Line 3284 sub getcourseparam {	Line 3332 sub getcourseparam {
$what=~s/^parameter\_//;	$what=~s/^parameter\_//;
$what=~s/\_/\./;	$what=~s/\_/\./;


my $symbparm = $symb . '.' . $what;
my $mapparm=$mapname.'___(all).'.$what;

# Local refs to the hashes we're going to look at:	# Local refs to the hashes we're going to look at:

my $useropt = $self->{USER_OPT};	my $useropt = $self->{USER_OPT};
Line 3618 cause the iterator to return the top-lev	Line 3662 cause the iterator to return the top-lev
before anything else. deeplinklisted if true (default false), will	before anything else. deeplinklisted if true (default false), will
check "listed" status of a resource with a deeplink, and unless "absent"	check "listed" status of a resource with a deeplink, and unless "absent"
will exclude deeplink checking when retrieving the browsePriv from	will exclude deeplink checking when retrieving the browsePriv from
lonnet::allowed().	lonnet::allowed().

Thus, by default, only top-level resources will be shown. Change the	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	condition to a 1 without changing the hash, and all resources will be
Line 4365 sub new {	Line 4409 sub new {

# This is a speed optimization, to avoid calling symb() too often.	# This is a speed optimization, to avoid calling symb() too often.
$self->{SYMB} = $self->symb();	$self->{SYMB} = $self->symb();

return $self;	return $self;
}	}

Line 4492 sub enclosing_map_src {	Line 4536 sub enclosing_map_src {
}	}
sub symb {	sub symb {
my $self=shift;	my $self=shift;
if (defined($self->{SYMB})) { return $self->{SYMB}; }	if (defined $self->{SYMB}) { return $self->{SYMB}; }
(my $first, my $second) = $self->{ID} =~ /(\d+).(\d+)/;	(my $first, my $second) = $self->{ID} =~ /(\d+).(\d+)/;
my $symbSrc = &Apache::lonnet::declutter($self->src());	my $symbSrc = &Apache::lonnet::declutter($self->src());
my $symb = &Apache::lonnet::declutter($self->navHash('map_id_'.$first))	my $symb = &Apache::lonnet::declutter($self->navHash('map_id_'.$first))
Line 4696 sub is_sequence {	Line 4740 sub is_sequence {
return $self->navHash("is_map_", 1) &&	return $self->navHash("is_map_", 1) &&
$self->navHash("map_type_" . $self->map_pc()) eq 'sequence';	$self->navHash("map_type_" . $self->map_pc()) eq 'sequence';
}	}
sub is_missing_map {
my $self=shift;
return $self->navHash("is_map_", 1) &&
$self->navHash("map_type_" . $self->map_pc()) eq 'none';
}
sub is_survey {	sub is_survey {
my $self = shift();	my $self = shift();
my $part = shift();	my $part = shift();
Line 5050 sub duedate {	Line 5089 sub duedate {
my $date;	my $date;
my @interval=$self->parmval("interval", $part);	my @interval=$self->parmval("interval", $part);
my $due_date=$self->parmval("duedate", $part);	my $due_date=$self->parmval("duedate", $part);
if ($interval[0] =~ /(\d+)/) {	if ($interval[0] =~ /^(\d+)/) {
my $timelimit = $1;	my $timelimit = $1;
my $first_access=&Apache::lonnet::get_first_access($interval[1],	my $first_access=&Apache::lonnet::get_first_access($interval[1],
$self->{SYMB});	$self->{SYMB});
if (defined($first_access)) {	if (defined($first_access)) {
my $interval = $first_access+$timelimit;	my $interval = $first_access+$timelimit;
$date = (!$due_date \|\| $interval < $due_date) ? $interval	$date = (!$due_date \|\| $interval < $due_date) ? $interval
Line 5153 sub deeplink {	Line 5192 sub deeplink {
my ($self,$caller,$action) = @_;	my ($self,$caller,$action) = @_;
my $deeplink = $self->parmval("deeplink");	my $deeplink = $self->parmval("deeplink");
if ($deeplink) {	if ($deeplink) {
my ($state,$others,$listed,$scope) = split(/,/,$deeplink);	my ($listed,$scope,$access) = split(/,/,$deeplink);
if ($action eq 'getlisted') {	if ($action eq 'getlisted') {
return $listed;	return $listed;
}	}
Line 5183 sub deeplink {	Line 5222 sub deeplink {
}	}
}	}
}	}
unless (($caller eq 'sequence') \|\| ($state eq 'both')) {	unless (($caller eq 'sequence') \|\| ($access eq 'any')) {
return $listed;	return $listed;
}	}
}	}
Line 5195 sub getReturnHash {	Line 5234 sub getReturnHash {
my $self = shift;	my $self = shift;

if (!defined($self->{RETURN_HASH})) {	if (!defined($self->{RETURN_HASH})) {
my %tmpHash = &Apache::lonnet::restore($self->{SYMB},undef,$self->{DOMAIN},$self->{USERNAME});	#my %tmpHash = &Apache::lonnet::restore($self->{SYMB},undef,$self->{DOMAIN},$self->{USERNAME});
$self->{RETURN_HASH} = \%tmpHash;	#$self->{RETURN_HASH} = \%tmpHash;
	# When info is retrieved for several resources (as when rendering a directory),
	# it is much faster to use the user profile dump and avoid repeated lonnet requests
	# (especially since lonnet::currentdump is using Lond directly whenever possible,
	# and lonnet::restore is not at this point).
	$self->{NAV_MAP}->get_user_data();
	$self->{RETURN_HASH} = $self->{NAV_MAP}->{STUDENT_DATA}->{$self->{SYMB}};
}	}
}	}

Line 5596 The problem will be opened later.	Line 5641 The problem will be opened later.

Open and not yet due.	Open and not yet due.


=item * B<PAST_DUE_ANSWER_LATER>:	=item * B<PAST_DUE_ANSWER_LATER>:

The due date has passed, but the answer date has not yet arrived.	The due date has passed, but the answer date has not yet arrived.
Line 5608 The due date has passed and there is no	Line 5654 The due date has passed and there is no

The answer date is here.	The answer date is here.

=item * B<NOTHING_SET>:

No dates have been set for this problem at all.

=item * B<PAST_DUE_ATMPT_ANS>:

The due date has passed, feedback is suppressed, the problem was attempted, and the answer date has not yet arrived.

=item * B<PAST_DUE_ATMPT_NOANS>:

The due date has passed, feedback is suppressed, the problem was attempted, and there is no answer opening date set.

=item * B<PAST_DUE_NO_ATMT_ANS>:

The due date has passed, feedback is suppressed, the problem was not attempted, and the answer date has not yet arrived.

=item * B<PAST_DUE_NO_ATMT_NOANS>:

The due date has passed, feedback is suppressed, the problem was not attempted, and there is no answer opening date set.

=item * B<NETWORK_FAILURE>:	=item * B<NETWORK_FAILURE>:

The information is unknown due to network failure.	The information is unknown due to network failure.
Line 5643 sub PAST_DUE_NO_ANSWER { return 2; }	Line 5669 sub PAST_DUE_NO_ANSWER { return 2; }
sub PAST_DUE_ANSWER_LATER { return 3; }	sub PAST_DUE_ANSWER_LATER { return 3; }
sub ANSWER_OPEN { return 4; }	sub ANSWER_OPEN { return 4; }
sub NOTHING_SET { return 5; }	sub NOTHING_SET { return 5; }
sub PAST_DUE_ATMPT_ANS { return 6; }
sub PAST_DUE_ATMPT_NOANS { return 7; }
sub PAST_DUE_NO_ATMT_ANS { return 8; }
sub PAST_DUE_NO_ATMT_NOANS { return 9; }
sub NETWORK_FAILURE { return 100; }	sub NETWORK_FAILURE { return 100; }

# getDateStatus gets the date status for a given problem part.	# getDateStatus gets the date status for a given problem part.
Line 5850 set.	Line 5872 set.
The problem is past due, not considered correct, and an answer date in	The problem is past due, not considered correct, and an answer date in
the future is set.	the future is set.

=item * B<PAST_DUE_ATMPT_ANS>:

The problem is past due, feedback is suppressed, the problem was
attempted and an answer date in the future is set.

=item * B<PAST_DUE_ATMPT_NOANS>:

The problem is past due, feedback is suppressed, the problem was
attempted and no answer date is set.

=item * B<PAST_DUE_NO_ATMT_ANS>:

The problem is past due, feedback is suppressed, the problem was
not attempted and an answer date in the future is set.

=item * B<PAST_DUE_NO_ATMT_NOANS>:

The problem is past due, feedback is suppressed, the problem was
not attempted and no answer date is set.

=item * B<ANSWER_OPEN>:	=item * B<ANSWER_OPEN>:

The problem is past due, not correct, and the answer is now available.	The problem is past due, not correct, and the answer is now available.
Line 5953 sub status {	Line 5955 sub status {
if ($completionStatus == CORRECT \|\|	if ($completionStatus == CORRECT \|\|
$completionStatus == CORRECT_BY_OVERRIDE \|\|	$completionStatus == CORRECT_BY_OVERRIDE \|\|
$completionStatus == CORRECT_BY_PASSBACK ) {	$completionStatus == CORRECT_BY_PASSBACK ) {
if ( $suppressFeedback ) {	if ( $suppressFeedback ) { return ANSWER_SUBMITTED }
if ($dateStatus == PAST_DUE_ANSWER_LATER \|\|
$dateStatus == PAST_DUE_NO_ANSWER ) {
if ($dateStatus == PAST_DUE_ANSWER_LATER) {
return PAST_DUE_ATMPT_ANS;
} else {
return PAST_DUE_ATMPT_NOANS;
}
} else {
return ANSWER_SUBMITTED;
}
}
my $awarded=$self->awarded($part);	my $awarded=$self->awarded($part);
if ($awarded < 1 && $awarded > 0) {	if ($awarded < 1 && $awarded > 0) {
return PARTIALLY_CORRECT;	return PARTIALLY_CORRECT;
Line 5977 sub status {	Line 5968 sub status {
# If it's WRONG... and not open	# If it's WRONG... and not open
if ( ($completionStatus == INCORRECT \|\|	if ( ($completionStatus == INCORRECT \|\|
$completionStatus == INCORRECT_BY_OVERRIDE \|\|	$completionStatus == INCORRECT_BY_OVERRIDE \|\|
$completionStatus == INCORRECT_BY_PASSBACK)	$completionStatus == INCORRECT_BY_PASSBACK)
&& (!$self->opendate($part) \|\| $self->opendate($part) > time()) ) {	&& (!$self->opendate($part) \|\| $self->opendate($part) > time()) ) {
return INCORRECT;	return INCORRECT;
}	}
Line 6004 sub status {	Line 5995 sub status {

if ($dateStatus == PAST_DUE_ANSWER_LATER \|\|	if ($dateStatus == PAST_DUE_ANSWER_LATER \|\|
$dateStatus == PAST_DUE_NO_ANSWER ) {	$dateStatus == PAST_DUE_NO_ANSWER ) {
if ($suppressFeedback) {	return $suppressFeedback ? ANSWER_SUBMITTED : $dateStatus;
if ($completionStatus == NOT_ATTEMPTED) {
if ($dateStatus == PAST_DUE_ANSWER_LATER) {
return PAST_DUE_NO_ATMT_ANS;
} else {
return PAST_DUE_NO_ATMT_NOANS;
}
} else {
if ($dateStatus == PAST_DUE_ANSWER_LATER) {
return PAST_DUE_ATMPT_ANS;
} else {
return PAST_DUE_ATMPT_NOANS;
}
}
} else {
return $dateStatus;
}
}	}

if ($dateStatus == ANSWER_OPEN) {	if ($dateStatus == ANSWER_OPEN) {
Line 6136 sub check_for_slot {	Line 6111 sub check_for_slot {
my $reservable = &Apache::lonnet::get_reservable_slots($cnum,$cdom,$env{'user.name'},	my $reservable = &Apache::lonnet::get_reservable_slots($cnum,$cdom,$env{'user.name'},
$env{'user.domain'});	$env{'user.domain'});
if (ref($reservable) eq 'HASH') {	if (ref($reservable) eq 'HASH') {
	my ($map) = &Apache::lonnet::decode_symb($symb);
if ((ref($reservable->{'now_order'}) eq 'ARRAY') && (ref($reservable->{'now'}) eq 'HASH')) {	if ((ref($reservable->{'now_order'}) eq 'ARRAY') && (ref($reservable->{'now'}) eq 'HASH')) {
foreach my $slot (reverse (@{$reservable->{'now_order'}})) {	foreach my $slot (reverse (@{$reservable->{'now_order'}})) {
my $canuse;	my $canuse;
if (($reservable->{'now'}{$slot}{'symb'} eq '') \|\|	if ($reservable->{'now'}{$slot}{'symb'} eq '') {
($reservable->{'now'}{$slot}{'symb'} eq $symb)) {
$canuse = 1;	$canuse = 1;
	} else {
	my %oksymbs;
	my @slotsymbs = split(/\s,\s/,$reservable->{'now'}{$slot}{'symb'});
	map { $oksymbs{$_} = 1; } @slotsymbs;
	if ($oksymbs{$symb}) {
	$canuse = 1;
	} else {
	foreach my $item (@slotsymbs) {
	if ($item =~ /\.(page\|sequence)$/) {
	(undef,undef, my $sloturl) = &Apache::lonnet::decode_symb($item);
	if (($map ne '') && ($map eq $sloturl)) {
	$canuse = 1;
	last;
	}
	}
	}
	}
}	}
if ($canuse) {	if ($canuse) {
if ($checkedin) {	if ($checkedin) {
Line 6162 sub check_for_slot {	Line 6154 sub check_for_slot {
if ((ref($reservable->{'future_order'}) eq 'ARRAY') && (ref($reservable->{'future'}) eq 'HASH')) {	if ((ref($reservable->{'future_order'}) eq 'ARRAY') && (ref($reservable->{'future'}) eq 'HASH')) {
foreach my $slot (@{$reservable->{'future_order'}}) {	foreach my $slot (@{$reservable->{'future_order'}}) {
my $canuse;	my $canuse;
if (($reservable->{'future'}{$slot}{'symb'} eq '') \|\|	if ($reservable->{'future'}{$slot}{'symb'} eq '') {
($reservable->{'future'}{$slot}{'symb'} eq $symb)) {	$canuse = 1;
	} elsif ($reservable->{'future'}{$slot}{'symb'} =~ /,/) {
	my %oksymbs;
	my @slotsymbs = split(/\s,\s/,$reservable->{'future'}{$slot}{'symb'});
	map { $oksymbs{$_} = 1; } @slotsymbs;
	if ($oksymbs{$symb}) {
	$canuse = 1;
	} else {
	foreach my $item (@slotsymbs) {
	if ($item =~ /\.(page\|sequence)$/) {
	(undef,undef, my $sloturl) = &Apache::lonnet::decode_symb($item);
	if (($map ne '') && ($map eq $sloturl)) {
	$canuse = 1;
	last;
	}
	}
	}
	}
	} elsif ($reservable->{'future'}{$slot}{'symb'} eq $symb) {
$canuse = 1;	$canuse = 1;
}	}
if ($canuse) {	if ($canuse) {
Line 6231 my %compositeToSimple =	Line 6241 my %compositeToSimple =
EXCUSED() => CORRECT,	EXCUSED() => CORRECT,
PAST_DUE_NO_ANSWER() => INCORRECT,	PAST_DUE_NO_ANSWER() => INCORRECT,
PAST_DUE_ANSWER_LATER() => INCORRECT,	PAST_DUE_ANSWER_LATER() => INCORRECT,
PAST_DUE_ATMPT_ANS() => ATTEMPTED,
PAST_DUE_ATMPT_NOANS() => ATTEMPTED,
PAST_DUE_NO_ATMT_ANS() => CLOSED,
PAST_DUE_NO_ATMT_NOANS() => CLOSED,
ANSWER_OPEN() => INCORRECT,	ANSWER_OPEN() => INCORRECT,
OPEN_LATER() => CLOSED,	OPEN_LATER() => CLOSED,
TRIES_LEFT() => OPEN,	TRIES_LEFT() => OPEN,
Line 6429 sub browsePriv {	Line 6435 sub browsePriv {
$self->{SYMB},undef,	$self->{SYMB},undef,
undef,$noblockcheck,	undef,$noblockcheck,
undef,$nodeeplinkcheck,	undef,$nodeeplinkcheck,
$nodeeplinkout);	$nodeeplinkout);
}	}

=pod	=pod

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.509.2.14.2.9
changed lines
	Added in v.1.553