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.248 and 1.304

version 1.248, 2004/02/24 16:09:30	version 1.304, 2004/11/11 22:39:05
Line 35 use Apache::loncommon();	Line 35 use Apache::loncommon();
use Apache::lonmenu();	use Apache::lonmenu();
use Apache::lonlocal;	use Apache::lonlocal;
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 83 my %colormap =	Line 83 my %colormap =
# is not yet done and due in less then 24 hours	# is not yet done and due in less then 24 hours
my $hurryUpColor = "#FF0000";	my $hurryUpColor = "#FF0000";

	sub launch_win {
	my ($mode,$script,$toplinkitems)=@_;
	my $result;
	if ($script ne 'no') {
	$result.='<script type="text/javascript">';
	}
	$result.='function launch_navmapwin() {
	newWindow=open(\'/adm/navmaps?launchExternal\',\'loncapanav\',\'width=400,height=600,scrollbars=1\');
	}';
	if ($mode eq 'now') {
	$result.="\nlaunch_navmapwin();\n";
	}
	if ($script ne 'no') {
	$result.='</script>';
	}
	if ($mode eq 'link') {
	&add_linkitem($toplinkitems,'launchnav','launch_navmapwin()',
	"Launch navigation window");
	}
	return $result;
	}

	sub close {
	if ($ENV{'environment.remotenavmap'} ne 'on') { return ''; }
	return(<<ENDCLOSE);
	<script type="text/javascript">
	window.status='Accessing Nav Control';
	menu=window.open("/adm/rat/empty.html","loncapanav",
	"height=600,width=400,scrollbars=1");
	window.status='Closing Nav Control';
	menu.close();
	window.status='Done.';
	</script>
	ENDCLOSE
	}

	sub update {
	if ($ENV{'environment.remotenavmap'} ne 'on') { return ''; }
	if (!$ENV{'request.course.id'}) { return ''; }
	if ($ENV{'REQUEST_URI'}=~m\|^/adm/navmaps\|) { return ''; }
	return(<<ENDUPDATE);
	<form name="navform"></form>
	<script type="text/javascript">
	this.document.navform.action='/adm/navmaps#curloc';
	this.document.navform.target='loncapanav';
	this.document.navform.submit();
	</script>
	ENDUPDATE
	}

