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.444.2.4.2.1 and 1.485

version 1.444.2.4.2.1, 2012/07/09 18:30:46	version 1.485, 2012/05/28 10:31:17
Line 464 returns 4	Line 464 returns 4

=item add_linkitem()	=item add_linkitem()

=item show_linkitems()	=item show_linkitems_toolbar()

=back	=back

Line 478 use Apache::loncommon();	Line 478 use Apache::loncommon();
use Apache::lonenc();	use Apache::lonenc();
use Apache::lonlocal;	use Apache::lonlocal;
use Apache::lonnet;	use Apache::lonnet;
	use Apache::lonmap;

use POSIX qw (floor strftime);	use POSIX qw (floor strftime);
use Time::HiRes qw( gettimeofday tv_interval );	use Time::HiRes qw( gettimeofday tv_interval );
use LONCAPA;	use LONCAPA;
use DateTime();	use DateTime();

	# For debugging

	use Data::Dumper;


# symbolic constants	# symbolic constants
sub SYMB { return 1; }	sub SYMB { return 1; }
sub URL { return 2; }	sub URL { return 2; }
Line 509 my %statusIconMap =	Line 515 my %statusIconMap =
my %iconAltTags = #texthash does not work here	my %iconAltTags = #texthash does not work here
( 'navmap.correct.gif' => 'Correct',	( 'navmap.correct.gif' => 'Correct',
'navmap.wrong.gif' => 'Incorrect',	'navmap.wrong.gif' => 'Incorrect',
'navmap.open.gif' => 'Open',	'navmap.open.gif' => 'Is Open',
'navmap.partial.gif' => 'Partially Correct',	'navmap.partial.gif' => 'Partially Correct',
'navmap.ellipsis.gif' => 'Attempted',	'navmap.ellipsis.gif' => 'Attempted',
);	);
Line 527 my %colormap =	Line 533 my %colormap =
$resObj->INCORRECT => '',	$resObj->INCORRECT => '',
$resObj->OPEN => '',	$resObj->OPEN => '',
$resObj->NOTHING_SET => '',	$resObj->NOTHING_SET => '',
$resObj->CREDIT_ATTEMPTED => '',
$resObj->ATTEMPTED => '',	$resObj->ATTEMPTED => '',
	$resObj->CREDIT_ATTEMPTED => '',
$resObj->ANSWER_SUBMITTED => '',	$resObj->ANSWER_SUBMITTED => '',
$resObj->PARTIALLY_CORRECT => '#006600'	$resObj->PARTIALLY_CORRECT => '#006600'
);	);
Line 536 my %colormap =	Line 542 my %colormap =
# is not yet done and due in less than 24 hours	# is not yet done and due in less than 24 hours
my $hurryUpColor = "#FF0000";	my $hurryUpColor = "#FF0000";

