--- loncom/interface/lonnavmaps.pm 2002/12/02 14:22:50 1.121 +++ loncom/interface/lonnavmaps.pm 2003/02/04 16:14:27 1.134 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.121 2002/12/02 14:22:50 bowersj2 Exp $ +# $Id: lonnavmaps.pm,v 1.134 2003/02/04 16:14:27 bowersj2 Exp $ # # Copyright Michigan State University Board of Trustees # @@ -46,6 +46,32 @@ use Apache::Constants qw(:common :http); use Apache::loncommon(); use POSIX qw (floor strftime); +my %navmaphash; +my %parmhash; + +# symbolic constants +sub SYMB { return 1; } +sub URL { return 2; } +sub NOTHING { return 3; } + +# Some data + + +sub cleanup { + if (tied(%navmaphash)){ + &Apache::lonnet::logthis('Cleanup navmaps: navmaphash'); + unless (untie(%navmaphash)) { + &Apache::lonnet::logthis('Failed cleanup navmaps: navmaphash'); + } + } + if (tied(%parmhash)){ + &Apache::lonnet::logthis('Cleanup navmaps: parmhash'); + unless (untie(%parmhash)) { + &Apache::lonnet::logthis('Failed cleanup navmaps: parmhash'); + } + } +} + sub handler { my $r = shift; real_handler($r); @@ -96,6 +122,11 @@ sub real_handler { '')); $r->print(''); + $r->rflush(); + + # Now that we've displayed some stuff to the user, init the navmap + $navmap->init(); + $r->print(''); my $date=localtime; $r->print(''); @@ -122,10 +153,9 @@ sub real_handler { } # Determine where the "here" marker is and where the screen jumps to. - my $SYMB = 1; my $URL = 2; my $NOTHING = 3; # symbolic constants - my $hereType; # the type of marker, $SYMB, $URL, or $NOTHING + my $hereType; # the type of marker, SYMB, URL, or NOTHING my $here; # the actual URL or SYMB for the here marker - my $jumpType; # The type of the thing we have a jump for, $SYMB or $URL + my $jumpType; # The type of the thing we have a jump for, SYMB or URL my $jump; # the SYMB/URL of the resource we need to jump to if ( $ENV{'form.alreadyHere'} ) { # we came from a user's manipulation of the nav page @@ -133,7 +163,7 @@ sub real_handler { # from the querystring, and get the new "jump" marker $hereType = $ENV{'form.hereType'}; $here = $ENV{'form.here'}; - $jumpType = $ENV{'form.jumpType'} || $NOTHING; + $jumpType = $ENV{'form.jumpType'} || NOTHING(); $jump = $ENV{'form.jump'}; } else { # the user is visiting the nav map from the remote # We're coming from the remote. We have either a url, a symb, or nothing, @@ -141,7 +171,7 @@ sub real_handler { # Preference: Symb if ($ENV{'form.symb'}) { - $hereType = $jumpType = $SYMB; + $hereType = $jumpType = SYMB(); $here = $jump = $ENV{'form.symb'}; } elsif ($ENV{'form.postdata'}) { # couldn't find a symb, is there a URL? @@ -149,11 +179,11 @@ sub real_handler { $currenturl=~s/^http\:\/\///; $currenturl=~s/^[^\/]+//; - $hereType = $jumpType = $URL; + $hereType = $jumpType = URL; $here = $jump = $currenturl; } else { # Nothing - $hereType = $jumpType = $NOTHING; + $hereType = $jumpType = NOTHING(); } } @@ -178,9 +208,6 @@ sub real_handler { $r->print('
 '); $r->rflush(); - # Now that we've displayed some stuff to the user, init the navmap - $navmap->init(); - # Check that it's defined if (!($navmap->courseMapDefined())) { $r->print('Coursemap undefined.' . @@ -271,7 +298,7 @@ sub real_handler { $mapIterator->next(); # discard the first BEGIN_MAP my $curRes = $mapIterator->next(); my $counter = 0; - my $foundJump = ($jumpType == $NOTHING); # look for jump point if we have one + my $foundJump = ($jumpType == NOTHING()); # look for jump point if we have one my $looped = 0; # We only need to do this if we need to open the maps to show the @@ -282,8 +309,8 @@ sub real_handler { if ($curRes == $mapIterator->END_MAP()) { $depth--; } if (ref($curRes) && !$ENV{'form.alreadyHere'} && - ($hereType == $SYMB && $curRes->symb() eq $here) || - (ref($curRes) && $hereType == $URL && $curRes->src() eq $here)) { + ($hereType == SYMB() && $curRes->symb() eq $here) || + (ref($curRes) && $hereType == URL() && $curRes->src() eq $here)) { my $mapStack = $mapIterator->getStack(); # Ensure the parent maps are open @@ -312,8 +339,8 @@ sub real_handler { if (ref($curRes)) { $counter++; } if (ref($curRes) && - (($jumpType == $SYMB && $curRes->symb() eq $jump) || - ($jumpType == $URL && $curRes->src() eq $jump))) { + (($jumpType == SYMB() && $curRes->symb() eq $jump) || + ($jumpType == URL() && $curRes->src() eq $jump))) { # If this is the correct resource, be sure to # show it by making sure the containing maps # are open. @@ -330,7 +357,7 @@ sub real_handler { undef $res; # so we don't accidentally use it later my $indentLevel = 0; - my $indentString = "\"\""; + my $indentString = ""; my $isNewBranch = 0; my $now = time(); @@ -368,13 +395,6 @@ sub real_handler { if (ref($curRes)) { $counter++; } - # Is this resource being ignored because it is in a random-out - # map and it was not selected? - if (ref($curRes) && !advancedUser() && $curRes->randomout()) { - $curRes = $mapIterator->next(); - next; # if yes, then just ignore this resource - } - if (ref($curRes)) { my $deltalevel = $isNewBranch? 1 : 0; # reserves space for branch icon @@ -407,6 +427,9 @@ sub real_handler { # Otherwise, only display part 0 if we want to # attach feedback or email information to it if ($curRes->hasDiscussion() || $curRes->getFeedback()) { + # Is this right? I think this will toss it + # if it DOES have discussion, not if it doesn't? + # - Jeremy (yes, commenting on his own code) shift @parts; } else { # Now, we decide whether to condense the @@ -429,7 +452,7 @@ sub real_handler { } } - # $allSame is true if all the statuses were + # $*allSame is true if all the statuses were # the same. Now, if they are all the same and # match one of the statuses to condense, or they # are all open with the same due date, or they are @@ -486,6 +509,10 @@ sub real_handler { '"'; my $title = $curRes->compTitle(); + if ($src=~/^\/uploaded\//) { + $nonLinkedText=$title; + $title=''; + } my $partLabel = ""; my $newBranchText = ""; @@ -522,7 +549,7 @@ sub real_handler { removeFromFilter(\%filterHash, $mapId); $linkopen .= "&condition=$condition&$queryAdd" . "&hereType=$hereType&here=" . - Apache::lonnet::escape($here) . "&jumpType=$SYMB&" . + Apache::lonnet::escape($here) . "&jumpType=".SYMB()."&" . "jump=" . Apache::lonnet::escape($curRes->symb()) ."\">"; $linkclose = ""; @@ -571,8 +598,8 @@ sub real_handler { # Is this the current resource? if (!$displayedHereMarker && - (($hereType == $SYMB && $curRes->symb eq $here) || - ($hereType == $URL && $curRes->src eq $here))) { + (($hereType == SYMB() && $curRes->symb eq $here) || + ($hereType == URL() && $curRes->src eq $here))) { $curMarkerBegin = '> '; $curMarkerEnd = ' <'; $displayedHereMarker = 1; @@ -596,7 +623,7 @@ sub real_handler { $r->print("\n"); # SECOND COL: Is there text, feedback, errors?? - my $discussionHTML = ""; my $feedbackHTML = ""; + my $discussionHTML = ""; my $feedbackHTML = ""; my $errorHTML = ""; if ($curRes->hasDiscussion()) { $discussionHTML = $linkopen . @@ -616,7 +643,19 @@ sub real_handler { } } - $r->print(""); + if ($curRes->getErrors()) { + my $errors = $curRes->getErrors(); + foreach (split(/,/, $errors)) { + if ($_) { + $errorHTML .= ' ' + . ''; + } + } + } + + $r->print(""); # Is this the first displayed part of a multi-part problem # that has not been condensed, so we should suppress these two @@ -668,10 +707,18 @@ sub real_handler { $r->print(''); } - $r->print(""); + # renderer call + $mapIterator = $navmap->getIterator(undef, undef, \%filterHash, 0); + my $render = render({ 'cols' => [0,1,2,3], 'iterator' => $mapIterator, + 'url' => '/adm/navmaps', + 'queryString' => 'alreadyHere=1' }); + $r->print('|' . $render . '|'); $navmap->untieHashes(); + $r->print(""); + $r->rflush(); + return OK; } @@ -918,13 +965,510 @@ sub timeToHumanString { } } + +=pod + +=head1 navmap renderer + +The navmaprenderer package provides a sophisticated rendering of the standard navigation maps interface into HTML. The provided nav map handler is actually just a glorified call to this. + +Because of the large number of parameters this function presents, instead of passing it arguments as is normal, pass it in an anonymous hash with the given options. This is because there is no obvious order you may wish to override these in and a hash is easier to read and understand then "undef, undef, undef, 1, undef, undef, renderButton, undef, 0" when you mostly want default behaviors. + +The package provides a function called 'render', called as Apache::lonnavmaps::renderer->render({}). + +=head2 Overview of Columns + +The renderer will build an HTML table for the navmap and return it. The table is consists of several columns, and a row for each resource (or possibly each part). You tell the renderer how many columns to create and what to place in each column, optionally using one or more of the preparent columns, and the renderer will assemble the table. + +Any additional generally useful column types should be placed in the renderer code here, so anybody can use it anywhere else. Any code specific to the current application (such as the addition of elements in a column) should be placed in the code of the thing using the renderer. + +At the core of the renderer is the array reference COLS (see Example section below for how to pass this correctly). The COLS array will consist of entries of one of two types of things: Either an integer representing one of the pre-packaged column types, or a sub reference that takes a resource reference, a part number, and a reference to the argument hash passed to the renderer, and returns a string that will be inserted into the HTML representation as it. + +The pre-packaged column names are refered to by constants in the Apache::lonnavmaps::renderer namespace. The following currently exist: + +=over 4 + +=item * B: The general info about the resource: Link, icon for the type, etc. The first column in the standard nav map display. This column also accepts the following parameter in the renderer hash: + +=over 4 + +=item * B: If true, the resource will not be linked. Default: false, resource will have links. + +=item * B: If true (default), the resource will show a part count if the full part list is not displayed. If false, the resource will never show a part count. + +=back + +=item B: Whether there is discussion on the resource, email for the user, or (lumped in here) perl errors in the execution of the problem. This is the second column in the main nav map. + +=item B: An icon for the status of a problem, with four possible states: Correct, incorrect, open, or none (not open yet, not a problem). The third column of the standard navmap. + +=item B: A text readout of the details of the current status of the problem, such as "Due in 22 hours". The fourth column of the standard navmap. + +=back + +If you add any others please be sure to document them here. + +An example of a column renderer that will show the ID number of a resource, along with the part name if any: + + sub { + my ($resource, $part, $params) = @_; + if ($part) { return ''; } + return ''; + } + +Note these functions are responsible for the TD tags, which allow them to override vertical and horizontal alignment, etc. + +=head2 Parameters + +=over 4 + +=item * B: A reference to a fresh ::iterator to use from the navmaps. The rendering will reflect the options passed to the iterator, so you can use that to just render a certain part of the course, if you like. + +=item * B: An array reference + +=item * B: A flag. If yes (default), a line for the resource itself, and a line for each part will be displayed. If not, only one line for each resource will be displayed. + +=item * B: A flag. If yes (default), if all parts of the problem have the same status and that status is Nothing Set, Correct, or Network Failure, then only one line will be displayed for that resource anyhow. If no, all parts will always be displayed. If showParts is 0, this is ignored. + +=item * B: A string identifying the URL to place the anchor 'curloc' at. Default to no anchor at all. It is the responsibility of the renderer user to ensure that the #curloc is in the URL. + +=item * B: A URL identifying where to place the 'here' marker. + +=item * B: A Symb identifying where to place the 'here' marker. + +=item * B: A string identifying the indentation string to use. By default, this is a 25 pixel whitespace image with no alt text. + +=item * B: A string which will be prepended to the query string used when the folders are opened or closed. + +=item * B: The url the folders will link to, which should be the current page. Required if the resource info column is shown. + +=back + +=head2 Additional Info + +In addition to the parameters you can pass to the renderer, which will be passed through unchange to the column renderers, the renderer will generate the following information which your renderer may find useful: + +=over 4 + +=back + +=cut + +sub resource { return 0; } +sub communication_status { return 1; } +sub quick_status { return 2; } +sub long_status { return 3; } + +# Data for render_resource + +my $resObj = 'Apache::lonnavmaps::resource'; +# Defines a status->color mapping, null string means don't color +my %colormap = + ( $resObj->NETWORK_FAILURE => '', + $resObj->CORRECT => '', + $resObj->EXCUSED => '#3333FF', + $resObj->PAST_DUE_ANSWER_LATER => '', + $resObj->PAST_DUE_NO_ANSWER => '', + $resObj->ANSWER_OPEN => '#006600', + $resObj->OPEN_LATER => '', + $resObj->TRIES_LEFT => '', + $resObj->INCORRECT => '', + $resObj->OPEN => '', + $resObj->NOTHING_SET => '' ); +# And a special case in the nav map; what to do when the assignment +# is not yet done and due in less then 24 hours +my $hurryUpColor = "#FF0000"; + +sub render_resource { + my ($resource, $part, $params) = @_; + + my $nonLinkedText = ''; # stuff after resource title not in link + + my $link = $params->{"resourceLink"}; + my $src = $resource->src(); + my $it = $params->{"iterator"}; + my $filter = $it->{FILTER}; + + my $title = $resource->compTitle(); + if ($src =~ /^\/uploaded\//) { + $nonLinkedText=$title; + $title = ''; + } + my $partLabel = ""; + my $newBranchText = ""; + + # If this is a new branch, label it so + if ($params->{'isNewBranch'}) { + $newBranchText = ""; + $params->{'isNewBranch'} = 0; + } + + # links to open and close the folder + my $linkopen = ""; + my $linkclose = ""; + + # Default icon: HTML page + my $icon = ""; + + if ($resource->is_problem()) { + if ($part eq "0" || $params->{'condensed'}) { + $icon = ''; + } else { + $icon = $params->{'indentString'}; + } + } + + # Display the correct map icon to open or shut map + if ($resource->is_map()) { + my $mapId = $resource->map_pc(); + my $nowOpen = !defined($filter->{$mapId}); + if ($it->{CONDITION}) { + $nowOpen = !$nowOpen; + } + $icon = 'navmap.folder.' . ($nowOpen ? 'closed' : 'open') . '.gif'; + $icon = ""; + + $linkopen = "{'queryString'} . '&filter='; + $linkopen .= ($nowOpen xor $it->{CONDITION}) ? + addToFilter($filter, $mapId) : + removeFromFilter($filter, $mapId); + $linkopen .= "&condition=" . $it->{CONDITION} . '&hereType=' + . $params->{'hereType'} . '&here=' . + &Apache::lonnet::escape($params->{'here'}) . + '&jumpType=' . SYMB() . '&jump=' . + &Apache::lonnet::escape($params->{$resource->symb()}) . "'>"; + } + + if ($resource->randomout()) { + $nonLinkedText .= ' (hidden) '; + } + + # We're done preparing and finally ready to start the rendering + my $result = ""; + + return $result; +} + +sub render_communication_status { + my ($resource, $part, $params) = @_; + my $discussionHTML = ""; my $feedbackHTML = ""; my $errorHTML = ""; + + my $link = $params->{"resourceLink"}; + my $linkopen = ""; + my $linkclose = ""; + + if ($resource->hasDiscussion()) { + $discussionHTML = $linkopen . + '' . + $linkclose; + } + + if ($resource->getFeedback()) { + my $feedback = $resource->getFeedback(); + foreach (split(/\,/, $feedback)) { + if ($_) { + $feedbackHTML .= ' ' + . ''; + } + } + } + + if ($resource->getErrors()) { + my $errors = $resource->getErrors(); + foreach (split(/,/, $errors)) { + if ($_) { + $errorHTML .= ' ' + . ''; + } + } + } + + return ""; + +} +sub render_quick_status { + my ($resource, $part, $params) = @_; + return ""; +} +sub render_long_status { + my ($resource, $part, $params) = @_; + return ""; +} + +my @preparedColumns = (\&render_resource, \&render_communication_status, + \&render_quick_status, \&render_long_status); + +sub setDefault { + my ($val, $default) = @_; + if (!defined($val)) { return $default; } + return $val; +} + +sub render { + my $args = shift; + + # Configure the renderer. + my $cols = $args->{'cols'}; + if (!defined($cols)) { + # no columns, no nav maps. + return ''; + } + my $it = $args->{'iterator'}; + if (!defined($it)) { + # no iterator, no nav map. + return ''; + } + + my $showParts = setDefault($args->{'showParts'}, 1); + my $condenseParts = setDefault($args->{'condenseParts'}, 1); + my $jumpToURL = $args->{'jumpToURL'}; + my $jumpToSymb = $args->{'jumpToSymb'}; + my $hereURL = $args->{'hereURL'}; + my $hereSymb = $args->{'hereSymb'}; + + #if (defined($jumpToURL)) { + # $args->{'jumpType'} = + + # End parameter setting + + # Data + my $result .= '
