Return to lonnavmaps.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonnavmaps.pm between versions 1.294 and 1.315

version 1.294, 2004/09/20 15:23:13	version 1.315, 2005/02/05 06:52:50
Line 33 use strict;	Line 33 use strict;
use Apache::Constants qw(:common :http);	use Apache::Constants qw(:common :http);
use Apache::loncommon();	use Apache::loncommon();
use Apache::lonmenu();	use Apache::lonmenu();
	use Apache::lonenc();
use Apache::lonlocal;	use Apache::lonlocal;
	use Apache::lonnet;
use POSIX qw (floor strftime);	use POSIX qw (floor strftime);
use Data::Dumper; # for debugging, not always used	use Data::Dumper; # for debugging, not always

# symbolic constants	# symbolic constants
sub SYMB { return 1; }	sub SYMB { return 1; }
Line 119 window.status='Done.';	Line 121 window.status='Done.';
ENDCLOSE	ENDCLOSE
}	}

sub nav_control_js {
my $nav=($ENV{'environment.remotenavmap'} eq 'on');
return (<<NAVCONTROL);
var w_loncapanav_flag="$nav";


function gonav(url) {
if (w_loncapanav_flag != 1) {
gopost(url,'');
} else {
navwindow=window.open(url,
"loncapanav","height=600,width=400,scrollbars=1");
}
}
NAVCONTROL
}

sub update {	sub update {
if ($ENV{'environment.remotenavmap'} ne 'on') { return ''; }	if ($ENV{'environment.remotenavmap'} ne 'on') { return ''; }
if (!$ENV{'request.course.id'}) { return ''; }	if (!$ENV{'request.course.id'}) { return ''; }
Line 179 sub real_handler {	Line 164 sub real_handler {
$r->send_http_header;	$r->send_http_header;

my %toplinkitems=();	my %toplinkitems=();
	&add_linkitem(\%toplinkitems,'blank','',"Select Action");
if ($ENV{QUERY_STRING} eq 'collapseExternal') {	if ($ENV{QUERY_STRING} eq 'collapseExternal') {
&Apache::lonnet::put('environment',{'remotenavmap' => 'off'});	&Apache::lonnet::put('environment',{'remotenavmap' => 'off'});
&Apache::lonnet::appenv('environment.remotenavmap' => 'off');	&Apache::lonnet::appenv('environment.remotenavmap' => 'off');
Line 232 ENDSUBM	Line 217 ENDSUBM
$r->print("<html><head>\n");	$r->print("<html><head>\n");
$r->print("<title>".&mt('Navigate Course Contents')."</title>");	$r->print("<title>".&mt('Navigate Course Contents')."</title>");
# ------------------------------------------------------------ Get query string	# ------------------------------------------------------------ Get query string
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework']);	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework','postsymb']);

# ----------------------------------------------------- Force menu registration	# ----------------------------------------------------- Force menu registration
my $addentries='';	my $addentries='';
Line 370 ENDSUBM	Line 355 ENDSUBM
return $res->completable() \|\| $res->is_map();	return $res->completable() \|\| $res->is_map();
};	};
&add_linkitem(\%toplinkitems,'everything',	&add_linkitem(\%toplinkitems,'everything',
'location.href="locatnavmaps?sort='.$ENV{'form.sort'}.'"',	'location.href="navmaps?sort='.$ENV{'form.sort'}.'"',
"Show Everything");	"Show Everything");
$r->print("<p><font size='+2'>".&mt("Uncompleted Homework")."</font></p>");	$r->print("<p><font size='+2'>".&mt("Uncompleted Homework")."</font></p>");
$ENV{'form.filter'} = '';	$ENV{'form.filter'} = '';
Line 392 ENDSUBM	Line 377 ENDSUBM
<option value=\"default\" $selected{'default'}>".&mt('Default')."</option>	<option value=\"default\" $selected{'default'}>".&mt('Default')."</option>
<option value=\"title\" $selected{'title'} >".&mt('Title')."</option>	<option value=\"title\" $selected{'title'} >".&mt('Title')."</option>
<option value=\"duedate\" $selected{'duedate'}>".&mt('Duedate')."</option>	<option value=\"duedate\" $selected{'duedate'}>".&mt('Duedate')."</option>
	<option value=\"discussion\" $selected{'discussion'}>".&mt('Has New Discussion')."</option>
</select>	</select>
</nobr>	</nobr>
</form>");	</form>");
Line 409 ENDSUBM	Line 395 ENDSUBM
'caller' => 'navmapsdisplay',	'caller' => 'navmapsdisplay',
'linkitems' => \%toplinkitems};	'linkitems' => \%toplinkitems};
my $render = render($renderArgs);	my $render = render($renderArgs);
$navmap->untieHashes();