my $future_slots_checked = 0;
my $future_slots = 0;

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 addToFilter {	sub addToFilter {
my $hashIn = shift;	my $hashIn = shift;
my $addition = shift;	my $addition = shift;
Line 638 sub getDescription {	Line 612 sub getDescription {
return &mt("Having technical difficulties; please check status later");	return &mt("Having technical difficulties; please check status later");
}	}
if ($status == $res->NOTHING_SET) {	if ($status == $res->NOTHING_SET) {
return &mt("Not currently assigned.");	return &Apache::lonhtmlcommon::direct_parm_link(&mt("Not currently assigned.",$res->symb(),'opendate'),$part);
}	}
if ($status == $res->OPEN_LATER) {	if ($status == $res->OPEN_LATER) {
return &mt("Open ") .timeToHumanString($open,'start');	return &mt("Open [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($open,'start'),$res->symb(),'opendate',$part));
}	}
if ($res->simpleStatus($part) == $res->OPEN) {	if ($res->simpleStatus($part) == $res->OPEN) {
unless (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) {	unless (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) {
Line 658 sub getDescription {	Line 632 sub getDescription {
return &mt('Reserved - next open [_1]',	return &mt('Reserved - next open [_1]',
timeToHumanString($slot_time,'start'));	timeToHumanString($slot_time,'start'));
} elsif ($slot_status == $res->RESERVABLE) {	} elsif ($slot_status == $res->RESERVABLE) {
return &mt('Reservable ending [_1]',	return &mt('Reservable, reservations close [_1]',
timeToHumanString($slot_time,'end'));	timeToHumanString($slot_time,'end'));
} elsif ($slot_status == $res->RESERVABLE_LATER) {	} elsif ($slot_status == $res->RESERVABLE_LATER) {
return &mt('Reservable starting [_1]',	return &mt('Reservable, reservations open [_1]',
timeToHumanString($slot_time,'start'));	timeToHumanString($slot_time,'start'));
} elsif ($slot_status == $res->NOT_IN_A_SLOT) {	} elsif ($slot_status == $res->NOT_IN_A_SLOT) {
return &mt('Reserve a time/place to work');	return &mt('Reserve a time/place to work');
Line 675 sub getDescription {	Line 649 sub getDescription {
if ($status == $res->OPEN) {	if ($status == $res->OPEN) {
if ($due) {	if ($due) {
if ($res->is_practice()) {	if ($res->is_practice()) {
return &mt("Closes ")." " .timeToHumanString($due,'start');	return &mt("Closes [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'duedate',$part));
} else {	} else {
return &mt("Due")." " .timeToHumanString($due,'end');	return &mt("Due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'duedate',$part));
}	}
} else {	} else {
return &mt("Open, no due date");	return &Apache::lonhtmlcommon::direct_parm_link(&mt("Open, no due date"),$res->symb(),'duedate',$part);
}	}
}	}
if ($status == $res->PAST_DUE_ANSWER_LATER) {	if ($status == $res->PAST_DUE_ANSWER_LATER) {
return &mt("Answer open")." " .timeToHumanString($answer,'start');	return &mt("Answer open [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($answer,'start'),$res->symb(),'answerdate',$part));
}	}
if ($status == $res->PAST_DUE_NO_ANSWER) {	if ($status == $res->PAST_DUE_NO_ANSWER) {
if ($res->is_practice()) {	if ($res->is_practice()) {
return &mt("Closed")." " . timeToHumanString($due,'start');	return &mt("Closed [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'answerdate,duedate',$part));
} else {	} else {
return &mt("Was due")." " . timeToHumanString($due,'end');	return &mt("Was due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'answerdate,duedate',$part));
}	}
}	}
if (($status == $res->ANSWER_OPEN \|\| $status == $res->PARTIALLY_CORRECT)	if (($status == $res->ANSWER_OPEN \|\| $status == $res->PARTIALLY_CORRECT)
&& $res->handgrade($part) ne 'yes') {	&& $res->handgrade($part) ne 'yes') {
return &mt("Answer available");	return &Apache::lonhtmlcommon::direct_parm_link(&mt("Answer available"),$res->symb(),'answerdate,duedate',$part);
}	}
if ($status == $res->EXCUSED) {	if ($status == $res->EXCUSED) {
return &mt("Excused by instructor");	return &mt("Excused by instructor");
Line 723 sub getDescription {	Line 697 sub getDescription {
}	}
}	}
if ($due) {	if ($due) {
return &mt("Due")." " . timeToHumanString($due,'end') .	return &mt("Due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'duedate',$part)) .
" $triesString";	" $triesString";
} else {	} else {
return &mt("No due date")." $triesString";	return &Apache::lonhtmlcommon::direct_parm_link(&mt("No due date"),$res->symb(),'duedate',$part)." $triesString";
}	}
}	}
if ($status == $res->ANSWER_SUBMITTED) {	if ($status == $res->ANSWER_SUBMITTED) {
Line 808 sub timeToHumanString {	Line 782 sub timeToHumanString {

# Less than an hour	# Less than an hour
if ( $delta < $hour ) {	if ( $delta < $hour ) {
# If so, use minutes	# If so, use minutes; or minutes, seconds (if format requires)
my $minutes = floor($delta / 60);	my $minutes = floor($delta / 60);
	if (($format ne '') && ($format =~ /\%(T\|S)/)) {
	my $display;
	if ($minutes == 1) {
	$display = "${prefix}1 minute";
	} else {
	$display = "$prefix$minutes minutes";
	}
	my $seconds = $delta % $minute;
	if ($seconds == 0) {
	$display .= $tense;
	} elsif ($seconds == 1) {
	$display .= ", 1 second$tense";
	} else {
	$display .= ", $seconds seconds$tense";
	}
	return $display;
	}
if ($minutes == 1) { return "${prefix}1 minute$tense"; }	if ($minutes == 1) { return "${prefix}1 minute$tense"; }
return "$prefix$minutes minutes$tense";	return "$prefix$minutes minutes$tense";
}	}

# Is it less than 24 hours away? If so,	# Is it less than 24 hours away? If so,
# display hours + minutes	# display hours + minutes, (and + seconds, if format specified it)
if ( $delta < $hour * 24) {	if ( $delta < $hour * 24) {
my $hours = floor($delta / $hour);	my $hours = floor($delta / $hour);
my $minutes = floor(($delta % $hour) / $minute);	my $minutes = floor(($delta % $hour) / $minute);
Line 830 sub timeToHumanString {	Line 821 sub timeToHumanString {
if ($minutes == 0) {	if ($minutes == 0) {
$minuteString = "";	$minuteString = "";
}	}
	if (($format ne '') && ($format =~ /\%(T\|S)/)) {
	my $display = "$prefix$hourString$minuteString";
	my $seconds = $delta-(($hours * $hour)+($minutes * $minute));
	if ($seconds == 0) {
	$display .= $tense;
	} elsif ($seconds == 1) {
	$display .= ", 1 second$tense";
	} else {
	$display .= ", $seconds seconds$tense";
	}
	return $display;
	}
return "$prefix$hourString$minuteString$tense";	return "$prefix$hourString$minuteString$tense";
}	}

	# Date/time is more than 24 hours away

my $dt = DateTime->from_epoch(epoch => $time)	my $dt = DateTime->from_epoch(epoch => $time)
->set_time_zone(&Apache::lonlocal::gettimezone());	->set_time_zone(&Apache::lonlocal::gettimezone());

# If there's a caller supplied format, use it.	# If there's a caller supplied format, use it, unless it only displays
	# H:M:S or H:M.

if ($format ne '') {	if (($format ne '') && ($format ne '%T') && ($format ne '%R')) {
my $timeStr = $dt->strftime($format);	my $timeStr = $dt->strftime($format);
return $timeStr.' ('.$dt->time_zone_short_name().')';	return $timeStr.' ('.$dt->time_zone_short_name().')';
}	}
Line 890 sub part_status_summary { return 4; }	Line 896 sub part_status_summary { return 4; }
sub render_resource {	sub render_resource {
my ($resource, $part, $params) = @_;	my ($resource, $part, $params) = @_;

	my $editmapLink;
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"};
Line 971 sub render_resource {	Line 978 sub render_resource {
$linkopen = "";	$linkopen = "";
$linkclose = "";	$linkclose = "";
}	}
	if ((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) &&
	($resource->symb=~/\_\_\_[^\_]+\_\_\_uploaded/)) {
	my $icon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png';
	$editmapLink=' '.
	'<a href="/adm/coursedocs?command=direct&symb='.&escape($resource->symb()).'">'.
	'<img src="'.$icon.'" alt="'.&mt('Edit Content').'" title="'.&mt('Edit Content').'" />'.
	'</a>';
	}
}	}

if ($resource->randomout()) {	if ($resource->randomout()) {
$nonLinkedText .= ' <i>('.&mt('hidden').')</i> ';	$nonLinkedText .= ' <span class="LC_warning">('.&mt('hidden').')</span> ';
}	}
if (!$resource->condval()) {	if (!$resource->condval()) {
$nonLinkedText .= ' <i>('.&mt('conditionally hidden').')</i> ';	$nonLinkedText .= ' <span class="LC_info">('.&mt('conditionally hidden').')</span> ';
}	}
if (($resource->is_practice()) && ($resource->is_raw_problem())) {	if (($resource->is_practice()) && ($resource->is_raw_problem())) {
$nonLinkedText .=' <font color="green"><b>'.&mt('not graded').'</b></font>';	$nonLinkedText .=' <font color="green"><b>'.&mt('not graded').'</b></font>';
Line 1004 sub render_resource {	Line 1019 sub render_resource {
# Is this the current resource?	# Is this the current resource?
if (!$params->{'displayedHereMarker'} &&	if (!$params->{'displayedHereMarker'} &&
$resource->symb() eq $params->{'here'} ) {	$resource->symb() eq $params->{'here'} ) {
$curMarkerBegin = '<em>';	unless ($resource->is_map()) {
$curMarkerEnd = '</em>';	$curMarkerBegin = '<span class="LC_current_nav_location">';
	$curMarkerEnd = '</span>';
	}
$params->{'displayedHereMarker'} = 1;	$params->{'displayedHereMarker'} = 1;
}	}

Line 1021 sub render_resource {	Line 1038 sub render_resource {
$nonLinkedText .= ' ('.&mt('[_1] parts', $resource->countParts()).')';	$nonLinkedText .= ' ('.&mt('[_1] parts', $resource->countParts()).')';
}	}

my $target;
if ($env{'environment.remotenavmap'} eq 'on') {
$target=' target="loncapaclient" ';
}
if (!$params->{'resource_nolink'} && !$resource->is_sequence() && !$resource->is_empty_sequence) {	if (!$params->{'resource_nolink'} && !$resource->is_sequence() && !$resource->is_empty_sequence) {
$result .= "$curMarkerBegin<a $target href=\"$link\">$title$partLabel</a>$curMarkerEnd$nonLinkedText</td>";	$result .= "$curMarkerBegin<a href=\"$link\">$title$partLabel</a>$curMarkerEnd$nonLinkedText</td>";
} else {	} else {
$result .= "$curMarkerBegin$linkopen$title$partLabel</a>$curMarkerEnd$nonLinkedText</td>";	$result .= "$curMarkerBegin$linkopen$title$partLabel</a>$curMarkerEnd$editmapLink$nonLinkedText</td>";
}	}

return $result;	return $result;
Line 1039 sub render_communication_status {	Line 1052 sub render_communication_status {
my $discussionHTML = ""; my $feedbackHTML = ""; my $errorHTML = "";	my $discussionHTML = ""; my $feedbackHTML = ""; my $errorHTML = "";

my $link = $params->{"resourceLink"};	my $link = $params->{"resourceLink"};
my $target;	my $linkopen = "<a href=\"$link\">";
if ($env{'environment.remotenavmap'} eq 'on') {
$target=' target="loncapaclient" ';
}
my $linkopen = "<a $target href=\"$link\">";
my $linkclose = "</a>";	my $linkclose = "</a>";
my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");	my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");

if ($resource->hasDiscussion()) {	if ($resource->hasDiscussion()) {
$discussionHTML = $linkopen .	$discussionHTML = $linkopen .
'<img alt="'.&mt('New Discussion').'" src="'.$location.'/chat.gif" title="'.&mt('New Discussion').'"/>' .	'<img alt="'.&mt('New Discussion').'" src="'.$location.'/chat.gif" title="'.&mt('New Discussion').'"/>' .
Line 1056 sub render_communication_status {	Line 1066 sub render_communication_status {
my $feedback = $resource->getFeedback();	my $feedback = $resource->getFeedback();
foreach my $msgid (split(/\,/, $feedback)) {	foreach my $msgid (split(/\,/, $feedback)) {
if ($msgid) {	if ($msgid) {
$feedbackHTML .= ' <a '.$target.' href="/adm/email?display='	$feedbackHTML .= ' <a href="/adm/email?display='
. &escape($msgid) . '">'	. &escape($msgid) . '">'
. '<img alt="'.&mt('New E-mail').'" src="'.$location.'/feedback.gif" title="'.&mt('New E-mail').'"/></a>';	. '<img alt="'.&mt('New E-mail').'" src="'.$location.'/feedback.gif" title="'.&mt('New E-mail').'"/></a>';
}	}
Line 1070 sub render_communication_status {	Line 1080 sub render_communication_status {
last if ($errorcount>=10); # Only output 10 bombs maximum	last if ($errorcount>=10); # Only output 10 bombs maximum
if ($msgid) {	if ($msgid) {
$errorcount++;	$errorcount++;
$errorHTML .= ' <a '.$target.' href="/adm/email?display='	$errorHTML .= ' <a href="/adm/email?display='
. &escape($msgid) . '">'	. &escape($msgid) . '">'
. '<img alt="'.&mt('New Error').'" src="'.$location.'/bomb.gif" title="'.&mt('New Error').'"/></a>';	. '<img alt="'.&mt('New Error').'" src="'.$location.'/bomb.gif" title="'.&mt('New Error').'"/></a>';
}	}
Line 1090 sub render_quick_status {	Line 1100 sub render_quick_status {
$params->{'multipart'} && $part eq "0";	$params->{'multipart'} && $part eq "0";

my $link = $params->{"resourceLink"};	my $link = $params->{"resourceLink"};
my $target;	my $linkopen = "<a href=\"$link\">";
if ($env{'environment.remotenavmap'} eq 'on') {
$target=' target="loncapaclient" ';
}
my $linkopen = "<a $target href=\"$link\">";
my $linkclose = "</a>";	my $linkclose = "</a>";

$result .= '<td class="LC_middle">';	$result .= '<td class="LC_middle">';
Line 1132 sub render_long_status {	Line 1138 sub render_long_status {
}	}

if ($resource->kind() eq "res" &&	if ($resource->kind() eq "res" &&
($resource->is_problem() \|\| $resource->is_practice()) &&	$resource->is_raw_problem() &&
!$firstDisplayed) {	!$firstDisplayed) {
if ($color) {$result .= "<font color=\"$color\"><b>"; }	if ($color) {$result .= "<font color=\"$color\"><b>"; }
$result .= getDescription($resource, $part);	$result .= getDescription($resource, $part);
Line 1459 sub render {	Line 1465 sub render {
$link .= '&register='.$env{'form.register'};	$link .= '&register='.$env{'form.register'};
}	}
if ($args->{'caller'} eq 'navmapsdisplay') {	if ($args->{'caller'} eq 'navmapsdisplay') {
&add_linkitem($args->{'linkitems'},'changefolder',	unless ($args->{'notools'}) {
"location.href='$link'",$text);	&add_linkitem($args->{'linkitems'},'changefolder',
	"location.href='$link'",$text);
	}
} else {	} else {
$result.= '<a href="'.$link.'">'.&mt($text).'</a>';	$result.= '<a href="'.$link.'">'.&mt($text).'</a>';
}	}
$result .= "\n";	$result .= "\n";
}	}

# 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') && (!$args->{'notools'})) {
&add_linkitem($args->{'linkitems'},'clearbubbles',	&add_linkitem($args->{'linkitems'},'clearbubbles',
'document.clearbubbles.submit()',	'document.clearbubbles.submit()',
'Mark all posts read');	'Mark all posts read');
Line 1501 END	Line 1509 END
}	}
$result.='</form>';	$result.='</form>';
}	}
	if (($args->{'caller'} eq 'navmapsdisplay') &&
	(&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
	if ($env{'course.'.$env{'request.course.id'}.'.url'} eq
	"uploaded/$cdom/$cnum/default.sequence") {
	&add_linkitem($args->{'linkitems'},'edittoplevel',
	"javascript:gocmd('/adm/coursedocs','editdocs');",
	'Content Editor');
	}
	}

if ($args->{'caller'} eq 'navmapsdisplay') {	if ($args->{'caller'} eq 'navmapsdisplay') {
$result .= '<table><tr><td>'.	$result .= &show_linkitems_toolbar($args,$condition);
&Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').'</td><td> </td>'.
'<td class="LC_middle">'.&mt('Tools:').'</td>'.
&show_linkitems_toolbar($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" colspan="4"><br />'.
$args->{'sort_html'}.'</td></tr>';
}
} else {
$result .= '</tr>';
}
$result .= '</table>';
} elsif ($args->{'sort_html'}) {	} elsif ($args->{'sort_html'}) {
$result.=$args->{'sort_html'};	$result.=$args->{'sort_html'};
}	}
Line 1855 sub add_linkitem {	Line 1859 sub add_linkitem {
}	}

sub show_linkitems_toolbar {	sub show_linkitems_toolbar {
my ($linkitems,$condition)=@_;	my ($args,$condition) = @_;
my @linkorder = ("launchnav","closenav","firsthomework",	my $result;
"everything","uncompleted","changefolder","clearbubbles");	if (ref($args) eq 'HASH') {
my $result .='<td align="left">'."\n".	if (ref($args->{'linkitems'}) eq 'HASH') {
'<span class="LC_nobreak">'."\n".	my $numlinks = scalar(keys(%{$args->{'linkitems'}}));
'<ul id="LC_toolbar">';	if ($numlinks > 1) {
foreach my $link (@linkorder) {	$result = '<td>'.
my $link_id = 'LC_content_toolbar_'.$link;	&Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',
if (defined($linkitems->{$link})) {	undef,'RAT').
if ($linkitems->{$link}{'text'} ne '') {	'</td>'.
$linkitems->{$link}{'cmd'}=~s/"/'/g;	'<td> </td>'.
if ($linkitems->{$link}{'cmd'}) {	'<td class="LC_middle">'.&mt('Tools:').'</td>';
if ($link eq 'changefolder') {	}
if ($condition) {	$result .= '<td align="left">'."\n".
$link_id='LC_content_toolbar_changefolder_toggled';	'<span class="LC_nobreak">'."\n".
} else {	'<ul id="LC_toolbar">';
$link_id='LC_content_toolbar_changefolder';	my @linkorder = ('firsthomework','everything','uncompleted',
	'changefolder','clearbubbles','edittoplevel');
	foreach my $link (@linkorder) {
	if (ref($args->{'linkitems'}{$link}) eq 'HASH') {
	if ($args->{'linkitems'}{$link}{'text'} ne '') {
	$args->{'linkitems'}{$link}{'cmd'}=~s/"/'/g;
	if ($args->{'linkitems'}{$link}{'cmd'}) {
	my $link_id = 'LC_content_toolbar_'.$link;
	if ($link eq 'changefolder') {
	if ($condition) {
	$link_id='LC_content_toolbar_changefolder_toggled';
	} else {
	$link_id='LC_content_toolbar_changefolder';
	}
	}
	$result .= '<li><a href="#" '.
	'onclick="'.$args->{'linkitems'}{$link}{'cmd'}.'" '.
	'id="'.$link_id.'" '.
	'class="LC_toolbarItem" '.
	'title="'.$args->{'linkitems'}{$link}{'text'}.'">'.
	'</a></li>'."\n";
}	}
}	}
$result .= '<li><a href="#" '.
'onclick="'.$linkitems->{$link}{'cmd'}.'" '.
'id="'.$link_id.'" '.
'class="LC_toolbarItem" '.
'title="'.$linkitems->{$link}{'text'}.'">'.
'</a></li>'."\n";
}	}
}	}
	$result .= '</ul>'.
	'</span></td>';
	if (($numlinks==1) && (exists($args->{'linkitems'}{'edittoplevel'}))) {
	$result .= '<td><a href="'.$args->{'linkitems'}{'edittoplevel'}{'cmd'}.'">'.
	&mt('Content Editor').'</a></td>';
	}
}	}
	if ($args->{'sort_html'}) {
	$result .= '<td> </td><td> </td><td> </td>'.
	'<td align="right">'.$args->{'sort_html'}.'</td>';
	}
	}
	if ($result) {
	$result = "<table><tr>$result</tr></table>";
}	}
$result .= '</ul>'.
'</span></td>'."\n";
return $result;	return $result;
}	}


1;	1;


Line 1976 sub new {	Line 2004 sub new {
my $proto = shift;	my $proto = shift;
my $class = ref($proto) \|\| $proto;	my $class = ref($proto) \|\| $proto;
my $self = {};	my $self = {};
	bless($self); # So we can call change_user if neceesary

	$self->{USERNAME} = shift \|\| $env{'user.name'};
	$self->{DOMAIN} = shift \|\| $env{'user.domain'};



# Resource cache stores navmap resources as we reference them. We generate	# Resource cache stores navmap resources as we reference them. We generate
# them on-demand so we don't pay for creating resources unless we use them.	# them on-demand so we don't pay for creating resources unless we use them.
Line 1985 sub new {	Line 2019 sub new {
# failed	# failed
$self->{NETWORK_FAILURE} = 0;	$self->{NETWORK_FAILURE} = 0;

# tie the nav hash	# We can only tie the nav hash as done below if the username/domain
	# match the env one. Otherwise change_user does everything we need...since we can't
	# assume there are course hashes for the specific requested user@domamin:
	#

my %navmaphash;	if (($self->{USERNAME} eq $env{'user.name'}) && ($self->{DOMAIN} eq $env{'user.domain'})) {
my %parmhash;
my $courseFn = $env{"request.course.fn"};	# tie the nav hash
if (!(tie(%navmaphash, 'GDBM_File', "${courseFn}.db",
&GDBM_READER(), 0640))) {	my %navmaphash;
return undef;	my %parmhash;
	my $courseFn = $env{"request.course.fn"};
	if (!(tie(%navmaphash, 'GDBM_File', "${courseFn}.db",
	&GDBM_READER(), 0640))) {
	return undef;
	}

	if (!(tie(%parmhash, 'GDBM_File', "${courseFn}_parms.db",
	&GDBM_READER(), 0640)))
	{
	untie %{$self->{PARM_HASH}};
	return undef;
	}

	$self->{NAV_HASH} = \%navmaphash;
	$self->{PARM_HASH} = \%parmhash;
	$self->{PARM_CACHE} = {};
	} else {
	$self->change_user($self->{USERNAME}, $self->{DOMAIN});
}	}

	return $self;
	}

	#
	# In some instances it is useful to be able to dynamically change the
	# username/domain associated with a navmap (e.g. to navigate for someone
	# else besides the current user...if sufficiently privileged.
	# Parameters:
	# user - New user.
	# domain- Domain the user belongs to.
	# Implicit inputs:
	#
	sub change_user {
	my $self = shift;
	$self->{USERNAME} = shift;
	$self->{DOMAIN} = shift;

	# If the hashes are already tied make sure to break that bond:

	untie %{$self->{NAV_HASH}};
	untie %{$self->{PARM_HASH}};

	# The assumption is that we have to
	# use lonmap here to re-read the hash and from it reconstruct
	# new big and parameter hashes. An implicit assumption at this time
	# is that the course file is probably not created locally yet
	# an that we will therefore just read without tying.

	my ($cdom, $cnum) = split(/\_/, $env{'request.course.id'});

	my %big_hash;
	&Apache::lonmap::loadmap($cnum, $cdom, $self->{USERNAME}, $self->{DOMAIN}, \%big_hash);
	$self->{NAV_HASH} = \%big_hash;



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

	$self->{PARM_CACHE} = {};

if (!(tie(%parmhash, 'GDBM_File', "${courseFn}_parms.db",	my %parm_hash = {};
&GDBM_READER(), 0640)))	foreach my $key (keys %big_hash) {
{	if ($key =~ /^param\./) {
untie %{$self->{PARM_HASH}};	my $param_key = $key;
return undef;	$param_key =~ s/^param\.//;
	$parm_hash{$param_key} = $big_hash{$key};
	}
}	}

$self->{NAV_HASH} = \%navmaphash;	$self->{PARM_HASH} = \%parm_hash;
$self->{PARM_HASH} = \%parmhash;
$self->{PARM_CACHE} = {};

bless($self);

return $self;	}
}

sub generate_course_user_opt {	sub generate_course_user_opt {
my $self = shift;	my $self = shift;
if ($self->{COURSE_USER_OPT_GENERATED}) { return; }	if ($self->{COURSE_USER_OPT_GENERATED}) { return; }

my $uname=$env{'user.name'};	my $uname=$self->{USERNAME};
my $udom=$env{'user.domain'};	my $udom=$self->{DOMAIN};

my $cid=$env{'request.course.id'};	my $cid=$env{'request.course.id'};
my $cdom=$env{'course.'.$cid.'.domain'};	my $cdom=$env{'course.'.$cid.'.domain'};
my $cnum=$env{'course.'.$cid.'.num'};	my $cnum=$env{'course.'.$cid.'.num'};
Line 2050 sub generate_course_user_opt {	Line 2146 sub generate_course_user_opt {
return;	return;
}	}



sub generate_email_discuss_status {	sub generate_email_discuss_status {
my $self = shift;	my $self = shift;
my $symb = shift;	my $symb = shift;
Line 2059 sub generate_email_discuss_status {	Line 2157 sub generate_email_discuss_status {
my $cdom=$env{'course.'.$cid.'.domain'};	my $cdom=$env{'course.'.$cid.'.domain'};
my $cnum=$env{'course.'.$cid.'.num'};	my $cnum=$env{'course.'.$cid.'.num'};

my %emailstatus = &Apache::lonnet::dump('email_status');	my %emailstatus = &Apache::lonnet::dump('email_status',$self->{DOMAIN},$self->{USERNAME});
my $logoutTime = $emailstatus{'logout'};	my $logoutTime = $emailstatus{'logout'};
my $courseLeaveTime = $emailstatus{'logout_'.$env{'request.course.id'}};	my $courseLeaveTime = $emailstatus{'logout_'.$env{'request.course.id'}};
$self->{LAST_CHECK} = (($courseLeaveTime > $logoutTime) ?	$self->{LAST_CHECK} = (($courseLeaveTime > $logoutTime) ?
Line 2067 sub generate_email_discuss_status {	Line 2165 sub generate_email_discuss_status {
my %discussiontime = &Apache::lonnet::dump('discussiontimes',	my %discussiontime = &Apache::lonnet::dump('discussiontimes',
$cdom, $cnum);	$cdom, $cnum);
my %lastread = &Apache::lonnet::dump('nohist_'.$cid.'_discuss',	my %lastread = &Apache::lonnet::dump('nohist_'.$cid.'_discuss',
$env{'user.domain'},$env{'user.name'},'lastread');	$self->{DOMAIN},$self->{USERNAME},'lastread');
my %lastreadtime = ();	my %lastreadtime = ();
foreach my $key (keys %lastread) {	foreach my $key (keys %lastread) {
my $shortkey = $key;	my $shortkey = $key;
Line 2077 sub generate_email_discuss_status {	Line 2175 sub generate_email_discuss_status {

my %feedback=();	my %feedback=();
my %error=();	my %error=();
my @keys = &Apache::lonnet::getkeys('nohist_email',$env{'user.domain'},	my @keys = &Apache::lonnet::getkeys('nohist_email',$self->{DOMAIN},
$env{'user.name'});	$self->{USERNAME});

foreach my $msgid (@keys) {	foreach my $msgid (@keys) {
if ((!$emailstatus{$msgid}) \|\| ($emailstatus{$msgid} eq 'new')) {	if ((!$emailstatus{$msgid}) \|\| ($emailstatus{$msgid} eq 'new')) {
Line 2126 sub get_user_data {	Line 2224 sub get_user_data {

# Retrieve performance data on problems	# Retrieve performance data on problems
my %student_data = Apache::lonnet::currentdump($env{'request.course.id'},	my %student_data = Apache::lonnet::currentdump($env{'request.course.id'},
$env{'user.domain'},	$self->{DOMAIN},
$env{'user.name'});	$self->{USERNAME});
$self->{STUDENT_DATA} = \%student_data;	$self->{STUDENT_DATA} = \%student_data;

$self->{RETRIEVED_USER_DATA} = 1;	$self->{RETRIEVED_USER_DATA} = 1;
Line 2441 sub parmval {	Line 2539 sub parmval {
my $self = shift;	my $self = shift;
my ($what,$symb,$recurse)=@_;	my ($what,$symb,$recurse)=@_;
my $hashkey = $what."\|\|\|".$symb;	my $hashkey = $what."\|\|\|".$symb;
	my $cache = $self->{PARM_CACHE};
if (defined($self->{PARM_CACHE}->{$hashkey})) {	if (defined($self->{PARM_CACHE}->{$hashkey})) {
if (ref($self->{PARM_CACHE}->{$hashkey}) eq 'ARRAY') {	if (ref($self->{PARM_CACHE}->{$hashkey}) eq 'ARRAY') {
if (defined($self->{PARM_CACHE}->{$hashkey}->[0])) {	if (defined($self->{PARM_CACHE}->{$hashkey}->[0])) {
Line 2463 sub parmval {	Line 2561 sub parmval {
return $result->[0];	return $result->[0];
}	}


sub parmval_real {	sub parmval_real {
my $self = shift;	my $self = shift;
my ($what,$symb,$recurse) = @_;	my ($what,$symb,$recurse) = @_;


# Make sure the {USER_OPT} and {COURSE_OPT} hashes are populated	# Make sure the {USER_OPT} and {COURSE_OPT} hashes are populated
$self->generate_course_user_opt();	$self->generate_course_user_opt();

Line 2478 sub parmval_real {	Line 2578 sub parmval_real {
@cgrps = sort(@cgrps);	@cgrps = sort(@cgrps);
$cgroup = $cgrps[0];	$cgroup = $cgrps[0];
}	}
my $uname=$env{'user.name'};	my $uname=$self->{USERNAME};
my $udom=$env{'user.domain'};	my $udom=$self->{DOMAIN};

unless ($symb) { return ['']; }	unless ($symb) { return ['']; }
my $result='';	my $result='';
Line 2495 sub parmval_real {	Line 2595 sub parmval_real {
my $mapparm=$mapname.'___(all).'.$what;	my $mapparm=$mapname.'___(all).'.$what;
my $usercourseprefix=$cid;	my $usercourseprefix=$cid;



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


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


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


my $useropt = $self->{USER_OPT};	my $useropt = $self->{USER_OPT};
my $courseopt = $self->{COURSE_OPT};	my $courseopt = $self->{COURSE_OPT};
my $parmhash = $self->{PARM_HASH};	my $parmhash = $self->{PARM_HASH};
Line 2573 sub parmval_real {	Line 2678 sub parmval_real {
if (defined($pack_def)) { return [$pack_def,'resource']; }	if (defined($pack_def)) { return [$pack_def,'resource']; }
return [''];	return [''];
}	}
	#
	# Determines the open/close dates for printing a map that
	# encloses a resource.
	#
	sub map_printdates {
	my ($self, $res, $part) = @_;





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


	return ($opendate, $closedate);
	}

	sub get_mapparam {
	my ($self, $symb, $what) = @_;

	# Ensure the course option hash is populated:

	$self->generate_course_user_opt();

	# Get the course id and section if there is one.

	my $cid=$env{'request.course.id'};
	my $csec=$env{'request.course.sec'};
	my $cgroup='';
	my @cgrps=split(/:/,$env{'request.course.groups'});
	if (@cgrps > 0) {
	@cgrps = sort(@cgrps);
	$cgroup = $cgrps[0];
	}
	my $uname=$self->{USERNAME};
	my $udom=$self->{DOMAIN};

	unless ($symb) { return ['']; }
	my $result='';


	# Figure out which map we are in.

	my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb);
	$mapname = &Apache::lonnet::deversion($mapname);


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

	# Build the hash keys for the lookup:

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


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


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

	my $useropt = $self->{USER_OPT};
	my $courseopt = $self->{COURSE_OPT};
	my $parmhash = $self->{PARM_HASH};

	# Check per user



	if ($uname and defined($useropt)) {
	if (defined($$useropt{$courselevel})) {
	return $$useropt{$courselevel};
	}
	}

	# Check course -- group



	if ($cgroup ne '' and defined ($courseopt)) {
	if (defined($$courseopt{$grplevel})) {
	return $$courseopt{$grplevel};
	}
	}

	# Check course -- section





	if ($csec and defined($courseopt)) {
	if (defined($$courseopt{$seclevel})) {
	return $$courseopt{$seclevel};
	}
	}
	# Check the map parameters themselves:

	my $thisparm = $$parmhash{$symbparm};
	if (defined($thisparm)) {
	return $thisparm;
	}


	# Additional course parameters:

	if (defined($courseopt)) {
	if (defined($$courseopt{$courselevel})) {
	return $$courseopt{$courselevel};
	}
	}
	return undef; # Unefined if we got here.
	}

	sub course_printdates {
	my ($self, $symb, $part) = @_;


	my $opendate = $self->getcourseparam($symb, $part . '.printstartdate');
	my $closedate = $self->getcourseparam($symb, $part . '.printenddate');
	return ($opendate, $closedate);

	}

	sub getcourseparam {
	my ($self, $symb, $what) = @_;

	$self->generate_course_user_opt(); # If necessary populate the hashes.

	my $uname = $self->{USERNAME};
	my $udom = $self->{DOMAIN};

	# Course, section, group ids come from the env:

	my $cid = $env{'request.course.id'};
	my $csec = $env{'request.course.sec'};
	my $cgroup = ''; # Assume no group

	my @cgroups = split(/:/, $env{'request.course.groups'});
	if(@cgroups > 0) {
	@cgroups = sort(@cgroups);
	$cgroup = $cgroups[0]; # There is a course group.
	}
	my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb);
	$mapname = &Apache::lonnet::deversion($mapname);

	#
	# Make the various lookup keys:
	#

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


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

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

	my $useropt = $self->{USER_OPT};
	my $courseopt = $self->{COURSE_OPT};

	#
	# We want the course level stuff from the way
	# parmval_real operates
	# TODO: Fator some of this stuff out of
	# both parmval_real and here
	#
	my $courselevel = $cid . '.' . $what;
	my $grplevel = $cid . '.[' . $cgroup . ']' . $what;
	my $seclevel = $cid . '.[' . $csec . ']' . $what;


	# Try for the user's course level option:

	if ($uname and defined($useropt)) {
	if (defined($$useropt{$courselevel})) {
	return $$useropt{$courselevel};
	}
	}
	# Try for the group's course level option:

	if ($uname ne '' and defined($courseopt)) {
	if (defined($$courseopt{$grplevel})) {
	return $$courseopt{$grplevel};
	}
	}

	# Try for section level parameters:

	if ($csec and defined($courseopt)) {
	if (defined($$courseopt{$seclevel})) {
	return $$courseopt{$seclevel};
	}
	}
	# Try for 'additional' course parameterse:

	if (defined($courseopt)) {
	if (defined($$courseopt{$courselevel})) {
	return $$courseopt{$courselevel};
	}
	}
	return undef;

	}


=pod	=pod

Line 2626 in the filter function.	Line 2942 in the filter function.
Retrieves version infomation for a url. Returns the version (a number, or	Retrieves version infomation for a url. Returns the version (a number, or
the string "mostrecent") for resources which have version information in	the string "mostrecent") for resources which have version information in
the big hash.	the big hash.

=cut	=cut


Line 2881 sub new {	Line 3197 sub new {
weaken($self->{NAV_MAP} = shift);	weaken($self->{NAV_MAP} = shift);
return undef unless ($self->{NAV_MAP});	return undef unless ($self->{NAV_MAP});

	$self->{USERNAME} = $self->{NAV_MAP}->{USERNAME};
	$self->{DOMAIN} = $self->{NAV_MAP}->{DOMAIN};

# Handle the parameters	# Handle the parameters
$self->{FIRST_RESOURCE} = shift \|\| $self->{NAV_MAP}->firstResource();	$self->{FIRST_RESOURCE} = shift \|\| $self->{NAV_MAP}->firstResource();
$self->{FINISH_RESOURCE} = shift \|\| $self->{NAV_MAP}->finishResource();	$self->{FINISH_RESOURCE} = shift \|\| $self->{NAV_MAP}->finishResource();
Line 2994 sub new {	Line 3313 sub new {
if ($resourceCount == 1 && $resource->is_sequence() && !$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	my $result;
Apache::lonnavmaps::iterator->new($self->{NAV_MAP}, $firstResource,	$result = Apache::lonnavmaps::iterator->new($self->{NAV_MAP}, $firstResource,
$finishResource, $self->{FILTER},	$finishResource, $self->{FILTER},
$self->{ALREADY_SEEN},	$self->{ALREADY_SEEN},
$self->{CONDITION},	$self->{CONDITION},
$self->{FORCE_TOP});	$self->{FORCE_TOP});
	return $result;


}	}

Line 3019 sub new {	Line 3340 sub new {
$self->{ALREADY_SEEN}->{$self->{FIRST_RESOURCE}->{ID}} = 1;	$self->{ALREADY_SEEN}->{$self->{FIRST_RESOURCE}->{ID}} = 1;

bless ($self);	bless ($self);

return $self;	return $self;
}	}

Line 3034 sub next {	Line 3354 sub next {
# do so.	# do so.
if ($self->{RETURN_0} && !$self->{HAVE_RETURNED_0}) {	if ($self->{RETURN_0} && !$self->{HAVE_RETURNED_0}) {
$self->{HAVE_RETURNED_0} = 1;	$self->{HAVE_RETURNED_0} = 1;
	my $nextTopLevel = $self->{NAV_MAP}->getById('0.0');
return $self->{NAV_MAP}->getById('0.0');	return $self->{NAV_MAP}->getById('0.0');
}	}
if ($self->{RETURN_0} && !$self->{HAVE_RETURNED_0_BEGIN_MAP}) {	if ($self->{RETURN_0} && !$self->{HAVE_RETURNED_0_BEGIN_MAP}) {
Line 3053 sub next {	Line 3374 sub next {
if ($self->{RECURSIVE_DEPTH} == 0) {	if ($self->{RECURSIVE_DEPTH} == 0) {
$self->{RECURSIVE_ITERATOR_FLAG} = 0;	$self->{RECURSIVE_ITERATOR_FLAG} = 0;
}	}

return $next;	return $next;
}	}

Line 3129 sub next {	Line 3449 sub next {
# So we need to look at all the resources we can get to from here,	# So we need to look at all the resources we can get to from here,
# categorize them if we haven't seen them, remember if we have a new	# categorize them if we haven't seen them, remember if we have a new
my $nextUnfiltered = $here->getNext();	my $nextUnfiltered = $here->getNext();


my $maxDepthAdded = -1;	my $maxDepthAdded = -1;

for (@$nextUnfiltered) {	for (@$nextUnfiltered) {
Line 3162 sub next {	Line 3484 sub next {
$self->{RECURSIVE_ITERATOR_FLAG} = 1;	$self->{RECURSIVE_ITERATOR_FLAG} = 1;
my $firstResource = $self->{HERE}->map_start();	my $firstResource = $self->{HERE}->map_start();
my $finishResource = $self->{HERE}->map_finish();	my $finishResource = $self->{HERE}->map_finish();

$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},
Line 3254 sub new {	Line 3575 sub new {
weaken($self->{NAV_MAP} = shift);	weaken($self->{NAV_MAP} = shift);
return undef unless ($self->{NAV_MAP});	return undef unless ($self->{NAV_MAP});

	$self->{USERNAME} = $self->{NAV_MAP}->{USERNAME};
	$self->{DOMAIN} = $self->{NAV_MAP}->{DOMAIN};

$self->{FIRST_RESOURCE} = shift \|\| $self->{NAV_MAP}->firstResource();	$self->{FIRST_RESOURCE} = shift \|\| $self->{NAV_MAP}->firstResource();
$self->{FINISH_RESOURCE} = shift \|\| $self->{NAV_MAP}->finishResource();	$self->{FINISH_RESOURCE} = shift \|\| $self->{NAV_MAP}->finishResource();

Line 3490 sub new {	Line 3814 sub new {
weaken($self->{NAV_MAP} = shift);	weaken($self->{NAV_MAP} = shift);
$self->{ID} = shift;	$self->{ID} = shift;

	$self->{USERNAME} = $self->{NAV_MAP}->{USERNAME};
	$self->{DOMAIN} = $self->{NAV_MAP}->{DOMAIN};

# Store this new resource in the parent nav map's cache.	# Store this new resource in the parent nav map's cache.
$self->{NAV_MAP}->{RESOURCE_CACHE}->{$self->{ID}} = $self;	$self->{NAV_MAP}->{RESOURCE_CACHE}->{$self->{ID}} = $self;
$self->{RESOURCE_ERROR} = 0;	$self->{RESOURCE_ERROR} = 0;
Line 3514 sub navHash {	Line 3841 sub navHash {
my $param = shift;	my $param = shift;
my $id = shift;	my $id = shift;
my $arg = $param . ($id?$self->{ID}:"");	my $arg = $param . ($id?$self->{ID}:"");
if (defined($arg)) {	if (ref($self) && ref($self->{NAV_MAP}) && defined($arg)) {
return $self->{NAV_MAP}->navhash($arg);	return $self->{NAV_MAP}->navhash($arg);
}	}
return;	return;
Line 3755 sub is_practice {	Line 4082 sub is_practice {
sub is_problem {	sub is_problem {
my $self=shift;	my $self=shift;
my $src = $self->src();	my $src = $self->src();
if ($src =~ /\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|task)$/) {	if ($src =~ /$LONCAPA::assess_re/) {
return !($self->is_practice());	return !($self->is_practice());
}	}
return 0;	return 0;
Line 3778 my %incomplete_hash =	Line 4105 my %incomplete_hash =
sub is_incomplete {	sub is_incomplete {
my $self = shift;	my $self = shift;
if ($self->is_problem()) {	if ($self->is_problem()) {
&Apache::lonnet::logthis('is problem');
foreach my $part (@{$self->parts()}) {	foreach my $part (@{$self->parts()}) {
&Apache::lonnet::logthis("$part status ".$self->status($part));
if (exists($incomplete_hash{$self->status($part)})) {	if (exists($incomplete_hash{$self->status($part)})) {
return 1;	return 1;
}	}
Line 3792 sub is_incomplete {	Line 4117 sub is_incomplete {
sub is_raw_problem {	sub is_raw_problem {
my $self=shift;	my $self=shift;
my $src = $self->src();	my $src = $self->src();
if ($src =~ /\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|task)$/) {	if ($src =~ /$LONCAPA::assess_re/) {
return 1;	return 1;
}	}
return 0;	return 0;
Line 3936 sub map_hierarchy {	Line 4261 sub map_hierarchy {
return $self->navHash("map_hierarchy_$pc", 0);	return $self->navHash("map_hierarchy_$pc", 0);
}	}


#####	#####
# Property queries	# Property queries
#####	#####
Line 3966 their code.)	Line 4290 their code.)

=over 4	=over 4

=item * B<acc>:
	=item * B<printable>

	returns true if the current date is such that the
	specified resource part is printable.


	=item * B<resprintable>

	Returns true if all parts in the resource are printable making the
	entire resource printable.

	=item * B<acc>

Get the Client IP/Name Access Control information.	Get the Client IP/Name Access Control information.

Line 4019 Get the weight for the problem.	Line 4355 Get the weight for the problem.

=cut	=cut




	sub printable {

	my ($self, $part) = @_;

	# Get the print open/close dates for the resource.

	my $start = $self->parmval("printstartdate", $part);
	my $end = $self->parmval("printenddate", $part);

	# The following cases apply:
	# - No dates set: Printable.
	# - Start date set but no end date: Printable if now >= start date.
	# - End date set but no start date: Printable if now <= end date.
	# - both defined: printable if start <= now <= end
	#
	my $now = time();

	my $startok = 1;
	my $endok = 1;

	if ((defined $start) && ($start ne '')) {
	$startok = $start <= $now;
	}
	if ((defined $end) && ($end != '')) {
	$endok = $end >= $now;
	}
	return $startok && $endok;
	}

	sub resprintable {
	my $self = shift;

	# get parts...or realize there are no parts.

	my $partsref = $self->parts();
	my @parts = @$partsref;

	if ((!defined(@parts)) \|\| (scalar(@parts) == 0)) {
	return $self->printable(0);
	} else {
	foreach my $part (@parts) {
	if (!$self->printable($part)) {
	return 0;
	}
	}
	return 1;
	}
	}

sub acc {	sub acc {
(my $self, my $part) = @_;	(my $self, my $part) = @_;
my $acc = $self->parmval("acc", $part);	my $acc = $self->parmval("acc", $part);
Line 4071 sub checkedin {	Line 4459 sub checkedin {
}	}
}	}
# this should work exactly like the copy in lonhomework.pm	# this should work exactly like the copy in lonhomework.pm
	# Why is there a copy in lonhomework? Why not centralized?
	#
	# TODO: Centralize duedate.
	#

sub duedate {	sub duedate {
(my $self, my $part) = @_;	(my $self, my $part) = @_;
if (defined ($self->{DUEDATE_CACHE}->{$part})) {	if (defined ($self->{DUEDATE_CACHE}->{$part})) {
Line 4154 sub weight {	Line 4547 sub weight {
my $self = shift; my $part = shift;	my $self = shift; my $part = shift;
if (!defined($part)) { $part = '0'; }	if (!defined($part)) { $part = '0'; }
my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',	my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',
$self->symb(), $env{'user.domain'},	$self->symb(), $self->{DOMAIN},
$env{'user.name'},	$self->{USERNAME},
$env{'request.course.sec'});	$env{'request.course.sec'});
return $weight;	return $weight;
}	}
Line 4183 sub getReturnHash {	Line 4576 sub getReturnHash {
my $self = shift;	my $self = shift;

if (!defined($self->{RETURN_HASH})) {	if (!defined($self->{RETURN_HASH})) {
my %tmpHash = &Apache::lonnet::restore($self->symb());	my %tmpHash = &Apache::lonnet::restore($self->symb(),undef,$self->{DOMAIN},$self->{USERNAME});
$self->{RETURN_HASH} = \%tmpHash;	$self->{RETURN_HASH} = \%tmpHash;
}	}
}	}
Line 4944 sub status {	Line 5337 sub status {
}	}

# Otherwise, it's untried and open	# Otherwise, it's untried and open
return OPEN;	return OPEN;
}	}

sub check_for_slot {	sub check_for_slot {
my $self = shift;	my $self = shift;
my $part = shift;	my $part = shift;
	my $symb = $self->symb();
my ($use_slots,$available,$availablestudent) = $self->slot_control($part);	my ($use_slots,$available,$availablestudent) = $self->slot_control($part);
if (($use_slots ne '') && ($use_slots !~ /^\sno\s$/i)) {	if (($use_slots ne '') && ($use_slots !~ /^\sno\s$/i)) {
my @slots = (split(/:/,$availablestudent),split(/:/,$available));	my @slots = (split(/:/,$availablestudent),split(/:/,$available));
Line 4957 sub check_for_slot {	Line 5351 sub check_for_slot {
my $cdom=$env{'course.'.$cid.'.domain'};	my $cdom=$env{'course.'.$cid.'.domain'};
my $cnum=$env{'course.'.$cid.'.num'};	my $cnum=$env{'course.'.$cid.'.num'};
my $now = time;	my $now = time;
	my $num_usable_slots = 0;
if (@slots > 0) {	if (@slots > 0) {
my %slots=&Apache::lonnet::get('slots',[@slots],$cdom,$cnum);	my %slots=&Apache::lonnet::get('slots',[@slots],$cdom,$cnum);
if (&Apache::lonnet::error(%slots)) {	if (&Apache::lonnet::error(%slots)) {
return (UNKNOWN);	return (UNKNOWN);
}	}
my @sorted_slots = &Apache::loncommon::sorted_slots(\@slots,\%slots);	my @sorted_slots = &Apache::loncommon::sorted_slots(\@slots,\%slots,'starttime');
my ($checkedin,$checkedinslot);	my ($checkedin,$checkedinslot);
foreach my $slot_name (@sorted_slots) {	foreach my $slot_name (@sorted_slots) {
next if (!defined($slots{$slot_name}) \|\|	next if (!defined($slots{$slot_name}) \|\| !ref($slots{$slot_name}));
!ref($slots{$slot_name}));
my $end = $slots{$slot_name}->{'endtime'};	my $end = $slots{$slot_name}->{'endtime'};
my $start = $slots{$slot_name}->{'starttime'};	my $start = $slots{$slot_name}->{'starttime'};
my $ip = $slots{$slot_name}->{'ip'};	my $ip = $slots{$slot_name}->{'ip'};
if ($self->simpleStatus() == OPEN) {	if ($self->simpleStatus() == OPEN) {
my $startreserve = $slots{$slot_name}->{'startreserve'};
my @proctors;
if ($slots{$slot_name}->{'proctor'} ne '') {
@proctors = split(',',$slots{$slot_name}->{'proctor'});
}
if ($end > $now) {	if ($end > $now) {
($checkedin,$checkedinslot) = $self->checkedin();	if ($start > $now) {
if ($startreserve < $now) {	return (RESERVED_LATER,$start,$slot_name);
if ($start > $now) {	} else {
return (RESERVED_LATER,$start,$slot_name);	if ($ip ne '') {
} else {	if (!&Apache::loncommon::check_ip_acc($ip)) {
if ($ip ne '') {	return (RESERVED_LOCATION,$ip,$slot_name);
if (!&Apache::loncommon::check_ip_acc($ip)) {
return (RESERVED_LOCATION,$ip,$slot_name);
}
}
if (@proctors > 0) {
unless ((grep(/^\Q$checkedin\E/,@proctors)) &&
($checkedinslot eq $slot_name)) {
return (NEEDS_CHECKIN,undef,$slot_name);
}
}	}
return (RESERVED,$end,$slot_name);
}	}
} else {	my @proctors;
if ($start > $now) {	if ($slots{$slot_name}->{'proctor'} ne '') {
return (RESERVABLE,$startreserve,$slot_name);	@proctors = split(',',$slots{$slot_name}->{'proctor'});
}	}
	if (@proctors > 0) {
	($checkedin,$checkedinslot) = $self->checkedin();
	unless ((grep(/^\Q$checkedin\E/,@proctors)) &&
	($checkedinslot eq $slot_name)) {
	return (NEEDS_CHECKIN,undef,$slot_name);
	}
	}
	return (RESERVED,$end,$slot_name);
}	}
}	}
	} elsif ($end > $now) {
	$num_usable_slots ++;
}	}
}	}
my ($is_correct,$got_grade);	my ($is_correct,$got_grade);
Line 5021 sub check_for_slot {	Line 5410 sub check_for_slot {
return (CORRECT);	return (CORRECT);
}	}
}	}
return(NOT_IN_A_SLOT);	if ($num_usable_slots) {
} else {
if (!$future_slots_checked) {
$future_slots = &get_future_slots($cdom,$cnum,$now);
$future_slots_checked = 1;
}
if ($future_slots) {
return(NOT_IN_A_SLOT);	return(NOT_IN_A_SLOT);
}	}
return(NOTRESERVABLE);
}	}
}	my $reservable = &Apache::lonnet::get_reservable_slots($cnum,$cdom,$env{'user.name'},
return;	$env{'user.domain'});
}	if (ref($reservable) eq 'HASH') {
	if ((ref($reservable->{'now_order'}) eq 'ARRAY') && (ref($reservable->{'now'}) eq 'HASH')) {
sub get_future_slots {	foreach my $slot (reverse (@{$reservable->{'now_order'}})) {
my ($cdom,$cnum,$now) = @_;	if (($reservable->{'now'}{$slot}{'symb'} eq '') \|\|
my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum);	($reservable->{'now'}{$slot}{'symb'} eq $symb)) {
my $future_slots = 0;	return(RESERVABLE,$reservable->{'now'}{$slot}{'endreserve'});
foreach my $slot (keys(%slots)) {	}
if (($slots{$slot}->{'starttime'} > $now) &&	}
($slots{$slot}->{'endtime'} > $now)) {	}
$future_slots ++;	if ((ref($reservable->{'future_order'}) eq 'ARRAY') && (ref($reservable->{'future'}) eq 'HASH')) {
	foreach my $slot (@{$reservable->{'future_order'}}) {
	if (($reservable->{'future'}{$slot}{'symb'} eq '') \|\|
	($reservable->{'future'}{$slot}{'symb'} eq $symb)) {
	return(RESERVABLE_LATER,$reservable->{'future'}{$slot}{'startreserve'});
	}
	}
	}
}	}
	return(NOTRESERVABLE);
}	}
return $future_slots;	return;
}	}

sub CLOSED { return 23; }	sub CLOSED { return 23; }
Line 5172 sub completable {	Line 5562 sub completable {
# "If any of the parts are open, or have tries left (implies open),	# "If any of the parts are open, or have tries left (implies open),
# and it is not "attempted" (manually graded problem), it is	# and it is not "attempted" (manually graded problem), it is
# not "complete"	# not "complete"
if ($self->getCompletionStatus($part) == ATTEMPTED() \|\|	if ($self->getCompletionStatus($part) == ATTEMPTED() \|\|
$self->getCompletionStatus($part) == CREDIT_ATTEMPTED() \|\|	$self->getCompletionStatus($part) == CREDIT_ATTEMPTED() \|\|
$status == ANSWER_SUBMITTED() ) {	$status == ANSWER_SUBMITTED() ) {
# did this part already, as well as we can	# did this part already, as well as we can
next;	next;
}	}

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

Removed from v.1.444.2.4.2.1
changed lines
	Added in v.1.485