Key:  $discussionHTML$feedbackHTML $discussionHTML$feedbackHTML$errorHTML ' . $resource->{ID} . ' ' . $part . '' . $resource->{ID} . '"; + + # print indentation + for (my $i = 0; $i < $params->{'indentLevel'} - + $params->{'deltaLevel'}; $i++) { + $result .= $params->{'indentString'}; + } + + # Decide what to display + $result .= "$newBranchText$linkopen$icon$linkclose"; + + my $curMarkerBegin = ''; + my $curMarkerEnd = ''; + + # Is this the current resource? + if (!$params->{'displayedHereMarker'} && + (($params->{'hereType'} == SYMB() && + $resource->symb() eq $params->{'here'}) || + ($params->{'hereType'} == URL() && + $resource->src() eq $params->{'here'}))) { + $curMarkerBegin = '> '; + $curMarkerEnd = '<'; + } + + if ($resource->is_problem() && $part ne "0" && + !$params->{'condensed'}) { + $partLabel = " (Part $part)"; + $title = ""; + } + + if ($params->{'multipart'} && $params->{'condensed'}) { + $nonLinkedText .= ' (' . $resource->countParts() . ' parts)'; + } + + $result .= " $curMarkerBegin$title$partLabel$curMarkerEnd $nonLinkedText$discussionHTML$feedbackHTML$errorHTML quick_statuslong_status
' ."\n"; + my $res = "Apache::lonnavmaps::resource"; + my %condenseStatuses = + ( $res->NETWORK_FAILURE => 1, + $res->NOTHING_SET => 1, + $res->CORRECT => 1 ); + my @backgroundColors = ("#FFFFFF", "#F6F6F6"); + my $currentJumpIndex = 0; # keeps track of when the current resource is found, + # so we can back up a few and put the anchor above the + # current resource + my $currentJumpDelta = 2; # change this to change how many resources are displayed + # before the current resource when using #current + + # Shared variables + $args->{'counter'} = 0; # counts the rows + $args->{'indentLevel'} = 0; + $args->{'isNewBranch'} = 0; + $args->{'condensed'} = 0; + $args->{'indentString'} = setDefault($args->{'indentString'}, ""); + $args->{'displayedHereMarker'} = 0; + + my $displayedJumpMarker = 0; + # Set up iteration. + my $depth = 1; + $it->next(); # discard initial BEGIN_MAP + my $curRes = $it->next(); + my $now = time(); + my $in24Hours = $now + 24 * 60 * 60; + my $rownum = 0; + + while ($depth > 0) { + if ($curRes == $it->BEGIN_MAP()) { $depth++; } + if ($curRes == $it->END_MAP()) { $depth--; } + + # Maintain indentation level. + if ($curRes == $it->BEGIN_MAP() || + $curRes == $it->BEGIN_BRANCH() ) { + $args->{'indentLevel'}++; + } + if ($curRes == $it->END_MAP() || + $curRes == $it->END_BRANCH() ) { + $args->{'indentLevel'}--; + } + # Notice new branches + if ($curRes == $it->BEGIN_BRANCH()) { + $args->{'isNewBranch'} = 1; + } + + # If this isn't an actual resource, continue on + if (!ref($curRes)) { + $curRes = $it->next(); + next; + } + + $args->{'counter'}++; + # reserve space for branch symbol + $args->{'deltalevel'} = $args->{'isNewBranch'}? 1 : 0; + if ($args->{'indentLevel'} - $args->{'deltalevel'} < 0) { + # If this would be at a negative depth (top-level maps in + # new-style courses, we want to suppress their title display) + # then ignore it. + $curRes = $it->next(); + next; + } + + # Does it have multiple parts? + $args->{'multipart'} = 0; + $args->{'condensed'} = 0; + my @parts; + + # Decide what parts to show. + if ($curRes->is_problem() && $showParts) { + @parts = @{$curRes->parts()}; + $args->{'multipart'} = scalar(@parts) > 1; + + if ($condenseParts) { # do the condensation + if (!$curRes->opendate("0")) { + @parts = ("0"); + $args->{'condensed'} = 1; + } + if (!$args->{'condensed'}) { + # Decide whether to condense based on similarity + my $status = $curRes->status($parts[1]); + my $due = $curRes->duedate($parts[1]); + my $open = $curRes->opendate($parts[1]); + my $statusAllSame = 1; + my $dueAllSame = 1; + my $openAllSame = 1; + for (my $i = 2; $i < scalar(@parts); $i++) { + if ($curRes->status($parts[$i]) != $status){ + $statusAllSame = 0; + } + if ($curRes->duedate($parts[$i]) != $due ) { + $dueAllSame = 0; + } + if ($curRes->opendate($parts[$i]) != $open) { + $openAllSame = 0; + } + } + # $*allSame is true if all the statuses were + # the same. Now, if they are all the same and + # match one of the statuses to condense, or they + # are all open with the same due date, or they are + # all OPEN_LATER with the same open date, display the + # status of the first non-zero part (to get the 'correct' + # status right, since 0 is never 'correct' or 'open'). + if (($statusAllSame && defined($condenseStatuses{$status})) || + ($dueAllSame && $status == $curRes->OPEN && $statusAllSame)|| + ($openAllSame && $status == $curRes->OPEN_LATER && $statusAllSame) ){ + @parts = ($parts[1]); + $args->{'condensed'} = 1; + } + + } + } + + } else { + # Not showing parts + @parts = ("0"); # show main part only + } + + # If the multipart problem was condensed, "forget" it was multipart + if (scalar(@parts) == 1) { + $args->{'multipart'} = 0; + } + + # In the event of a network error, display one part. + # If this is a single part, we can at least show the correct + # status, but if it's multipart, we're lost, since we can't + # retreive the metadata to count the parts + if ($curRes->{RESOURCE_ERROR}) { + @parts = ("0"); + } + + # Now, we've decided what parts to show. Loop through them and + # show them. + foreach my $part (@parts) { + $rownum ++; + my $backgroundColor = $backgroundColors[$rownum % scalar(@backgroundColors)]; + + $result .= " \n"; + + # Set up some data about the parts that the cols might want + my $filter = $it->{FILTER}; + my $stack = $it->getStack(); + my $src = getLinkForResource($stack); + + my $srcHasQuestion = $src =~ /\?/; + $args->{"resourceLink"} = $src. + ($srcHasQuestion?'&':'?') . + 'symb=' . &Apache::lonnet::escape($curRes->symb()). + '"'; + + # Now, display each column. + foreach my $col (@$cols) { + + # If this is the first column and it's time to print + # the anchor, do so + if ($col == $cols->[0] && + $args->{'counter'} == $args->{'currentJumpIndex'} - + $args->{'currentJumpDelta'}) { + $result .= ''; + $displayedJumpMarker = 1; + } + + + if (ref($col)) { + $result .= &$col($curRes, $part, $args); + } else { + $result .= &{$preparedColumns[$col]}($curRes, $part, $args); + } + + } + + $result .= " \n"; + } + + + $curRes = $it->next(); + } + + # Print out the part that jumps to #curloc if it exists + if ($args->{"displayedJumpMarker"}) { + $result .= "\n"; + } + + $result .= "
"; + + return $result; +} + 1; package Apache::lonnavmaps::navmap; =pod -lonnavmaps provides functions and objects for dealing with the compiled course hashes generated when a user enters the course, and also provides the Apache handler for the "Navigation Map" button. +lonnavmaps provides functions and objects for dealing with the compiled course hashes generated when a user enters the course, the Apache handler for the "Navigation Map" button, and a flexible prepared renderer for navigation maps that are easy to use anywhere. =head1 navmap object: Encapsulating the compiled nav map @@ -967,13 +1511,12 @@ sub new { $self->{NETWORK_FAILURE} = 0; # tie the nav hash - my %navmaphash; + if (!(tie(%navmaphash, 'GDBM_File', $self->{NAV_HASH_FILE}, &GDBM_READER(), 0640))) { return undef; } - my %parmhash; if (!(tie(%parmhash, 'GDBM_File', $self->{PARM_HASH_FILE}, &GDBM_READER(), 0640))) { @@ -981,15 +1524,11 @@ sub new { return undef; } - # Now copy the hashes for speed (?) - my %realnav; my %realparm; - foreach (%navmaphash) { $realnav{$_} = $navmaphash{$_}; } - foreach (%parmhash) { $realparm{$_} = $navmaphash{$_}; } - $self->{NAV_HASH} = \%realnav; - $self->{PARM_HASH} = \%realparm; + $self->{HASH_TIED} = 1; + $self->{NAV_HASH} = \%navmaphash; + $self->{PARM_HASH} = \%parmhash; bless($self); - $self->untieHashes(); return $self; } @@ -1060,7 +1599,7 @@ sub init { my %emailstatus = &Apache::lonnet::dump('email_status'); my $logoutTime = $emailstatus{'logout'}; my $courseLeaveTime = $emailstatus{'logout_'.$ENV{'request.course.id'}}; - $self->{LAST_CHECK} = ($courseLeaveTime > $logoutTime ? + $self->{LAST_CHECK} = ($courseLeaveTime < $logoutTime ? $courseLeaveTime : $logoutTime); my %discussiontime = &Apache::lonnet::dump('discussiontimes', $cdom, $cnum); @@ -1141,18 +1680,19 @@ sub DESTROY { $self->untieHashes(); } -# Private function: 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. sub hasDiscussion { my $self = shift; my $symb = shift; if (!defined($self->{DISCUSSION_TIME})) { return 0; } + #return defined($self->{DISCUSSION_TIME}->{$symb}); return $self->{DISCUSSION_TIME}->{$symb} > $self->{LAST_CHECK}; } -# Private function: Does the given resource (as a symb string) have +# Private method: Does the given resource (as a symb string) have # current feedback? Returns the string in the feedback hash, which # will be false if it does not exist. sub getFeedback { @@ -1164,6 +1704,15 @@ sub getFeedback { return $self->{FEEDBACK}->{$symb}; } +# Private method: Get the errors for that resource (by source). +sub getErrors { + my $self = shift; + my $src = shift; + + if (!defined($self->{ERROR_MSG})) { return ""; } + return $self->{ERROR_MSG}->{$src}; +} + =pod =item * B(id): Based on the ID of the resource (1.1, 3.2, etc.), get a resource object for that resource. This method, or other methods that use it (as in the resource object) is the only proper way to obtain a resource object. @@ -1185,7 +1734,9 @@ sub getById { } # resource handles inserting itself into cache. - return Apache::lonnavmaps::resource->new($self, $id); + # Not clear why the quotes are necessary, but as of this + # writing it doesn't work without them. + return "Apache::lonnavmaps::resource"->new($self, $id); } =pod @@ -1312,7 +1863,6 @@ sub parmval_real { return ''; } - 1; package Apache::lonnavmaps::iterator; @@ -1655,7 +2205,7 @@ sub next { # If this is a blank resource, don't actually return it. # Should you ever find you need it, make sure to add an option to the code # that you can use; other things depend on this behavior. - if (!$self->{HERE}->src()) { + if (!$self->{HERE}->src() || !$self->{HERE}->browsePriv()) { return $self->next(); } @@ -2229,7 +2779,16 @@ sub hasDiscussion { sub getFeedback { my $self = shift; - return $self->{NAV_MAP}->getFeedback($self->src()); + my $source = $self->src(); + if ($source =~ /^\/res\//) { $source = substr $source, 5; } + return $self->{NAV_MAP}->getFeedback($source); +} + +sub getErrors { + my $self = shift; + my $source = $self->src(); + if ($source =~ /^\/res\//) { $source = substr $source, 5; } + return $self->{NAV_MAP}->getErrors($source); } =pod @@ -2585,16 +3144,7 @@ sub getNext { my $next = $choice->goesto(); $next = $self->{NAV_MAP}->getById($next); - # Don't remember it if the student doesn't have browse priviledges - # future note: this may properly belong in the client of the resource - my $browsePriv = $self->{BROWSE_PRIV}; - if (!defined($browsePriv)) { - $browsePriv = &Apache::lonnet::allowed('bre', $self->src); - $self->{BROWSE_PRIV} = $browsePriv; - } - if (!($browsePriv ne '2' && $browsePriv ne 'F')) { - push @branches, $next; - } + push @branches, $next; } return \@branches; } @@ -2608,20 +3158,20 @@ sub getPrevious { my $prev = $choice->comesfrom(); $prev = $self->{NAV_MAP}->getById($prev); - # Don't remember it if the student doesn't have browse priviledges - # future note: this may properly belong in the client of the resource - my $browsePriv = $self->{BROWSE_PRIV}; - if (!defined($browsePriv)) { - $browsePriv = &Apache::lonnet::allowed('bre', $self->src); - $self->{BROWSE_PRIV} = $browsePriv; - } - if (!($browsePriv ne '2' && $browsePriv ne 'F')) { - push @branches, $prev; - } + push @branches, $prev; } return \@branches; } +sub browsePriv { + my $self = shift; + if (defined($self->{BROWSE_PRIV})) { + return $self->{BROWSE_PRIV}; + } + + $self->{BROWSE_PRIV} = &Apache::lonnet::allowed('bre', $self->src()); +} + =pod =back