# If no resources were printed, print a reassuring message so the	# If no resources were printed, print a reassuring message so the
# user knows there was no error.	# user knows there was no error.
Line 450 sub removeFromFilter {	Line 435 sub removeFromFilter {

# Convenience function: Given a stack returned from getStack on the iterator,	# Convenience function: Given a stack returned from getStack on the iterator,
# return the correct src() value.	# return the correct src() value.
# Later, this should add an anchor when we start putting anchors in pages.
sub getLinkForResource {	sub getLinkForResource {
my $stack = shift;	my $stack = shift;
my $res;	my $res;
Line 458 sub getLinkForResource {	Line 442 sub getLinkForResource {
# Check to see if there are any pages in the stack	# Check to see if there are any pages in the stack
foreach $res (@$stack) {	foreach $res (@$stack) {
if (defined($res)) {	if (defined($res)) {
	my $anchor;
if ($res->is_page()) {	if ($res->is_page()) {
return $res->src();	foreach (@$stack) { if (defined($_)) { $anchor = $_; } }
	$anchor=&Apache::lonnet::escape($anchor->shown_symb());
	return ($res->link(),$res->shown_symb(),$anchor);
}	}
# in case folder was skipped over as "only sequence"	# in case folder was skipped over as "only sequence"
my ($map,$id,$src)=&Apache::lonnet::decode_symb($res->symb());	my ($map,$id,$src)=&Apache::lonnet::decode_symb($res->symb());
if ($map=~/\.page$/) {	if ($map=~/\.page$/) {
return &Apache::lonnet::clutter($map).'#'.	my $url=&Apache::lonnet::clutter($map);
&Apache::lonnet::escape(&Apache::lonnet::declutter($src));	$anchor=&Apache::lonnet::escape($src->shown_symb());
	return ($url,$res->shown_symb(),$anchor);
}	}
}	}
}	}
Line 478 sub getLinkForResource {	Line 466 sub getLinkForResource {
if (defined($_)) { $res = $_; }	if (defined($_)) { $res = $_; }
}	}

return $res->src();	return ($res->link(),$res->shown_symb());
}	}

# Convenience function: This separates the logic of how to create	# Convenience function: This separates the logic of how to create
Line 1026 sub render_resource {	Line 1014 sub render_resource {
my $nonLinkedText = ''; # stuff after resource title not in link	my $nonLinkedText = ''; # stuff after resource title not in link

my $link = $params->{"resourceLink"};	my $link = $params->{"resourceLink"};

	# The URL part is not escaped at this point, but the symb is...
	# The stuff to the left of the ? must have ' replaced by \' since
	# it will be quoted with ' in the href.

	my ($left,$right) = split(/\?/, $link);
	$left =~ s/'/\\'/g;
	$link = $left.'?'.$right;

my $src = $resource->src();	my $src = $resource->src();
my $it = $params->{"iterator"};	my $it = $params->{"iterator"};
my $filter = $it->{FILTER};	my $filter = $it->{FILTER};
Line 1034 sub render_resource {	Line 1031 sub render_resource {

my $partLabel = "";	my $partLabel = "";
my $newBranchText = "";	my $newBranchText = "";
	my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
# If this is a new branch, label it so	# If this is a new branch, label it so
if ($params->{'isNewBranch'}) {	if ($params->{'isNewBranch'}) {
$newBranchText = "<img src='/adm/lonIcons/branch.gif' border='0' />";	$newBranchText = "<img src='$location/branch.gif' border='0' />";
}	}

# links to open and close the folder	# links to open and close the folder


my $linkopen = "<a href='$link'>";	my $linkopen = "<a href='$link'>";


my $linkclose = "</a>";	my $linkclose = "</a>";

# Default icon: unknown page	# Default icon: unknown page
my $icon = "<img src='/adm/lonIcons/unknown.gif' alt='' border='0' />";	my $icon = "<img src='$location/unknown.gif' alt='' border='0' />";

if ($resource->is_problem()) {	if ($resource->is_problem()) {
if ($part eq '0' \|\| $params->{'condensed'}) {	if ($part eq '0' \|\| $params->{'condensed'}) {
$icon = '<img src="/adm/lonIcons/problem.gif" alt="" border="0" />';	$icon ='<img src="'.$location.'/problem.gif" alt="" border="0" />';
} else {	} else {
$icon = $params->{'indentString'};	$icon = $params->{'indentString'};
}	}
} else {	} else {
$icon = "<img src='".&Apache::loncommon::icon($resource->src).	$icon = "<img src='".&Apache::loncommon::lonhttpdurl(&Apache::loncommon::icon($resource->src))."' alt='' border='0' />";
"' alt='' border='0' />";
}	}

# Display the correct map icon to open or shut map	# Display the correct map icon to open or shut map
Line 1070 sub render_resource {	Line 1070 sub render_resource {

if (!$params->{'resource_no_folder_link'}) {	if (!$params->{'resource_no_folder_link'}) {
$icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') . '.gif';	$icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') . '.gif';
$icon = "<img src='/adm/lonIcons/$icon' alt='' border='0' />";	$icon = "<img src='$location/$icon' alt='' border='0' />";

$linkopen = "<a href='" . $params->{'url'} . '?' .	$linkopen = "<a href='" . $params->{'url'} . '?' .
$params->{'queryString'} . '&filter=';	$params->{'queryString'} . '&filter=';
Line 1083 sub render_resource {	Line 1083 sub render_resource {
'&jump=' .	'&jump=' .
&Apache::lonnet::escape($resource->symb()) .	&Apache::lonnet::escape($resource->symb()) .
"&folderManip=1'>";	"&folderManip=1'>";

} else {	} else {
# Don't allow users to manipulate folder	# Don't allow users to manipulate folder
$icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') .	$icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') .
'.nomanip.gif';	'.nomanip.gif';
$icon = "<img src='/adm/lonIcons/$icon' alt='' border='0' />";	$icon = "<img src='$location/$icon' alt='' border='0' />";

$linkopen = "";	$linkopen = "";
$linkclose = "";	$linkclose = "";
Line 1110 sub render_resource {	Line 1111 sub render_resource {
}	}

# Decide what to display	# Decide what to display

$result .= "$newBranchText$linkopen$icon$linkclose";	$result .= "$newBranchText$linkopen$icon$linkclose";

my $curMarkerBegin = '';	my $curMarkerBegin = '';
Line 1127 sub render_resource {	Line 1129 sub render_resource {
!$params->{'condensed'}) {	!$params->{'condensed'}) {
my $displaypart=$resource->part_display($part);	my $displaypart=$resource->part_display($part);
$partLabel = " (Part: $displaypart)";	$partLabel = " (Part: $displaypart)";
$link.='#'.&Apache::lonnet::escape($part);	if ($link!~/\#/) { $link.='#'.&Apache::lonnet::escape($part); }
$title = "";	$title = "";
}	}

Line 1155 sub render_communication_status {	Line 1157 sub render_communication_status {
my $link = $params->{"resourceLink"};	my $link = $params->{"resourceLink"};
my $linkopen = "<a href='$link'>";	my $linkopen = "<a href='$link'>";
my $linkclose = "</a>";	my $linkclose = "</a>";
	my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
if ($resource->hasDiscussion()) {	if ($resource->hasDiscussion()) {
$discussionHTML = $linkopen .	$discussionHTML = $linkopen .
'<img border="0" src="/adm/lonMisc/chat.gif" />' .	'<img border="0" src="'.$location.'/chat.gif" />' .
$linkclose;	$linkclose;
}	}

Line 1168 sub render_communication_status {	Line 1170 sub render_communication_status {
if ($_) {	if ($_) {
$feedbackHTML .= ' <a href="/adm/email?display='	$feedbackHTML .= ' <a href="/adm/email?display='
. &Apache::lonnet::escape($_) . '">'	. &Apache::lonnet::escape($_) . '">'
. '<img src="/adm/lonMisc/feedback.gif" '	. '<img src="'.$location.'/feedback.gif" '
. 'border="0" /></a>';	. 'border="0" /></a>';
}	}
}	}
Line 1183 sub render_communication_status {	Line 1185 sub render_communication_status {
$errorcount++;	$errorcount++;
$errorHTML .= ' <a href="/adm/email?display='	$errorHTML .= ' <a href="/adm/email?display='
. &Apache::lonnet::escape($_) . '">'	. &Apache::lonnet::escape($_) . '">'
. '<img src="/adm/lonMisc/bomb.gif" '	. '<img src="'.$location.'/bomb.gif" '
. 'border="0" /></a>';	. 'border="0" /></a>';
}	}
}	}
Line 1212 sub render_quick_status {	Line 1214 sub render_quick_status {
my $icon = $statusIconMap{$resource->simpleStatus($part)};	my $icon = $statusIconMap{$resource->simpleStatus($part)};
my $alt = $iconAltTags{$icon};	my $alt = $iconAltTags{$icon};
if ($icon) {	if ($icon) {
$result .= "<td width='30' valign='center' width='50' align='right'>$linkopen<img width='25' height='25' src='/adm/lonIcons/$icon' border='0' alt='$alt' />$linkclose</td>\n";	my $location=
	&Apache::loncommon::lonhttpdurl("/adm/lonIcons/$icon");
	$result .= "<td width='30' valign='center' width='50' align='right'>$linkopen<img width='25' height='25' src='$location' border='0' alt='$alt' />$linkclose</td>\n";
} else {	} else {
$result .= "<td width='30'> </td>\n";	$result .= "<td width='30'> </td>\n";
}	}
Line 1343 sub setDefault {	Line 1347 sub setDefault {
return $val;	return $val;
}	}

	sub cmp_title {
	my ($atitle,$btitle) = (lc($_[0]->compTitle),lc($_[1]->compTitle));
	$atitle=~s/^\s*//;
	$btitle=~s/^\s*//;
	return $atitle cmp $btitle;
	}

sub render {	sub render {
my $args = shift;	my $args = shift;
&Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});	&Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
my $result = '';	my $result = '';

# Configure the renderer.	# Configure the renderer.
my $cols = $args->{'cols'};	my $cols = $args->{'cols'};
if (!defined($cols)) {	if (!defined($cols)) {
Line 1410 sub render {	Line 1420 sub render {
# Determine where the "here" marker is and where the screen jumps to.	# Determine where the "here" marker is and where the screen jumps to.

if ($ENV{'form.postsymb'}) {	if ($ENV{'form.postsymb'}) {
$here = $jump = $ENV{'form.postsymb'};	$here = $jump = &Apache::lonnet::symbclean($ENV{'form.postsymb'});
} elsif ($ENV{'form.postdata'}) {	} elsif ($ENV{'form.postdata'}) {
# couldn't find a symb, is there a URL?	# couldn't find a symb, is there a URL?
my $currenturl = $ENV{'form.postdata'};	my $currenturl = $ENV{'form.postdata'};
Line 1504 sub render {	Line 1514 sub render {
my $printKey = $args->{'printKey'};	my $printKey = $args->{'printKey'};
my $printCloseAll = $args->{'printCloseAll'};	my $printCloseAll = $args->{'printCloseAll'};
if (!defined($printCloseAll)) { $printCloseAll = 1; }	if (!defined($printCloseAll)) { $printCloseAll = 1; }

# Print key?	# Print key?
if ($printKey) {	if ($printKey) {
$result .= '<table border="0" cellpadding="2" cellspacing="0">';	$result .= '<table border="0" cellpadding="2" cellspacing="0">';
my $date=localtime;	my $date=localtime;
$result.='<tr><td align="right" valign="bottom">Key:  </td>';	$result.='<tr><td align="right" valign="bottom">Key:  </td>';
	my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
if ($navmap->{LAST_CHECK}) {	if ($navmap->{LAST_CHECK}) {
$result .=	$result .=
'<img src="/adm/lonMisc/chat.gif"> '.&mt('New discussion since').' '.	'<img src="'.$location.'/chat.gif"> '.&mt('New discussion since').' '.
strftime("%A, %b %e at %I:%M %P", localtime($navmap->{LAST_CHECK})).	strftime("%A, %b %e at %I:%M %P", localtime($navmap->{LAST_CHECK})).
'</td><td align="center" valign="bottom">  '.	'</td><td align="center" valign="bottom">  '.
'<img src="/adm/lonMisc/feedback.gif"> '.&mt('New message (click to open)').'<p>'.	'<img src="'.$location.'/feedback.gif"> '.&mt('New message (click to open)').'<p>'.
'</td>';	'</td>';
} else {	} else {
$result .= '<td align="center" valign="bottom">  '.	$result .= '<td align="center" valign="bottom">  '.
'<img src="/adm/lonMisc/chat.gif"> '.&mt('Discussions').'</td><td align="center" valign="bottom">'.	'<img src="'.$location.'/chat.gif"> '.&mt('Discussions').'</td><td align="center" valign="bottom">'.
'  <img src="/adm/lonMisc/feedback.gif"> '.&mt('New message (click to open)').	'  <img src="'.$location.'/feedback.gif"> '.&mt('New message (click to open)').
'</td>';	'</td>';
}	}

Line 1549 sub render {	Line 1560 sub render {

# Check for any unread discussions in all resources.	# Check for any unread discussions in all resources.
if ($args->{'caller'} eq 'navmapsdisplay') {	if ($args->{'caller'} eq 'navmapsdisplay') {
my $totdisc = 0;	&add_linkitem($args->{'linkitems'},'clearbubbles',
my $haveDisc = '';	'document.clearbubbles.submit()',
my @allres=$navmap->retrieveResources();	'Mark all posts read');
foreach my $resource (@allres) {	my $time=time;
if ($resource->hasDiscussion()) {	$result .= (<<END);
my $ressymb;	<form name="clearbubbles" method="post" action="/adm/feedback">
if ($resource->symb() =~ m-(___adm/\w+/\w+)/(\d+)/bulletinboard$-) {	<input type="hidden" name="navurl" value="$ENV{'QUERY_STRING'}" />
$ressymb = 'bulletin___'.$2.$1.'/'.$2.'/bulletinboard';	<input type="hidden" name="navtime" value="$time" />
} else {	END
$ressymb = $resource->symb();	if ($args->{'sort'} eq 'discussion') {
	my $totdisc = 0;
	my $haveDisc = '';
	my @allres=$navmap->retrieveResources();
	foreach my $resource (@allres) {
	if ($resource->hasDiscussion()) {
	my $ressymb;
	if ($resource->symb() =~ m-(___adm/\w+/\w+)/(\d+)/bulletinboard$-) {
	$ressymb = 'bulletin___'.$2.$1.'/'.$2.'/bulletinboard';
	} else {
	$ressymb = $resource->symb();
	}
	$haveDisc .= $ressymb.':';
	$totdisc ++;
}	}
$haveDisc .= $ressymb.':';
$totdisc ++;
}	}
}	if ($totdisc > 0) {
if ($totdisc > 0) {	$haveDisc =~ s/:$//;
$haveDisc =~ s/:$//;	$result .= (<<END);
my $navurl = $ENV{'QUERY_STRING'};	<input type="hidden" name="navmaps" value="$haveDisc" />
&add_linkitem($args->{'linkitems'},'clearbubbles',	</form>
'document.clearbubbles.submit()',
'Mark all posts read');
$result .= (<<END);
<form name="clearbubbles" method="post" action="/adm/feedback">
<input type="hidden" name="navurl" value="$ENV{'QUERY_STRING'}" />
<input type="hidden" name="navmaps" value="$haveDisc" />
</form>
END	END
	}
}	}
	$result.='</form>';
}	}

if ($args->{'caller'} eq 'navmapsdisplay') {	if ($args->{'caller'} eq 'navmapsdisplay') {
Line 1624 END	Line 1641 END
$args->{'indentLevel'} = 0;	$args->{'indentLevel'} = 0;
$args->{'isNewBranch'} = 0;	$args->{'isNewBranch'} = 0;
$args->{'condensed'} = 0;	$args->{'condensed'} = 0;
$args->{'indentString'} = setDefault($args->{'indentString'}, "<img src='/adm/lonIcons/whitespace1.gif' width='25' height='1' alt='' border='0' />");	my $location=
	&Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace1.gif");
	$args->{'indentString'} = setDefault($args->{'indentString'}, "<img src='$location' width='25' height='1' alt='' border='0' />");
$args->{'displayedHereMarker'} = 0;	$args->{'displayedHereMarker'} = 0;

# If we're suppressing empty sequences, look for them here. Use DFS for speed,	# If we're suppressing empty sequences, look for them here. Use DFS for speed,
Line 1685 END	Line 1704 END
return &$oldFilterFunc($res);	return &$oldFilterFunc($res);
};	};
@resources=$navmap->retrieveResources(undef,$filterFunc);	@resources=$navmap->retrieveResources(undef,$filterFunc);
@resources= sort {	@resources= sort { &cmp_title($a,$b) } @resources;
my ($atitle,$btitle) = (lc($a->compTitle),lc($b->compTitle));
$atitle=~s/^\s*//;
$btitle=~s/^\s*//;
return $atitle cmp $btitle
} @resources;
} elsif ($args->{'sort'} eq 'duedate') {	} elsif ($args->{'sort'} eq 'duedate') {
@resources=$navmap->retrieveResources(undef,	my $oldFilterFunc = $filterFunc;
sub { shift->is_problem(); });	my $filterFunc=
@resources= sort	sub {
{	my ($res)=@_;
	if (!$res->is_problem()) { return 0;}
	return &$oldFilterFunc($res);
	};
	@resources=$navmap->retrieveResources(undef,$filterFunc);
	@resources= sort {
if ($a->duedate ne $b->duedate) {	if ($a->duedate ne $b->duedate) {
return $a->duedate cmp $b->duedate;	return $a->duedate cmp $b->duedate;
} else {
lc($a->compTitle) cmp lc($b->compTitle)
}	}
	my $value=&cmp_title($a,$b);
	return $value;
} @resources;	} @resources;
	} elsif ($args->{'sort'} eq 'discussion') {
	my $oldFilterFunc = $filterFunc;
	my $filterFunc=
	sub {
	my ($res)=@_;
	if (!$res->hasDiscussion() &&
	!$res->getFeedback() &&
	!$res->getErrors()) { return 0;}
	return &$oldFilterFunc($res);
	};
	@resources=$navmap->retrieveResources(undef,$filterFunc);
	@resources= sort { &cmp_title($a,$b) } @resources;
} else {	} else {
#unknow sort mechanism or default	#unknow sort mechanism or default
undef($args->{'sort'});	undef($args->{'sort'});
Line 1818 END	Line 1849 END
# Add part 0 so we display it correctly.	# Add part 0 so we display it correctly.
unshift @parts, '0';	unshift @parts, '0';
}	}

	{
	my ($src,$symb,$anchor,$stack);
	if ($args->{'sort'}) {
	my $it = $navmap->getIterator(undef, undef, undef, 1);
	while ( my $res=$it->next()) {
	if (ref($res) &&
	$res->symb() eq $curRes->symb()) { last; }
	}
	$stack=$it->getStack();
	} else {
	$stack=$it->getStack();
	}
	($src,$symb,$anchor)=getLinkForResource($stack);
	if (defined($anchor)) { $anchor='#'.$anchor; }
	my $srcHasQuestion = $src =~ /\?/;
	$args->{"resourceLink"} = $src.
	($srcHasQuestion?'&':'?') .
	'symb=' . &Apache::lonnet::escape($symb).$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.
foreach my $part (@parts) {	foreach my $part (@parts) {
Line 1829 END	Line 1879 END

# Set up some data about the parts that the cols might want	# Set up some data about the parts that the cols might want
my $filter = $it->{FILTER};	my $filter = $it->{FILTER};
my $src;
if ($args->{'sort'}) {
$src = $curRes->src(); # FIXME this is wrong for .pages
} else {
my $stack = $it->getStack();
$src=getLinkForResource($stack);
}
my $anchor='';
if ($src=~s/(\#.*)$//) {
$anchor=$1;
}
my $srcHasQuestion = $src =~ /\?/;
$args->{"resourceLink"} = $src.
($srcHasQuestion?'&':'?') .
'symb=' . &Apache::lonnet::escape($curRes->symb()).
$anchor;

# Now, display each column.	# Now, display each column.
foreach my $col (@$cols) {	foreach my $col (@$cols) {
Line 1911 if (location.href.indexOf('#curloc')==-1	Line 1945 if (location.href.indexOf('#curloc')==-1
$r->rflush();	$r->rflush();
}	}

if ($mustCloseNavMap) { $navmap->untieHashes(); }

return $result;	return $result;
}	}

Line 1924 sub add_linkitem {	Line 1956 sub add_linkitem {

sub show_linkitems {	sub show_linkitems {
my ($linkitems)=@_;	my ($linkitems)=@_;
my @linkorder = ("launchnav","closenav","firsthomework","everything",	my @linkorder = ("blank","launchnav","closenav","firsthomework",
"uncompleted","changefolder","clearbubbles");	"everything","uncompleted","changefolder","clearbubbles");

my $result .= (<<ENDBLOCK);	my $result .= (<<ENDBLOCK);
<td align="left">	<td align="left">
Line 1952 ENDBLOCK	Line 1984 ENDBLOCK
$result .= '</select> <input type="button" name="chgnav"	$result .= '</select> <input type="button" name="chgnav"
value="Go" onClick="javascript:changeNavDisplay()" />	value="Go" onClick="javascript:changeNavDisplay()" />
</nobr></form></td>'."\n";	</nobr></form></td>'."\n";

return $result;	return $result;
}	}

Line 2012 successful, or B<undef> if not.	Line 2045 successful, or B<undef> if not.

=back	=back

When you are done with the $navmap object, you I<must> call
$navmap->untieHashes(), or you'll prevent the current user from using that
course until the web server is restarted. (!)

=head2 Methods	=head2 Methods

=over 4	=over 4
Line 2161 sub generate_email_discuss_status {	Line 2190 sub generate_email_discuss_status {

foreach my $msgid (split(/\&/, $keys)) {	foreach my $msgid (split(/\&/, $keys)) {
$msgid=&Apache::lonnet::unescape($msgid);	$msgid=&Apache::lonnet::unescape($msgid);
my $plain=&Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid));	if ((!$emailstatus{$msgid}) \|\| ($emailstatus{$msgid} eq 'new')) {
if ($plain=~/(Error\|Feedback) \[([^\]]+)\]/) {	my $plain=
my ($what,$url)=($1,$2);	&Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid));
my %status=	if ($plain=~/(Error\|Feedback) \[([^\]]+)\]/) {
&Apache::lonnet::get('email_status',[$msgid]);	my ($what,$url)=($1,$2);
if ($status{$msgid}=~/^error\:/) {
$status{$msgid}='';
}

if (($status{$msgid} eq 'new') \|\|
(!$status{$msgid})) {
if ($what eq 'Error') {	if ($what eq 'Error') {
$error{$url}.=','.$msgid;	$error{$url}.=','.$msgid;
} else {	} else {
Line 2181 sub generate_email_discuss_status {	Line 2204 sub generate_email_discuss_status {
}	}
}	}

	#url's of resources that have feedbacks
$self->{FEEDBACK} = \%feedback;	$self->{FEEDBACK} = \%feedback;
$self->{ERROR_MSG} = \%error; # what is this? JB	#or errors
	$self->{ERROR_MSG} = \%error;
$self->{DISCUSSION_TIME} = \%discussiontime;	$self->{DISCUSSION_TIME} = \%discussiontime;
$self->{EMAIL_STATUS} = \%emailstatus;	$self->{EMAIL_STATUS} = \%emailstatus;
$self->{LAST_READ} = \%lastreadtime;	$self->{LAST_READ} = \%lastreadtime;
Line 2232 sub courseMapDefined {	Line 2257 sub courseMapDefined {
sub getIterator {	sub getIterator {
my $self = shift;	my $self = shift;
my $iterator = Apache::lonnavmaps::iterator->new($self, shift, shift,	my $iterator = Apache::lonnavmaps::iterator->new($self, shift, shift,
shift, undef, shift);	shift, undef, shift,
	shift, shift);
return $iterator;	return $iterator;
}	}

# unties the hash when done
sub untieHashes {
my $self = shift;
untie %{$self->{NAV_HASH}};
untie %{$self->{PARM_HASH}};
}

# Private method: Does the given resource (as a symb string) have	# Private method: Does the given resource (as a symb string) have
# current discussion? Returns 0 if chat/mail data not extracted.	# current discussion? Returns 0 if chat/mail data not extracted.
sub hasDiscussion {	sub hasDiscussion {
Line 2459 sub parmval_real {	Line 2478 sub parmval_real {

if (defined($courseopt)) {	if (defined($courseopt)) {
if (defined($$courseopt{$courselevelr})) { return $$courseopt{$courselevelr}; }	if (defined($$courseopt{$courselevelr})) { return $$courseopt{$courselevelr}; }
if (defined($$courseopt{$courselevelm})) { return $$courseopt{$courselevelm}; }
if (defined($$courseopt{$courselevel})) { return $$courseopt{$courselevel}; }
}	}

# ----------------------------------------------------- third, check map parms	# ----------------------------------------------------- third, check map parms
Line 2477 sub parmval_real {	Line 2494 sub parmval_real {
$default=&Apache::lonnet::metadata($fn,'parameter_'.$meta_rwhat);	$default=&Apache::lonnet::metadata($fn,'parameter_'.$meta_rwhat);
if (defined($default)) { return $default}	if (defined($default)) { return $default}

# --------------------------------------------------- fifth , cascade up parts	# --------------------------------------------------- fifth, check more course
	if (defined($courseopt)) {
	if (defined($$courseopt{$courselevelm})) { return $$courseopt{$courselevelm}; }
	if (defined($$courseopt{$courselevel})) { return $$courseopt{$courselevel}; }
	}

	# --------------------------------------------------- sixth , cascade up parts

my ($space,@qualifier)=split(/\./,$rwhat);	my ($space,@qualifier)=split(/\./,$rwhat);
my $qualifier=join('.',@qualifier);	my $qualifier=join('.',@qualifier);
Line 2506 you're not sure if $res is already an ob	Line 2529 you're not sure if $res is already an ob
resource appears multiple times in the course, only the first instance	resource appears multiple times in the course, only the first instance
will be returned. As a result, this is probably useful only for maps.	will be returned. As a result, this is probably useful only for maps.

=item * B<retrieveResources>(map, filterFunc, recursive, bailout):	=item * B<retrieveResources>(map, filterFunc, recursive, bailout, showall):

The map is a specification of a map to retreive the resources from,	The map is a specification of a map to retreive the resources from,
either as a url or as an object. The filterFunc is a reference to a	either as a url or as an object. The filterFunc is a reference to a
Line 2514 function that takes a resource object as	Line 2537 function that takes a resource object as
true if the resource should be included, or false if it should not	true if the resource should be included, or false if it should not
be. If recursive is true, the map will be recursively examined,	be. If recursive is true, the map will be recursively examined,
otherwise it will not be. If bailout is true, the function will return	otherwise it will not be. If bailout is true, the function will return
as soon as it finds a resource, if false it will finish. By default,	as soon as it finds a resource, if false it will finish. If showall is
the map is the top-level map of the course, filterFunc is a function	true it will not hide maps that contain nothing but one other map. By
that always returns 1, recursive is true, bailout is false. The	default, the map is the top-level map of the course, filterFunc is a
resources will be returned in a list containing the resource objects	function that always returns 1, recursive is true, bailout is false,
for the corresponding resources, with B<no structure information> in	showall is false. The resources will be returned in a list containing
the list; regardless of branching, recursion, etc., it will be a flat	the resource objects for the corresponding resources, with B<no
list.	structure information> in the list; regardless of branching,
	recursion, etc., it will be a flat list.

Thus, this is suitable for cases where you don't want the structure,	Thus, this is suitable for cases where you don't want the structure,
just a list of all resources. It is also suitable for finding out how	just a list of all resources. It is also suitable for finding out how
Line 2567 sub retrieveResources {	Line 2591 sub retrieveResources {
if (!defined($recursive)) { $recursive = 1; }	if (!defined($recursive)) { $recursive = 1; }
my $bailout = shift;	my $bailout = shift;
if (!defined($bailout)) { $bailout = 0; }	if (!defined($bailout)) { $bailout = 0; }
	my $showall = shift;
# Create the necessary iterator.	# Create the necessary iterator.
if (!ref($map)) { # assume it's a url of a map.	if (!ref($map)) { # assume it's a url of a map.
$map = $self->getResourceByUrl($map);	$map = $self->getResourceByUrl($map);
Line 2586 sub retrieveResources {	Line 2610 sub retrieveResources {

# Get an iterator.	# Get an iterator.
my $it = $self->getIterator($map->map_start(), $map->map_finish(),	my $it = $self->getIterator($map->map_start(), $map->map_finish(),
undef, $recursive);	undef, $recursive, $showall);

my @resources = ();	my @resources = ();

Line 2623 sub hasResource {	Line 2647 sub hasResource {
1;	1;

package Apache::lonnavmaps::iterator;	package Apache::lonnavmaps::iterator;
	use WeakRef;
=pod	=pod

=back	=back
Line 2763 sub new {	Line 2787 sub new {
my $class = ref($proto) \|\| $proto;	my $class = ref($proto) \|\| $proto;
my $self = {};	my $self = {};

$self->{NAV_MAP} = shift;	weaken($self->{NAV_MAP} = shift);
return undef unless ($self->{NAV_MAP});	return undef unless ($self->{NAV_MAP});

# Handle the parameters	# Handle the parameters
Line 2883 sub new {	Line 2907 sub new {
Apache::lonnavmaps::iterator->new($self->{NAV_MAP}, $firstResource,	Apache::lonnavmaps::iterator->new($self->{NAV_MAP}, $firstResource,
$finishResource, $self->{FILTER},	$finishResource, $self->{FILTER},
$self->{ALREADY_SEEN},	$self->{ALREADY_SEEN},
$self->{CONDITION}, 0);	$self->{CONDITION},
	$self->{FORCE_TOP});

}	}

Line 3046 sub next {	Line 3071 sub next {
$self->{RECURSIVE_ITERATOR} =	$self->{RECURSIVE_ITERATOR} =
Apache::lonnavmaps::iterator->new($self->{NAV_MAP}, $firstResource,	Apache::lonnavmaps::iterator->new($self->{NAV_MAP}, $firstResource,
$finishResource, $self->{FILTER},	$finishResource, $self->{FILTER},
$self->{ALREADY_SEEN}, $self->{CONDITION});	$self->{ALREADY_SEEN},
	$self->{CONDITION},
	$self->{FORCE_TOP});
}	}

# If this is a blank resource, don't actually return it.	# If this is a blank resource, don't actually return it.
Line 3099 sub populateStack {	Line 3126 sub populateStack {
1;	1;

package Apache::lonnavmaps::DFSiterator;	package Apache::lonnavmaps::DFSiterator;
	use WeakRef;
# Not documented in the perldoc: This is a simple iterator that just walks	# Not documented in the perldoc: This is a simple iterator that just walks
# through the nav map and presents the resources in a depth-first search	# through the nav map and presents the resources in a depth-first search
# fashion, ignorant of conditionals, randomized resources, etc. It presents	# fashion, ignorant of conditionals, randomized resources, etc. It presents
Line 3127 sub new {	Line 3154 sub new {
my $class = ref($proto) \|\| $proto;	my $class = ref($proto) \|\| $proto;
my $self = {};	my $self = {};

$self->{NAV_MAP} = shift;	weaken($self->{NAV_MAP} = shift);
return undef unless ($self->{NAV_MAP});	return undef unless ($self->{NAV_MAP});

$self->{FIRST_RESOURCE} = shift \|\| $self->{NAV_MAP}->firstResource();	$self->{FIRST_RESOURCE} = shift \|\| $self->{NAV_MAP}->firstResource();
Line 3281 sub populateStack {	Line 3308 sub populateStack {
1;	1;

package Apache::lonnavmaps::resource;	package Apache::lonnavmaps::resource;
	use WeakRef;
use Apache::lonnet;	use Apache::lonnet;

=pod	=pod
Line 3363 sub new {	Line 3390 sub new {
my $class = ref($proto) \|\| $proto;	my $class = ref($proto) \|\| $proto;
my $self = {};	my $self = {};

$self->{NAV_MAP} = shift;	weaken($self->{NAV_MAP} = shift);
$self->{ID} = shift;	$self->{ID} = shift;

# Store this new resource in the parent nav map's cache.	# Store this new resource in the parent nav map's cache.
Line 3451 Returns the title of the resource.	Line 3478 Returns the title of the resource.
# These info functions can be used directly, as they don't return	# These info functions can be used directly, as they don't return
# resource information.	# resource information.
sub comesfrom { my $self=shift; return $self->navHash("comesfrom_", 1); }	sub comesfrom { my $self=shift; return $self->navHash("comesfrom_", 1); }
	sub encrypted { my $self=shift; return $self->navHash("encrypted_", 1); }
sub ext { my $self=shift; return $self->navHash("ext_", 1) eq 'true:'; }	sub ext { my $self=shift; return $self->navHash("ext_", 1) eq 'true:'; }
sub from { my $self=shift; return $self->navHash("from_", 1); }	sub from { my $self=shift; return $self->navHash("from_", 1); }
# considered private and undocumented	# considered private and undocumented
Line 3462 sub randompick {	Line 3490 sub randompick {
return $self->{NAV_MAP}->{PARM_HASH}->{$self->symb .	return $self->{NAV_MAP}->{PARM_HASH}->{$self->symb .
'.0.parameter_randompick'};	'.0.parameter_randompick'};
}	}
	sub link {
	my $self=shift;
	if ($self->encrypted()) { return &Apache::lonenc::encrypted($self->src); }
	return $self->src;
	}
sub src {	sub src {
my $self=shift;	my $self=shift;
return $self->navHash("src_", 1);	return $self->navHash("src_", 1);
}	}
	sub shown_symb {
	my $self=shift;
	if ($self->encrypted()) {return &Apache::lonenc::encrypted($self->symb());}
	return $self->symb();
	}
sub symb {	sub symb {
my $self=shift;	my $self=shift;
(my $first, my $second) = $self->{ID} =~ /(\d+).(\d+)/;	(my $first, my $second) = $self->{ID} =~ /(\d+).(\d+)/;
Line 3484 sub title {	Line 3522 sub title {
return $self->navHash("title_", 1); }	return $self->navHash("title_", 1); }
# considered private and undocumented	# considered private and undocumented
sub to { my $self=shift; return $self->navHash("to_", 1); }	sub to { my $self=shift; return $self->navHash("to_", 1); }
	sub condition {
	my $self=shift;
	my $undercond=$self->navHash("undercond_", 1);
	if (!defined($undercond)) { return 1; };
	my $condid=$self->navHash("condid_$undercond");
	if (!defined($condid)) { return 1; };
	my $condition=&Apache::lonnet::directcondval($condid);
	return $condition;
	}

sub compTitle {	sub compTitle {
my $self = shift;	my $self = shift;
my $title = $self->title();	my $title = $self->title();
Line 4657 sub getNext {	Line 4705 sub getNext {
my $to = $self->to();	my $to = $self->to();
foreach my $branch ( split(/,/, $to) ) {	foreach my $branch ( split(/,/, $to) ) {
my $choice = $self->{NAV_MAP}->getById($branch);	my $choice = $self->{NAV_MAP}->getById($branch);
	if (!$choice->condition()) { next; }
my $next = $choice->goesto();	my $next = $choice->goesto();
$next = $self->{NAV_MAP}->getById($next);	$next = $self->{NAV_MAP}->getById($next);

Line 4685 sub browsePriv {	Line 4734 sub browsePriv {
return $self->{BROWSE_PRIV};	return $self->{BROWSE_PRIV};
}	}

$self->{BROWSE_PRIV} = &Apache::lonnet::allowed('bre', $self->src());	$self->{BROWSE_PRIV} = &Apache::lonnet::allowed('bre',$self->src(),
	$self->symb());
}	}

=pod	=pod

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

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.

Removed from v.1.294
changed lines
	Added in v.1.315