sub handler {	sub handler {
my $r = shift;	my $r = shift;
real_handler($r);	real_handler($r);
Line 111 sub real_handler {	Line 161 sub real_handler {
&Apache::loncommon::no_cache($r);	&Apache::loncommon::no_cache($r);
$r->send_http_header;	$r->send_http_header;

	my %toplinkitems=();

	if ($ENV{QUERY_STRING} eq 'collapseExternal') {
	&Apache::lonnet::put('environment',{'remotenavmap' => 'off'});
	&Apache::lonnet::appenv('environment.remotenavmap' => 'off');
	my $menu=&Apache::lonmenu::reopenmenu();
	my $navstatus=&Apache::lonmenu::get_nav_status();
	if ($menu) {
	$menu=(<<MENU)
	swmenu=$menu
	swmenu.clearTimeout(swmenu.menucltim);
	$navstatus
	MENU
	} else {
	my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
	my $mainwindow='window.open('.$nothing.',"loncapaclient","",false);';
	$menu=(<<MENU)
	swmenu=$mainwindow
	$navstatus
	MENU
	}
	$r->print(<<"ENDSUBM");
	<html>
	<head>
	<script type="text/javascript">
	function submitthis() {
	$menu
	self.close();
	}

	</script>
	</head>
	<body bgcolor="#FFFFFF" onLoad="submitthis()"></body>
	</html>
	ENDSUBM
	return;
	}
	if ($ENV{QUERY_STRING} eq 'launchExternal') {
	&Apache::lonnet::put('environment',{'remotenavmap' => 'on'});
	&Apache::lonnet::appenv('environment.remotenavmap' => 'on');
	}

# Create the nav map	# Create the nav map
my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();

Line 123 sub real_handler {	Line 215 sub real_handler {
$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']);	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework']);

# ----------------------------------------------------- Force menu registration	# ----------------------------------------------------- Force menu registration
my $addentries='';	my $addentries='';
	my $more_unload;
	my $body_only='';
	if ($ENV{'environment.remotenavmap'} eq 'on') {
	$r->print('<script type="text/javascript">
	function collapse() {
	this.document.location="/adm/navmaps?collapseExternal";
	}
	</script>');
	# FIXME need to be smarter to only catch window close events
	# $more_unload="collapse()"
	$body_only=1;
	}
if ($ENV{'form.register'}) {	if ($ENV{'form.register'}) {
$addentries=' onLoad="'.&Apache::lonmenu::loadevents().	$addentries=' onLoad="'.&Apache::lonmenu::loadevents().
'" onUnload="'.&Apache::lonmenu::unloadevents().'"';	'" onUnload="'.&Apache::lonmenu::unloadevents().';'.
$r->print(&Apache::lonmenu::registerurl(1));	$more_unload.'"';
	$r->print(&Apache::lonmenu::registerurl(1));
	} else {
	$addentries=' onUnload="'.$more_unload.'"';
}	}

# Header	# Header
$r->print('</head>'.	$r->print('</head>'.
&Apache::loncommon::bodytag('Navigate Course Contents','',	&Apache::loncommon::bodytag('Navigate Course Contents','',
$addentries,'','',$ENV{'form.register'}));	$addentries,$body_only,'',
	$ENV{'form.register'}));
$r->print('<script>window.focus();</script>');	$r->print('<script>window.focus();</script>');

$r->rflush();	$r->rflush();

# Check that it's defined	# Check that it's defined
if (!($navmap->courseMapDefined())) {	if (!($navmap->courseMapDefined())) {
	$r->print(&Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT'));
$r->print('<font size="+2" color="red">Coursemap undefined.</font>' .	$r->print('<font size="+2" color="red">Coursemap undefined.</font>' .
'</body></html>');	'</body></html>');
return OK;	return OK;
Line 172 sub real_handler {	Line 281 sub real_handler {
}	}
}	}

	if ($ENV{QUERY_STRING} eq 'launchExternal') {
	$r->print('
	<form name="returnwin" action="/adm/flip?postdata=return%3a"
	method="post" target="loncapaclient">
	</form>');
	$r->print('
	<script type="text/javascript">
	this.document.returnwin.submit();
	</script>');
	}

	if ($ENV{'environment.remotenavmap'} ne 'on') {
	$r->print(&launch_win('link','yes',\%toplinkitems));
	}
	if ($ENV{'environment.remotenavmap'} eq 'on') {
	&add_linkitem(\%toplinkitems,'closenav','collapse()',
	"Close navigation window");
	}

my $jumpToFirstHomework = 0;	my $jumpToFirstHomework = 0;
# Check to see if the student is jumping to next open, do-able problem	# Check to see if the student is jumping to next open, do-able problem
if ($ENV{QUERY_STRING} eq 'jumpToFirstHomework') {	if ($ENV{QUERY_STRING} =~ /^jumpToFirstHomework/) {
$jumpToFirstHomework = 1;	$jumpToFirstHomework = 1;
# Find the next homework problem that they can do.	# Find the next homework problem that they can do.
my $iterator = $navmap->getIterator(undef, undef, undef, 1);	my $iterator = $navmap->getIterator(undef, undef, undef, 1);
Line 207 sub real_handler {	Line 335 sub real_handler {
$r->print("<font size='+2'>All homework assignments have been completed.</font><br /><br />");	$r->print("<font size='+2'>All homework assignments have been completed.</font><br /><br />");
}	}
} else {	} else {
$r->print("<a href='navmaps?jumpToFirstHomework'>" .	&add_linkitem(\%toplinkitems,'firsthomework',
&mt("Go To My First Homework Problem")."</a>    ");	'location.href="navmaps?jumpToFirstHomework"',
	"Show Me My First Homework Problem");
}	}

my $suppressEmptySequences = 0;	my $suppressEmptySequences = 0;
Line 217 sub real_handler {	Line 346 sub real_handler {

# Display only due homework.	# Display only due homework.
my $showOnlyHomework = 0;	my $showOnlyHomework = 0;
if ($ENV{QUERY_STRING} eq 'showOnlyHomework') {	if ($ENV{'form.showOnlyHomework'} eq "1") {
$showOnlyHomework = 1;	$showOnlyHomework = 1;
$suppressEmptySequences = 1;	$suppressEmptySequences = 1;
$filterFunc = sub { my $res = shift;	$filterFunc = sub { my $res = shift;
return $res->completable() \|\| $res->is_map();	return $res->completable() \|\| $res->is_map();
};	};
	&add_linkitem(\%toplinkitems,'everything',
	'location.href="navmaps?sort='.$ENV{'form.sort'}.'"',
	"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'} = '';
$ENV{'form.condition'} = 1;	$ENV{'form.condition'} = 1;
$resource_no_folder_link = 1;	$resource_no_folder_link = 1;
} else {	} else {
$r->print("<a href='navmaps?showOnlyHomework'>" .	&add_linkitem(\%toplinkitems,'uncompleted',
&mt("Show Only Uncompleted Homework")."</a>    ");	'location.href="navmaps?sort='.$ENV{'form.sort'}.
}	'&showOnlyHomework=1"',
	"Show Only Uncompleted Homework");
	}

	my %selected=($ENV{'form.sort'} => 'selected=on');
	my $sort_html=("<form>
	<nobr>
	<input type=\"hidden\" name=\"showOnlyHomework\" value=\"".$ENV{'form.showOnlyHomework'}."\" />
	<input type=\"submit\" value=\"".&mt('Sort by:')."\" />
	<select name=\"sort\">
	<option value=\"default\" $selected{'default'}>".&mt('Default')."</option>
	<option value=\"title\" $selected{'title'} >".&mt('Title')."</option>
	<option value=\"duedate\" $selected{'duedate'}>".&mt('Duedate')."</option>
	<option value=\"discussion\" $selected{'discussion'}>".&mt('Has Discussion')."</option>
	</select>
	</nobr>
	</form>");
# renderer call	# renderer call
my $renderArgs = { 'cols' => [0,1,2,3],	my $renderArgs = { 'cols' => [0,1,2,3],
	'sort' => $ENV{'form.sort'},
'url' => '/adm/navmaps',	'url' => '/adm/navmaps',
'navmap' => $navmap,	'navmap' => $navmap,
'suppressNavmap' => 1,	'suppressNavmap' => 1,
'suppressEmptySequences' => $suppressEmptySequences,	'suppressEmptySequences' => $suppressEmptySequences,
'filterFunc' => $filterFunc,	'filterFunc' => $filterFunc,
'resource_no_folder_link' => $resource_no_folder_link,	'resource_no_folder_link' => $resource_no_folder_link,
'r' => $r};	'sort_html'=> $sort_html,
	'r' => $r,
	'caller' => 'navmapsdisplay',
	'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 292 sub getLinkForResource {	Line 442 sub getLinkForResource {
foreach $res (@$stack) {	foreach $res (@$stack) {
if (defined($res)) {	if (defined($res)) {
if ($res->is_page()) {	if ($res->is_page()) {
return $res->src();	return $res->link();
}	}
# 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);	return &Apache::lonnet::clutter($map).'#'.
	&Apache::lonnet::escape(&Apache::lonnet::declutter($src));
}	}
}	}
}	}
Line 310 sub getLinkForResource {	Line 461 sub getLinkForResource {
if (defined($_)) { $res = $_; }	if (defined($_)) { $res = $_; }
}	}

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

# Convenience function: This seperates the logic of how to create	# Convenience function: This separates the logic of how to create
# the problem text strings ("Due: DATE", "Open: DATE", "Not yet assigned",	# the problem text strings ("Due: DATE", "Open: DATE", "Not yet assigned",
# etc.) into a seperate function. It takes a resource object as the	# etc.) into a separate function. It takes a resource object as the
# first parameter, and the part number of the resource as the second.	# first parameter, and the part number of the resource as the second.
# It's basically a big switch statement on the status of the resource.	# It's basically a big switch statement on the status of the resource.

Line 380 sub getDescription {	Line 531 sub getDescription {
# Convenience function, so others can use it: Is the problem due in less then	# Convenience function, so others can use it: Is the problem due in less then
# 24 hours, and still can be done?	# 24 hours, and still can be done?

sub dueInLessThen24Hours {	sub dueInLessThan24Hours {
my $res = shift;	my $res = shift;
my $part = shift;	my $part = shift;
my $status = $res->status($part);	my $status = $res->status($part);
Line 511 sub timeToHumanString {	Line 662 sub timeToHumanString {
}	}

# Not this year, so show the year	# Not this year, so show the year
my $timeStr = strftime("on %A, %b %e %G at %I:%M %P", localtime($time));	my $timeStr = strftime("on %A, %b %e %Y at %I:%M %P", localtime($time));
$timeStr =~ s/12:00 am/00:00/;	$timeStr =~ s/12:00 am/00:00/;
$timeStr =~ s/12:00 pm/noon/;	$timeStr =~ s/12:00 pm/noon/;
return $timeStr;	return $timeStr;
Line 863 sub render_resource {	Line 1014 sub render_resource {
my $filter = $it->{FILTER};	my $filter = $it->{FILTER};

my $title = $resource->compTitle();	my $title = $resource->compTitle();
if ($src =~ /^\/uploaded\//) {
$nonLinkedText=$title;
$title = '';
}
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
Line 880 sub render_resource {	Line 1028 sub render_resource {
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 905 sub render_resource {	Line 1052 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 922 sub render_resource {	Line 1069 sub render_resource {
# 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 960 sub render_resource {	Line 1107 sub render_resource {

if ($resource->is_problem() && $part ne '0' &&	if ($resource->is_problem() && $part ne '0' &&
!$params->{'condensed'}) {	!$params->{'condensed'}) {
my $displaypart=&Apache::lonnet::EXT('resource.'.$part.'.display',	my $displaypart=$resource->part_display($part);
$resource->symb());
unless ($displaypart) { $displaypart=$part; }
$partLabel = " (Part: $displaypart)";	$partLabel = " (Part: $displaypart)";
$link.='#'.&Apache::lonnet::escape($part);	$link.='#'.&Apache::lonnet::escape($part);
$title = "";	$title = "";
Line 972 sub render_resource {	Line 1117 sub render_resource {
$nonLinkedText .= ' (' . $resource->countParts() . ' parts)';	$nonLinkedText .= ' (' . $resource->countParts() . ' parts)';
}	}

if (!$params->{'resource_nolink'} && $src !~ /^\/uploaded\// &&	my $target;
!$resource->is_sequence()) {	if ($ENV{'environment.remotenavmap'} eq 'on') {
$result .= " $curMarkerBegin<a href='$link'>$title$partLabel</a>$curMarkerEnd $nonLinkedText</td>";	$target=' target="loncapaclient" ';
	}
	if (!$params->{'resource_nolink'} && !$resource->is_sequence() && !$resource->is_empty_sequence) {
	$result .= " $curMarkerBegin<a $target href='$link'>$title$partLabel</a>$curMarkerEnd $nonLinkedText</td>";
} else {	} else {
$result .= " $curMarkerBegin$title$partLabel$curMarkerEnd $nonLinkedText</td>";	$result .= " $curMarkerBegin$title$partLabel$curMarkerEnd $nonLinkedText</td>";
}	}
Line 989 sub render_communication_status {	Line 1137 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 1002 sub render_communication_status {	Line 1150 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 1010 sub render_communication_status {	Line 1158 sub render_communication_status {

if ($resource->getErrors()) {	if ($resource->getErrors()) {
my $errors = $resource->getErrors();	my $errors = $resource->getErrors();
	my $errorcount = 0;
foreach (split(/,/, $errors)) {	foreach (split(/,/, $errors)) {
	last if ($errorcount>=10); # Only output 10 bombs maximum
if ($_) {	if ($_) {
	$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 1043 sub render_quick_status {	Line 1194 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 1063 sub render_long_status {	Line 1216 sub render_long_status {
if ($resource->is_problem()) {	if ($resource->is_problem()) {
$color = $colormap{$resource->status};	$color = $colormap{$resource->status};

if (dueInLessThen24Hours($resource, $part) \|\|	if (dueInLessThan24Hours($resource, $part) \|\|
lastTry($resource, $part)) {	lastTry($resource, $part)) {
$color = $hurryUpColor;	$color = $hurryUpColor;
}	}
Line 1115 my @statuses = ($resObj->CORRECT, $resOb	Line 1268 my @statuses = ($resObj->CORRECT, $resOb
use Data::Dumper;	use Data::Dumper;
sub render_parts_summary_status {	sub render_parts_summary_status {
my ($resource, $part, $params) = @_;	my ($resource, $part, $params) = @_;
if (!$resource->is_problem()) { return '<td></td>'; }	if (!$resource->is_problem() && !$resource->contains_problem) { return '<td></td>'; }
if ($params->{showParts}) {	if ($params->{showParts}) {
return '<td></td>';	return '<td></td>';
}	}

my $td = "<td align='right'>\n";	my $td = "<td align='right'>\n";
my $endtd = "</td>\n";	my $endtd = "</td>\n";
	my @probs;

# If there is a single part, just show the simple status	if ($resource->contains_problem) {
if ($resource->singlepart()) {	@probs=$resource->retrieveResources($resource,sub { $_[0]->is_problem() },1,0);
my $status = $resource->simpleStatus('0');	} else {
return $td . "<font color='" . $statusColors{$status} . "'>"	@probs=($resource);
. $statusStrings{$status} . "</font>" . $endtd;	}
}	my $return;
	my %overallstatus;
# Now we can be sure the $part doesn't really matter.	my $totalParts;
my $statusCount = $resource->simpleStatusCount();	foreach my $resource (@probs) {
my @counts;	# If there is a single part, just show the simple status
foreach my $status(@statuses) {	if ($resource->singlepart()) {
# decouple display order from the simpleStatusCount order	my $status = $resource->simpleStatus(${$resource->parts}[0]);
my $slot = Apache::lonnavmaps::resource::statusToSlot($status);	$overallstatus{$status}++;
if ($statusCount->[$slot]) {	$totalParts++;
push @counts, "<font color='" . $statusColors{$status} .	next;
"'>" . $statusCount->[$slot] . ' '	}
	# Now we can be sure the $part doesn't really matter.
	my $statusCount = $resource->simpleStatusCount();
	my @counts;
	foreach my $status (@statuses) {
	# decouple display order from the simpleStatusCount order
	my $slot = Apache::lonnavmaps::resource::statusToSlot($status);
	if ($statusCount->[$slot]) {
	$overallstatus{$status}+=$statusCount->[$slot];
	$totalParts+=$statusCount->[$slot];
	}
	}
	}
	$return.= $td . $totalParts . ' parts: ';
	foreach my $status (@statuses) {
	if ($overallstatus{$status}) {
	$return.="<font color='" . $statusColors{$status} .
	"'>" . $overallstatus{$status} . ' '
. $statusStrings{$status} . "</font>";	. $statusStrings{$status} . "</font>";
}	}
}	}
	$return.= $endtd;
return $td . $resource->countParts() . ' parts: ' . join (', ', @counts) . $endtd;	return $return;
}	}

my @preparedColumns = (\&render_resource, \&render_communication_status,	my @preparedColumns = (\&render_resource, \&render_communication_status,
Line 1156 sub setDefault {	Line 1327 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 1178 sub render {	Line 1355 sub render {
my $jump = $args->{'jump'};	my $jump = $args->{'jump'};
my $here = $args->{'here'};	my $here = $args->{'here'};
my $suppressNavmap = setDefault($args->{'suppressNavmap'}, 0);	my $suppressNavmap = setDefault($args->{'suppressNavmap'}, 0);
	my $closeAllPages = setDefault($args->{'closeAllPages'}, 0);
my $currentJumpDelta = 2; # change this to change how many resources are displayed	my $currentJumpDelta = 2; # change this to change how many resources are displayed
# before the current resource when using #current	# before the current resource when using #current

Line 1222 sub render {	Line 1400 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 1240 sub render {	Line 1418 sub render {
# 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 (($curRes = $mapIterator->next()) && !$found) {	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 1286 sub render {	Line 1464 sub render {
$args->{'iterator'} = $it = $navmap->getIterator(undef, undef, $filterHash, $condition);	$args->{'iterator'} = $it = $navmap->getIterator(undef, undef, $filterHash, $condition);
}	}
}	}

# (re-)Locate the jump point, if any	# (re-)Locate the jump point, if any
# Note this does not take filtering or hidden into account... need	# Note this does not take filtering or hidden into account... need
# to be fixed?	# to be fixed?
Line 1316 sub render {	Line 1494 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 1340 sub render {	Line 1519 sub render {
}	}

if ($printCloseAll && !$args->{'resource_no_folder_link'}) {	if ($printCloseAll && !$args->{'resource_no_folder_link'}) {
	my ($link,$text);
if ($condition) {	if ($condition) {
$result.="<a href=\"navmaps?condition=0&filter=&$queryString" .	$link='"navmaps?condition=0&filter=&'.$queryString.
"&here=" . Apache::lonnet::escape($here) .	'&here='.&Apache::lonnet::escape($here).'"';
"\">".&mt('Close All Folders')."</a>";	$text='Close All Folders';
} else {	} else {
$result.="<a href=\"navmaps?condition=1&filter=&$queryString" .	$link='"navmaps?condition=1&filter=&'.$queryString.
"&here=" . Apache::lonnet::escape($here) .	'&here='.&Apache::lonnet::escape($here).'"';
"\">".&mt('Open All Folders')."</a>";	$text='Open All Folders';
	}
	if ($args->{'caller'} eq 'navmapsdisplay') {
	&add_linkitem($args->{'linkitems'},'changefolder',
	'location.href='.$link,$text);
	} else {
	$result.='<a href='.$link.'>'.&mt($text).'</a>';
	}
	$result .= "\n";
	}

	# Check for any unread discussions in all resources.
	if ($args->{'caller'} eq 'navmapsdisplay') {
	&add_linkitem($args->{'linkitems'},'clearbubbles',
	'document.clearbubbles.submit()',
	'Mark all posts read');
	my $time=time;
	$result .= (<<END);
	<form name="clearbubbles" method="post" action="/adm/feedback">
	<input type="hidden" name="navurl" value="$ENV{'QUERY_STRING'}" />
	<input type="hidden" name="navtime" value="$time" />
	END
	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 ++;
	}
	}
	if ($totdisc > 0) {
	$haveDisc =~ s/:$//;
	$result .= (<<END);
	<input type="hidden" name="navmaps" value="$haveDisc" />
	</form>
	END
	}
	}
	$result.='</form>';
	}

	if ($args->{'caller'} eq 'navmapsdisplay') {
	$result .= '<table><tr><td>'.
	&Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT').'</td>';
	if ($ENV{'environment.remotenavmap'} ne 'on') {
	$result .= '<td> </td>';
	} else {
	$result .= '</tr><tr>';
}	}
$result .= "<br /><br />\n";	$result.=&show_linkitems($args->{'linkitems'});
}	if ($args->{'sort_html'}) {
	if ($ENV{'environment.remotenavmap'} ne 'on') {
	$result.='<td> </td><td> </td><td> </td>'.
	'<td align="right">'.$args->{'sort_html'}.'</td></tr>';
	} else {
	$result.='</tr><tr><td align="left"><br />'.
	$args->{'sort_html'}.'</td></tr>';
	}
	}
	$result .= '</table>';
	} elsif ($args->{'sort_html'}) {
	$result.=$args->{'sort_html'};
	}

	$result .= "<br />\n";
if ($r) {	if ($r) {
$r->print($result);	$r->print($result);
$r->rflush();	$r->rflush();
Line 1373 sub render {	Line 1621 sub render {
$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 1423 sub render {	Line 1673 sub render {
$args->{'here'} = $here;	$args->{'here'} = $here;

$args->{'indentLevel'} = -1; # first BEGIN_MAP takes this to 0	$args->{'indentLevel'} = -1; # first BEGIN_MAP takes this to 0
while ($curRes = $it->next()) {	my @resources;
	my $code='';# sub { !(shift->is_map();) };
	if ($args->{'sort'} eq 'title') {
	my $oldFilterFunc = $filterFunc;
	my $filterFunc=
	sub {
	my ($res)=@_;
	if ($res->is_map()) { return 0;}
	return &$oldFilterFunc($res);
	};
	@resources=$navmap->retrieveResources(undef,$filterFunc);
	@resources= sort { &cmp_title($a,$b) } @resources;
	} elsif ($args->{'sort'} eq 'duedate') {
	my $oldFilterFunc = $filterFunc;
	my $filterFunc=
	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) {
	return $a->duedate cmp $b->duedate;
	}
	my $value=&cmp_title($a,$b);
	return $value;
	} @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 {
	#unknow sort mechanism or default
	undef($args->{'sort'});
	}


	while (1) {
	if ($args->{'sort'}) {
	$curRes = shift(@resources);
	} else {
	$curRes = $it->next($closeAllPages);
	}
	if (!$curRes) { last; }

# Maintain indentation level.	# Maintain indentation level.
if ($curRes == $it->BEGIN_MAP() \|\|	if ($curRes == $it->BEGIN_MAP() \|\|
$curRes == $it->BEGIN_BRANCH() ) {	$curRes == $it->BEGIN_BRANCH() ) {
Line 1537 sub render {	Line 1840 sub render {

# 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 $stack = $it->getStack();	my $src;
my $src = getLinkForResource($stack);	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 =~ /\?/;	my $srcHasQuestion = $src =~ /\?/;
$args->{"resourceLink"} = $src.	$args->{"resourceLink"} = $src.
($srcHasQuestion?'&':'?') .	($srcHasQuestion?'&':'?') .
'symb=' . &Apache::lonnet::escape($curRes->symb());	'symb=' . &Apache::lonnet::escape($curRes->shown_symb()).
	$anchor;

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

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

	sub add_linkitem {
	my ($linkitems,$name,$cmd,$text)=@_;
	$$linkitems{$name}{'cmd'}=$cmd;
	$$linkitems{$name}{'text'}=&mt($text);
	}

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

	my $result .= (<<ENDBLOCK);
	<td align="left">
	<script type="text/javascript">
	function changeNavDisplay () {
	var navchoice = document.linkitems.toplink[document.linkitems.toplink.selectedIndex].value;
	ENDBLOCK
	foreach my $link (@linkorder) {
	$result.= "if (navchoice == '$link') {".
	$linkitems->{$link}{'cmd'}."}\n";
	}
	$result.='}
	</script>
	<form name="linkitems" method="post">
	<nobr><select name="toplink">'."\n";
	foreach my $link (@linkorder) {
	if (defined($linkitems->{$link})) {
	if ($linkitems->{$link}{'text'} ne '') {
	$result .= ' <option value="'.$link.'">'.
	$linkitems->{$link}{'text'}."</option>\n";
	}
	}
	}
	$result .= '</select> <input type="button" name="chgnav"
	value="Go" onClick="javascript:changeNavDisplay()" />
	</nobr></form></td>'."\n";

return $result;	return $result;
}	}

Line 1672 successful, or B<undef> if not.	Line 2022 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 1790 sub generate_course_user_opt {	Line 2136 sub generate_course_user_opt {

sub generate_email_discuss_status {	sub generate_email_discuss_status {
my $self = shift;	my $self = shift;
	my $symb = shift;
if ($self->{EMAIL_DISCUSS_GENERATED}) { return; }	if ($self->{EMAIL_DISCUSS_GENERATED}) { return; }

my $cid=$ENV{'request.course.id'};	my $cid=$ENV{'request.course.id'};
Line 1802 sub generate_email_discuss_status {	Line 2149 sub generate_email_discuss_status {
$courseLeaveTime : $logoutTime);	$courseLeaveTime : $logoutTime);
my %discussiontime = &Apache::lonnet::dump('discussiontimes',	my %discussiontime = &Apache::lonnet::dump('discussiontimes',
$cdom, $cnum);	$cdom, $cnum);
	my %lastread = &Apache::lonnet::dump('nohist_'.$cid.'_discuss',
	$ENV{'user.domain'},$ENV{'user.name'},'lastread');
	my %lastreadtime = ();
	foreach (keys %lastread) {
	my $key = $_;
	$key =~ s/_lastread$//;
	$lastreadtime{$key} = $lastread{$_};
	}

my %feedback=();	my %feedback=();
my %error=();	my %error=();
my $keys = &Apache::lonnet::reply('keys:'.	my $keys = &Apache::lonnet::reply('keys:'.
Line 1811 sub generate_email_discuss_status {	Line 2167 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 1831 sub generate_email_discuss_status {	Line 2181 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->{EMAIL_DISCUSS_GENERATED} = 1;	$self->{EMAIL_DISCUSS_GENERATED} = 1;
}	}
Line 1885 sub getIterator {	Line 2238 sub getIterator {
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 1903 sub hasDiscussion {	Line 2249 sub hasDiscussion {
if (!defined($self->{DISCUSSION_TIME})) { return 0; }	if (!defined($self->{DISCUSSION_TIME})) { return 0; }

#return defined($self->{DISCUSSION_TIME}->{$symb});	#return defined($self->{DISCUSSION_TIME}->{$symb});
return $self->{DISCUSSION_TIME}->{$symb} >
$self->{LAST_CHECK};	# backward compatibility (bulletin boards used to be 'wrapped')
	my $ressymb = $symb;
	if ($ressymb =~ m\|adm/(\w+)/(\w+)/(\d+)/bulletinboard$\|) {
	unless ($ressymb =~ m\|adm/wrapper/adm\|) {
	$ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
	}
	}

	if ( defined ( $self->{LAST_READ}->{$ressymb} ) ) {
	return $self->{DISCUSSION_TIME}->{$ressymb} > $self->{LAST_READ}->{$ressymb};
	} else {
	# return $self->{DISCUSSION_TIME}->{$ressymb} > $self->{LAST_CHECK}; # v.1.1 behavior
	return $self->{DISCUSSION_TIME}->{$ressymb} > 0; # in 1.2 will display speech bubble icons for all items with posts until marked as read (even if read in v 1.1).
	}
}	}

# Private method: Does the given resource (as a symb string) have	# Private method: Does the given resource (as a symb string) have
Line 1975 sub getById {	Line 2334 sub getById {
sub getBySymb {	sub getBySymb {
my $self = shift;	my $self = shift;
my $symb = shift;	my $symb = shift;

my ($mapUrl, $id, $filename) = &Apache::lonnet::decode_symb($symb);	my ($mapUrl, $id, $filename) = &Apache::lonnet::decode_symb($symb);
my $map = $self->getResourceByUrl($mapUrl);	my $map = $self->getResourceByUrl($mapUrl);
return $self->getById($map->map_pc() . '.' . $id);	my $returnvalue = undef;
	if (ref($map)) {
	$returnvalue = $self->getById($map->map_pc() .'.'.$id);
	}
	return $returnvalue;
}	}

sub getByMapPc {	sub getByMapPc {
Line 2160 want to know is if I<any> resources matc	Line 2524 want to know is if I<any> resources matc
parameter will allow you to avoid potentially expensive enumeration of	parameter will allow you to avoid potentially expensive enumeration of
all matching resources.	all matching resources.

=item * B<hasResources>(map, filterFunc, recursive):	=item * B<hasResource>(map, filterFunc, recursive):

Convience method for	Convience method for

Line 2171 in the filter function.	Line 2535 in the filter function.

=cut	=cut


sub getResourceByUrl {	sub getResourceByUrl {
my $self = shift;	my $self = shift;
my $resUrl = shift;	my $resUrl = shift;
Line 2253 sub hasResource {	Line 2618 sub hasResource {
1;	1;

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

=back	=back
Line 2393 sub new {	Line 2758 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 2506 sub new {	Line 2871 sub new {
}	}

# Check: Was this only one resource, a map?	# Check: Was this only one resource, a map?
if ($resourceCount == 1 && $resource->is_map() && !$self->{FORCE_TOP}) {	if ($resourceCount == 1 && $resource->is_sequence() && !$self->{FORCE_TOP}) {
my $firstResource = $resource->map_start();	my $firstResource = $resource->map_start();
my $finishResource = $resource->map_finish();	my $finishResource = $resource->map_finish();
return	return
Line 2539 sub new {	Line 2904 sub new {

sub next {	sub next {
my $self = shift;	my $self = shift;
	my $closeAllPages=shift;
if ($self->{FINISHED}) {	if ($self->{FINISHED}) {
return END_ITERATOR();	return END_ITERATOR();
}	}
Line 2553 sub next {	Line 2918 sub next {

if ($self->{RECURSIVE_ITERATOR_FLAG}) {	if ($self->{RECURSIVE_ITERATOR_FLAG}) {
# grab the next from the recursive iterator	# grab the next from the recursive iterator
my $next = $self->{RECURSIVE_ITERATOR}->next();	my $next = $self->{RECURSIVE_ITERATOR}->next($closeAllPages);

# is it a begin or end map? If so, update the depth	# is it a begin or end map? If so, update the depth
if ($next == BEGIN_MAP() ) { $self->{RECURSIVE_DEPTH}++; }	if ($next == BEGIN_MAP() ) { $self->{RECURSIVE_DEPTH}++; }
Line 2667 sub next {	Line 3032 sub next {

# That ends the main iterator logic. Now, do we want to recurse	# That ends the main iterator logic. Now, do we want to recurse
# down this map (if this resource is a map)?	# down this map (if this resource is a map)?
if ($self->{HERE}->is_map() &&	if ( ($self->{HERE}->is_sequence() \|\| (!$closeAllPages && $self->{HERE}->is_page())) &&
(defined($self->{FILTER}->{$self->{HERE}->map_pc()}) xor $self->{CONDITION})) {	(defined($self->{FILTER}->{$self->{HERE}->map_pc()}) xor $self->{CONDITION})) {
$self->{RECURSIVE_ITERATOR_FLAG} = 1;	$self->{RECURSIVE_ITERATOR_FLAG} = 1;
my $firstResource = $self->{HERE}->map_start();	my $firstResource = $self->{HERE}->map_start();
Line 2685 sub next {	Line 3050 sub next {
my $browsePriv = $self->{HERE}->browsePriv();	my $browsePriv = $self->{HERE}->browsePriv();
if (!$self->{HERE}->src() \|\|	if (!$self->{HERE}->src() \|\|
(!($browsePriv eq 'F') && !($browsePriv eq '2')) ) {	(!($browsePriv eq 'F') && !($browsePriv eq '2')) ) {
return $self->next();	return $self->next($closeAllPages);
}	}

return $self->{HERE};	return $self->{HERE};
Line 2729 sub populateStack {	Line 3094 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 2737 package Apache::lonnavmaps::DFSiterator;	Line 3102 package Apache::lonnavmaps::DFSiterator;
# useful for pre-processing of some kind, and is in fact used by the main	# useful for pre-processing of some kind, and is in fact used by the main
# iterator that way, but that's about it.	# iterator that way, but that's about it.
# One could imagine merging this into the init routine of the main iterator,	# One could imagine merging this into the init routine of the main iterator,
# but this might as well be left seperate, since it is possible some other	# but this might as well be left separate, since it is possible some other
# use might be found for it. - Jeremy	# use might be found for it. - Jeremy

# Unlike the main iterator, this DOES return all resources, even blank ones.	# Unlike the main iterator, this DOES return all resources, even blank ones.
Line 2757 sub new {	Line 3122 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 2911 sub populateStack {	Line 3276 sub populateStack {
1;	1;

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

=pod	=pod
Line 2993 sub new {	Line 3358 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 3081 Returns the title of the resource.	Line 3446 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 3092 sub randompick {	Line 3458 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 3114 sub title {	Line 3490 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 3154 Returns true if the resource is a sequen	Line 3540 Returns true if the resource is a sequen

=cut	=cut

	sub hasResource {
	my $self = shift;
	return $self->{NAV_MAP}->hasResource(@_);
	}

	sub retrieveResources {
	my $self = shift;
	return $self->{NAV_MAP}->retrieveResources(@_);
	}

sub is_html {	sub is_html {
my $self=shift;	my $self=shift;
Line 3170 sub is_page {	Line 3565 sub is_page {
sub is_problem {	sub is_problem {
my $self=shift;	my $self=shift;
my $src = $self->src();	my $src = $self->src();
return ($src =~ /problem$/);	return ($src =~ /\.(problem\|exam\|quiz\|assess\|survey\|form\|library)$/)
	}
	sub contains_problem {
	my $self=shift;
	if ($self->is_page()) {
	my $hasProblem=$self->hasResource($self,sub { $_[0]->is_problem() },1);
	return $hasProblem;
	}
	return 0;
}	}
sub is_sequence {	sub is_sequence {
my $self=shift;	my $self=shift;
Line 3178 sub is_sequence {	Line 3581 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_survey {
	my $self = shift();
	my $part = shift();
	if ($self->parmval('type',$part) eq 'survey') {
	return 1;
	}
	if ($self->src() =~ /\.(survey)$/) {
	return 1;
	}
	return 0;
	}

	sub is_empty_sequence {
	my $self=shift;
	my $src = $self->src();
	return !$self->is_page() && $self->navHash("is_map_", 1) && !$self->navHash("map_type_" . $self->map_pc());
	}

# Private method: Shells out to the parmval in the nav map, handler parts.	# Private method: Shells out to the parmval in the nav map, handler parts.
sub parmval {	sub parmval {
Line 3354 sub awarded {	Line 3774 sub awarded {
}	}
sub duedate {	sub duedate {
(my $self, my $part) = @_;	(my $self, my $part) = @_;
	my $interval=$self->parmval("interval", $part);
	if ($interval) {
	my $first_access=&Apache::lonnet::get_first_access('map',$self->symb);
	if ($first_access) { return ($first_access+$interval); }
	}
return $self->parmval("duedate", $part);	return $self->parmval("duedate", $part);
}	}
sub maxtries {	sub maxtries {
Line 3397 sub weight {	Line 3822 sub weight {
$self->symb(), $ENV{'user.domain'},	$self->symb(), $ENV{'user.domain'},
$ENV{'user.name'},	$ENV{'user.name'},
$ENV{'request.course.sec'});	$ENV{'request.course.sec'});
	}
	sub part_display {
	my $self= shift(); my $partID = shift();
	if (! defined($partID)) { $partID = '0'; }
	my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',
	$self->symb);
	if (! defined($display) \|\| $display eq '') {
	$display = $partID;
	}
	return $display;
}	}

# Multiple things need this	# Multiple things need this
Line 3487 Returns the number of parts of the probl	Line 3921 Returns the number of parts of the probl
for single part problems, returns 1. For multipart, it returns the	for single part problems, returns 1. For multipart, it returns the
number of parts in the problem, not including psuedo-part 0.	number of parts in the problem, not including psuedo-part 0.

	=item * B<countResponses>():

	Returns the total number of responses in the problem a student can answer.

	=item * B<responseTypes>():

	Returns a hash whose keys are the response types. The values are the number
	of times each response type is used. This is for the I<entire> problem, not
	just a single part.

=item * B<multipart>():	=item * B<multipart>():

Returns true if the problem is multipart, false otherwise. Use this instead	Returns true if the problem is multipart, false otherwise. Use this instead
Line 3533 sub countParts {	Line 3977 sub countParts {
return scalar(@{$parts}); # + $delta;	return scalar(@{$parts}); # + $delta;
}	}

	sub countResponses {
	my $self = shift;
	my $count;
	foreach my $part (@{$self->parts()}) {
	$count+= scalar($self->responseIds($part));
	}
	return $count;
	}

	sub responseTypes {
	my $self = shift;
	my %responses;
	foreach my $part ($self->parts()) {
	foreach my $responsetype ($self->responseType($part)) {
	$responses{$responsetype}++ if (defined($responsetype));
	}
	}
	return %responses;
	}

sub multipart {	sub multipart {
my $self = shift;	my $self = shift;
return $self->countParts() > 1;	return $self->countParts() > 1;
Line 3620 sub extractParts {	Line 4084 sub extractParts {
}	}


	# These hashes probably do not need names that end with "Hash"....
my %responseIdHash;	my %responseIdHash;
my %responseTypeHash;	my %responseTypeHash;

Line 3654 sub extractParts {	Line 4119 sub extractParts {
}	}
}	}
}	}
	my $resorder = &Apache::lonnet::metadata($self->src(),'responseorder');
	#
	# Reorder the arrays in the %responseIdHash and %responseTypeHash
	if ($resorder) {
	my @resorder=split(/,/,$resorder);
	foreach my $part (keys(%responseIdHash)) {
	my $i=0;
	my %resids = map { ($_,$i++) } @{ $responseIdHash{$part} };
	my @neworder;
	foreach my $possibleid (@resorder) {
	if (exists($resids{$possibleid})) {
	push(@neworder,$resids{$possibleid});
	}
	}
	my @ids;
	my @type;
	foreach my $element (@neworder) {
	push (@ids,$responseIdHash{$part}->[$element]);
	push (@type,$responseTypeHash{$part}->[$element]);
	}
	$responseIdHash{$part}=\@ids;
	$responseTypeHash{$part}=\@type;
	}
	}
$self->{RESPONSE_IDS} = \%responseIdHash;	$self->{RESPONSE_IDS} = \%responseIdHash;
$self->{RESPONSE_TYPES} = \%responseTypeHash;	$self->{RESPONSE_TYPES} = \%responseTypeHash;
}	}
Line 3845 sub getCompletionStatus {	Line 4334 sub getCompletionStatus {

my $status = $self->queryRestoreHash('solved', shift);	my $status = $self->queryRestoreHash('solved', shift);

# Left as seperate if statements in case we ever do more with this	# Left as separate if statements in case we ever do more with this
if ($status eq 'correct_by_student') {return $self->CORRECT;}	if ($status eq 'correct_by_student') {return $self->CORRECT;}
	if ($status eq 'correct_by_scantron') {return $self->CORRECT;}
if ($status eq 'correct_by_override') {return $self->CORRECT_BY_OVERRIDE; }	if ($status eq 'correct_by_override') {return $self->CORRECT_BY_OVERRIDE; }
if ($status eq 'incorrect_attempted') {return $self->INCORRECT; }	if ($status eq 'incorrect_attempted') {return $self->INCORRECT; }
if ($status eq 'incorrect_by_override') {return $self->INCORRECT_BY_OVERRIDE; }	if ($status eq 'incorrect_by_override') {return $self->INCORRECT_BY_OVERRIDE; }
Line 3997 sub status {	Line 4487 sub status {

if ($dateStatus == PAST_DUE_ANSWER_LATER \|\|	if ($dateStatus == PAST_DUE_ANSWER_LATER \|\|
$dateStatus == PAST_DUE_NO_ANSWER ) {	$dateStatus == PAST_DUE_NO_ANSWER ) {
return $dateStatus;	return $suppressFeedback ? ANSWER_SUBMITTED : $dateStatus;
}	}

if ($dateStatus == ANSWER_OPEN) {	if ($dateStatus == ANSWER_OPEN) {
Line 4183 sub getNext {	Line 4673 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);

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

Removed from v.1.248
changed lines
	Added in v.1.304