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.176 and 1.444

-version 1.176, 2003/04/18 13:51:46
+version 1.444, 2010/02/28 22:36:38
  Line 2
  # Navigate Maps Handler
  #
  # $Id$
  #
  # Copyright Michigan State University Board of Trustees
  #
- Line 25
+ Line 26
  #
  # http://www.lon-capa.org/
  #
- # (Page Handler
+ ###
- #
- # (TeX Content Handler
+ =pod
- #
- # 05/29/00,05/30 Gerd Kortemeyer)
+ =head1 NAME
- # 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23,
- # 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16 Gerd Kortemeyer)
+ Apache::lonnavmaps - Subroutines to handle and render the navigation
- #
- # 3/1/1,6/1,17/1,29/1,30/1,2/8,9/21,9/24,9/25 Gerd Kortemeyer
+ =head1 SYNOPSIS
- # YEAR=2002
- # 1/1 Gerd Kortemeyer
+ Handles navigational maps.
- # Oct-Nov Jeremy Bowers
- # YEAR=2003
+ The main handler generates the navigational listing for the course,
- # Jeremy Bowers ... lots of days
+ the other objects export this information in a usable fashion for
+ other modules.
+ This is part of the LearningOnline Network with CAPA project
+ described at http://www.lon-capa.org.
+ =head1 OVERVIEW
+ X<lonnavmaps, overview> When a user enters a course, LON-CAPA examines the
+ course structure and caches it in what is often referred to as the
+ "big hash" X<big hash>. You can see it if you are logged into
+ LON-CAPA, in a course, by going to /adm/test. (You may need to
+ tweak the /home/httpd/lonTabs/htpasswd file to view it.) The
+ content of the hash will be under the heading "Big Hash".
+ Big Hash contains, among other things, how resources are related
+ to each other (next/previous), what resources are maps, which
+ resources are being chosen to not show to the student (for random
+ selection), and a lot of other things that can take a lot of time
+ to compute due to the amount of data that needs to be collected and
+ processed.
+ Apache::lonnavmaps provides an object model for manipulating this
+ information in a higher-level fashion than directly manipulating
+ the hash. It also provides access to several auxilary functions
+ that aren't necessarily stored in the Big Hash, but are a per-
+ resource sort of value, like whether there is any feedback on
+ a given resource.
+ Apache::lonnavmaps also abstracts away branching, and someday,
+ conditions, for the times where you don't really care about those
+ things.
+ Apache::lonnavmaps also provides fairly powerful routines for
+ rendering navmaps, and last but not least, provides the navmaps
+ view for when the user clicks the NAV button.
+ B<Note>: Apache::lonnavmaps I<only> works for the "currently
+ logged in user"; if you want things like "due dates for another
+ student" lonnavmaps can not directly retrieve information like
+ that. You need the EXT function. This module can still help,
+ because many things, such as the course structure, are constant
+ between users, and Apache::lonnavmaps can help by providing
+ symbs for the EXT call.
+ The rest of this file will cover the provided rendering routines,
+ which can often be used without fiddling with the navmap object at
+ all, then documents the Apache::lonnavmaps::navmap object, which
+ is the key to accessing the Big Hash information, covers the use
+ of the Iterator (which provides the logic for traversing the
+ somewhat-complicated Big Hash data structure), documents the
+ Apache::lonnavmaps::Resource objects that are returned by
+ =head1 Subroutine: render
+ The navmap renderer 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 accepts,
+ instead of passing it arguments as is normal, pass it in an anonymous
+ hash with the desired options.
+ The package provides a function called 'render', called as
+ Apache::lonnavmaps::render({}).
+ =head2 Overview of Columns
+ The renderer will build an HTML table for the navmap and return
+ it. The table 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 prepared 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 <input>
+ 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.
+ All other parameters are ways of either changing how the columns
+ are printing, or which rows are shown.
+ The pre-packaged column names are refered to by constants in the
+ Apache::lonnavmaps namespace. The following currently exist:
+ =over 4
+ =item * B<Apache::lonnavmaps::resource>:
+ The general info about the resource: Link, icon for the type, etc. The
+ first column in the standard nav map display. This column provides the
+ indentation effect seen in the B<NAV> screen. This column also accepts
+ the following parameters in the renderer hash:
+ =over 4
+ =item * B<resource_nolink>: default false
+ If true, the resource will not be linked. By default, all non-folder
+ resources are linked.
+ =item * B<resource_part_count>: default true
+ If true, the resource will show a part count B<if> the full
+ part list is not displayed. (See "condense_parts" later.) If false,
+ the resource will never show a part count.
+ =item * B<resource_no_folder_link>:
+ If true, the resource's folder will not be clickable to open or close
+ it. Default is false. True implies printCloseAll is false, since you
+ can't close or open folders when this is on anyhow.
+ =back
+ =item * B<Apache::lonnavmaps::communication_status>:
+ 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<Apache::lonnavmaps::quick_status>:
+ An icon for the status of a problem, with five possible states:
+ Correct, incorrect, open, awaiting grading (for a problem where the
+ computer's grade is suppressed, or the computer can't grade, like
+ essay problem), or none (not open yet, not a problem). The
+ third column of the standard navmap.
+ =item * B<Apache::lonnavmaps::long_status>:
+ 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.
+ =item * B<Apache::lonnavmaps::part_status_summary>:
+ A text readout summarizing the status of the problem. If it is a
+ single part problem, will display "Correct", "Incorrect",
+ "Not yet open", "Open", "Attempted", or "Error". If there are
+ multiple parts, this will output a string that in HTML will show a
+ status of how many parts are in each status, in color coding, trying
+ to match the colors of the icons within reason.
+ Note this only makes sense if you are I<not> showing parts. If
+ C<showParts> is true (see below), this column will not output
+ anything.
+ =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 '<td>' . $resource->{ID} . ' ' . $part . '</td>'; }
+   return '<td>' . $resource->{ID} . '</td>';
+  }
+ Note these functions are responsible for the TD tags, which allow them
+ to override vertical and horizontal alignment, etc.
+ =head2 Parameters
+ Minimally, you should be
+ able to get away with just using 'cols' (to specify the columns
+ shown), 'url' (necessary for the folders to link to the current screen
+ correctly), and possibly 'queryString' if your app calls for it. In
+ that case, maintaining the state of the folders will be done
+ automatically.
+ =over 4
+ =item * B<iterator>: default: constructs one from %env
+ 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. If
+ one is not passed, the renderer will attempt to construct one from
+ env{'form.filter'} and env{'form.condition'} information, plus the
+ 'iterator_map' parameter if any.
+ =item * B<iterator_map>: default: not used
+ If you are letting the renderer do the iterator handling, you can
+ instruct the renderer to render only a particular map by passing it
+ the source of the map you want to process, like
+ '/res/103/jerf/navmap.course.sequence'.
+ =item * B<include_top_level_map>: default: false
+ If you need to include the top level map (meaning the course) in the
+ rendered output set this to true
+ =item * B<navmap>: default: constructs one from %env
+ A reference to a navmap, used only if an iterator is not passed in. If
+ this is necessary to make an iterator but it is not passed in, a new
+ one will be constructed based on env info. This is useful to do basic
+ error checking before passing it off to render.
+ =item * B<r>: default: must be passed in
+ The standard Apache response object. This must be passed to the
+ renderer or the course hash will be locked.
+ =item * B<cols>: default: empty (useless)
+ An array reference
+ =item * B<showParts>:default true
+ A flag. If true, 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<condenseParts>: default true
+ A flag. If true, 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<jumpCount>: default: determined from %env
+ A string identifying the URL to place the anchor 'curloc' at.
+ It is the responsibility of the renderer user to
+ ensure that the #curloc is in the URL. By default, determined through
+ the use of the env{} 'jump' information, and should normally "just
+ work" correctly.
+ =item * B<here>: default: empty string
+ A Symb identifying where to place the 'here' marker. The empty
+ string means no marker.
+ =item * B<indentString>: default: 25 pixel whitespace image
+ A string identifying the indentation string to use.
+ =item * B<queryString>: default: empty
+ A string which will be prepended to the query string used when the
+ folders are opened or closed. You can use this to pass
+ application-specific values.
+ =item * B<url>: default: none
+ The url the folders will link to, which should be the current
+ page. Required if the resource info column is shown, and you
+ are allowing the user to open and close folders.
+ =item * B<currentJumpIndex>: default: no jumping
+ Describes the currently-open row number to cause the browser to jump
+ to, because the user just opened that folder. By default, pulled from
+ the Jump information in the env{'form.*'}.
+ =item * B<printKey>: default: false
+ If true, print the key that appears on the top of the standard
+ navmaps.
+ =item * B<printCloseAll>: default: true
+ If true, print the "Close all folders" or "open all folders"
+ links.
+ =item * B<filterFunc>: default: sub {return 1;} (accept everything)
+ A function that takes the resource object as its only parameter and
+ returns a true or false value. If true, the resource is displayed. If
+ false, it is simply skipped in the display.
+ =item * B<suppressEmptySequences>: default: false
+ If you're using a filter function, and displaying sequences to orient
+ the user, then frequently some sequences will be empty. Setting this to
+ true will cause those sequences not to display, so as not to confuse the
+ user into thinking that if the sequence is there there should be things
+ under it; for example, see the "Show Uncompleted Homework" view on the
+ B<NAV> screen.
+ =item * B<suppressNavmaps>: default: false
+ If true, will not display Navigate Content resources.
+ =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
+ =item * B<counter>:
+ Contains the number of rows printed. Useful after calling the render
+ function, as you can detect whether anything was printed at all.
+ =item * B<isNewBranch>:
+ Useful for renderers: If this resource is currently the first resource
+ of a new branch, this will be true. The Resource column (leftmost in the
+ navmaps screen) uses this to display the "new branch" icon
+ =back
+ =cut
+ =head1 SUBROUTINES
+ =over
+ =item update()
+ =item addToFilter()
+ Convenience functions: Returns a string that adds or subtracts
+ the second argument from the first hash, appropriate for the
+ query string that determines which folders to recurse on
+ =item removeFromFilter()
+ =item getLinkForResource()
+ Convenience function: Given a stack returned from getStack on the iterator,
+ return the correct src() value.
+ =item getDescription()
+ Convenience function: This separates the logic of how to create
+ the problem text strings ("Due: DATE", "Open: DATE", "Not yet assigned",
+ etc.) into a separate function. It takes a resource object as the
+ 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.
+ =item dueInLessThan24Hours()
+ Convenience function, so others can use it: Is the problem due in less than 24 hours, and still can be done?
+ =item lastTry()
+ Convenience function, so others can use it: Is there only one try remaining for the
+ part, with more than one try to begin with, not due yet and still can be done?
+ =item advancedUser()
+ This puts a human-readable name on the env variable.
+ =item timeToHumanString()
+ timeToHumanString takes a time number and converts it to a
+ human-readable representation, meant to be used in the following
+ manner:
+ =over 4
+ =item * print "Due $timestring"
+ =item * print "Open $timestring"
+ =item * print "Answer available $timestring"
+ =back
+ Very, very, very, VERY English-only... goodness help a localizer on
+ this func...
+ =item resource()
+ returns 0
+ =item communication_status()
+ returns 1
+ =item quick_status()
+ returns 2
+ =item long_status()
+ returns 3
+ =item part_status_summary()
+ returns 4
+ =item render_resource()
+ =item render_communication_status()
+ =item render_quick_status()
+ =item render_long_status()
+ =item render_parts_summary_status()
+ =item setDefault()
+ =item cmp_title()
+ =item render()
+ =item add_linkitem()
+ =item show_linkitems()
+ =back
+ =cut
  package Apache::lonnavmaps;
  use strict;
- use Apache::Constants qw(:common :http);
+ use GDBM_File;
  use Apache::loncommon();
- use Apache::lonmenu();
+ use Apache::lonenc();
+ use Apache::lonlocal;
+ use Apache::lonnet;
  use POSIX qw (floor strftime);
+ use Time::HiRes qw( gettimeofday tv_interval );
+ use LONCAPA;
+ use DateTime();
  # symbolic constants
  sub SYMB { return 1; }
- Line 57  sub NOTHING { return 3; }
+ Line 493  sub NOTHING { return 3; }
  my $resObj = "Apache::lonnavmaps::resource";
- # Keep these mappings in sync with lonquickgrades, which uses the colors
+ # Keep these mappings in sync with lonquickgrades, which usesthe colors
  # instead of the icons.
  my %statusIconMap =
-     ( $resObj->NETWORK_FAILURE    => '',
+     (
-       $resObj->NOTHING_SET        => '',
+      $resObj->CLOSED       => '',
-       $resObj->CORRECT            => 'navmap.correct.gif',
+      $resObj->OPEN         => 'navmap.open.gif',
-       $resObj->EXCUSED            => 'navmap.correct.gif',
+      $resObj->CORRECT      => 'navmap.correct.gif',
-       $resObj->PAST_DUE_NO_ANSWER => 'navmap.wrong.gif',
+      $resObj->PARTIALLY_CORRECT      => 'navmap.partial.gif',
-       $resObj->PAST_DUE_ANSWER_LATER => 'navmap.wrong.gif',
+      $resObj->INCORRECT    => 'navmap.wrong.gif',
-       $resObj->ANSWER_OPEN        => 'navmap.wrong.gif',
+      $resObj->ATTEMPTED    => 'navmap.ellipsis.gif',
-       $resObj->OPEN_LATER         => '',
+      $resObj->ERROR        => ''
-       $resObj->TRIES_LEFT         => 'navmap.open.gif',
+      );
-       $resObj->INCORRECT          => 'navmap.wrong.gif',
-       $resObj->OPEN               => 'navmap.open.gif',
+ my %iconAltTags =   #texthash does not work here
-       $resObj->ATTEMPTED          => 'navmap.open.gif' );
+     ( 'navmap.correct.gif'  => 'Correct',
+       'navmap.wrong.gif'    => 'Incorrect',
- my %iconAltTags =
+       'navmap.open.gif'     => 'Open',
-     ( 'navmap.correct.gif' => 'Correct',
+       'navmap.partial.gif'  => 'Partially Correct',
-       'navmap.wrong.gif'   => 'Incorrect',
+       'navmap.ellipsis.gif' => 'Attempted',
-       'navmap.open.gif'    => 'Open' );
+      );
  # Defines a status->color mapping, null string means don't color
  my %colormap =
- Line 90  my %colormap =
+ Line 526  my %colormap =
        $resObj->TRIES_LEFT             => '',
        $resObj->INCORRECT              => '',
        $resObj->OPEN                   => '',
-       $resObj->NOTHING_SET            => '' );
+       $resObj->NOTHING_SET            => '',
+       $resObj->ATTEMPTED              => '',
+       $resObj->ANSWER_SUBMITTED       => '',
+       $resObj->PARTIALLY_CORRECT      => '#006600'
+       );
  # 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
+ # is not yet done and due in less than 24 hours
  my $hurryUpColor = "#FF0000";
- sub handler {
+ my $future_slots_checked = 0;
-     my $r = shift;
+ my $future_slots = 0;
-     real_handler($r);
- }
- sub real_handler {
-     my $r = shift;
-     # Handle header-only request
-     if ($r->header_only) {
-         if ($ENV{'browser.mathml'}) {
-             $r->content_type('text/xml');
-         } else {
-             $r->content_type('text/html');
-         }
-         $r->send_http_header;
-         return OK;
-     }
-     # Send header, don't cache this page
-     if ($ENV{'browser.mathml'}) {
-         $r->content_type('text/xml');
-     } else {
-         $r->content_type('text/html');
-     }
-     &Apache::loncommon::no_cache($r);
-     $r->send_http_header;
-     # Create the nav map
-     my $navmap = Apache::lonnavmaps::navmap->new(
-                         $ENV{"request.course.fn"}.".db",
-                         $ENV{"request.course.fn"}."_parms.db", 1, 1);
-     if (!defined($navmap)) {
-         my $requrl = $r->uri;
-         $ENV{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";
-         return HTTP_NOT_ACCEPTABLE;
-     }
-     $r->print("<html><head>\n");
+ sub close {
-     $r->print("<title>Navigate Course Contents</title>");
+     if ($env{'environment.remotenavmap'} ne 'on') { return ''; }
- # ------------------------------------------------------------ Get query string
+     return(<<ENDCLOSE);
-     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register']);
+ <script type="text/javascript">
+ window.status='Accessing Nav Control';
- # ----------------------------------------------------- Force menu registration
+ menu=window.open("/adm/rat/empty.html","loncapanav",
-     my $addentries='';
+                  "height=600,width=400,scrollbars=1");
-     if ($ENV{'form.register'}) {
+ window.status='Closing Nav Control';
-        $addentries=' onLoad="'.&Apache::lonmenu::loadevents().
+ menu.close();
- 	   '" onUnload="'.&Apache::lonmenu::unloadevents().'"';
+ window.status='Done.';
-        $r->print(&Apache::lonmenu::registerurl(1));
+ </script>
-     }
+ ENDCLOSE
+ }
-     # Header
-     $r->print('</head>'.
+ sub update {
-               &Apache::loncommon::bodytag('Navigate Course Contents','',
+     if ($env{'environment.remotenavmap'} ne 'on') { return ''; }
-                                     $addentries,'','',$ENV{'form.register'}));
+     if (!$env{'request.course.id'}) { return ''; }
-     $r->print('<script>window.focus();</script>');
+     if ($ENV{'REQUEST_URI'}=~m|^/adm/navmaps|) { return ''; }
+     return(<<ENDUPDATE);
-     $r->rflush();
+ <form name="navform"></form>
+ <script type="text/javascript">
-     # Now that we've displayed some stuff to the user, init the navmap
+ this.document.navform.action='/adm/navmaps#curloc';
-     $navmap->init();
+ this.document.navform.target='loncapanav';
+ this.document.navform.submit();
-     $r->print('<br>&nbsp;');
+ </script>
-     $r->rflush();
+ ENDUPDATE
-     # Check that it's defined
-     if (!($navmap->courseMapDefined())) {
-         $r->print('<font size="+2" color="red">Coursemap undefined.</font>' .
-                   '</body></html>');
-         return OK;
-     }
-     # See if there's only one map in the top-level... if so,
-     # automatically display it
-     my $iterator = $navmap->getIterator(undef, undef, undef, 0);
-     my $depth = 1;
-     $iterator->next();
-     my $curRes = $iterator->next();
-     my $sequenceCount = 0;
-     my $sequenceId;
-     while ($depth > 0) {
-         if ($curRes == $iterator->BEGIN_MAP()) { $depth++; }
-         if ($curRes == $iterator->END_MAP()) { $depth--; }
-         if (ref($curRes) && $curRes->is_sequence()) {
-             $sequenceCount++;
-             $sequenceId = $curRes->map_pc();
-         }
-         $curRes = $iterator->next();
-     }
-     if ($sequenceCount == 1) {
-         # The automatic iterator creation in the render call
-         # will pick this up.
-         $ENV{'form.filter'} = "$sequenceId";
-     }
-     # renderer call
-     my $render = render({ 'cols' => [0,1,2,3],
-                           'url' => '/adm/navmaps',
-                           'navmap' => $navmap,
-                           'suppressNavmap' => 1,
-                           'r' => $r});
-     $navmap->untieHashes();
-     $r->print("</body></html>");
-     $r->rflush();
-     return OK;
  }
- # Convenience functions: Returns a string that adds or subtracts
- # the second argument from the first hash, appropriate for the
- # query string that determines which folders to recurse on
  sub addToFilter {
      my $hashIn = shift;
      my $addition = shift;
- Line 231  sub removeFromFilter {
+ Line 585  sub removeFromFilter {
      return join(",", keys(%hash));
  }
- # Convenience function: Given a stack returned from getStack on the iterator,
- # return the correct src() value.
- # Later, this should add an anchor when we start putting anchors in pages.
  sub getLinkForResource {
      my $stack = shift;
      my $res;
      # Check to see if there are any pages in the stack
      foreach $res (@$stack) {
-         if (defined($res) && $res->is_page()) {
+         if (defined($res)) {
-             return $res->src();
+ 	    my $anchor;
+ 	    if ($res->is_page()) {
+ 		foreach my $item (@$stack) { if (defined($item)) { $anchor = $item; }  }
+ 		$anchor=&escape($anchor->shown_symb());
+ 		return ($res->link(),$res->shown_symb(),$anchor);
+ 	    }
+             # in case folder was skipped over as "only sequence"
+ 	    my ($map,$id,$src)=&Apache::lonnet::decode_symb($res->symb());
+ 	    if ($map=~/\.page$/) {
+ 		my $url=&Apache::lonnet::clutter($map);
+ 		$anchor=&escape($res->shown_symb());
+ 		return ($url,$res->shown_symb(),$anchor);
+ 	    }
          }
      }
- Line 249  sub getLinkForResource {
+ Line 612  sub getLinkForResource {
      # (when we first recurse on a map, it puts an undefined resource
      # on the bottom because $self->{HERE} isn't defined yet, and we
      # want the src for the map anyhow)
-     foreach (@$stack) {
+     foreach my $item (@$stack) {
-         if (defined($_)) { $res = $_; }
+         if (defined($item)) { $res = $item; }
      }
-     return $res->src();
+     if ($res) {
+ 	return ($res->link(),$res->shown_symb());
+     }
+     return;
  }
- # Convenience function: This seperates the logic of how to create
- # the problem text strings ("Due: DATE", "Open: DATE", "Not yet assigned",
- # etc.) into a seperate function. It takes a resource object as the
- # 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.
  sub getDescription {
      my $res = shift;
      my $part = shift;
      my $status = $res->status($part);
-     if ($status == $res->NETWORK_FAILURE) { return ""; }
+     my $open = $res->opendate($part);
+     my $due = $res->duedate($part);
+     my $answer = $res->answerdate($part);
+     if ($status == $res->NETWORK_FAILURE) {
+         return &mt("Having technical difficulties; please check status later");
+     }
      if ($status == $res->NOTHING_SET) {
-         return "Not currently assigned.";
+         return &mt("Not currently assigned.");
      }
      if ($status == $res->OPEN_LATER) {
-         return "Open " . timeToHumanString($res->opendate($part));
+         return &mt("Open ") .timeToHumanString($open,'start');
+     }
+     if ($res->simpleStatus($part) == $res->OPEN) {
+         unless (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) {
+             my ($slot_status,$slot_time,$slot_name)=$res->check_for_slot($part);
+             if ($slot_status == $res->UNKNOWN) {
+                 return &mt('Reservation status unknown');
+             } elsif ($slot_status == $res->RESERVED) {
+                 return &mt('Reserved - ends [_1]',
+                            timeToHumanString($slot_time,'end'));
+             } elsif ($slot_status == $res->RESERVED_LOCATION) {
+                 return &mt('Reserved - specific location(s) - ends [_1]',
+                            timeToHumanString($slot_time,'end'));
+             } elsif ($slot_status == $res->RESERVED_LATER) {
+                 return &mt('Reserved - next open [_1]',
+                            timeToHumanString($slot_time,'start'));
+             } elsif ($slot_status == $res->RESERVABLE) {
+                 return &mt('Reservable ending [_1]',
+                            timeToHumanString($slot_time,'end'));
+             } elsif ($slot_status == $res->RESERVABLE_LATER) {
+                 return &mt('Reservable starting [_1]',
+                            timeToHumanString($slot_time,'start'));
+             } elsif ($slot_status == $res->NOT_IN_A_SLOT) {
+                 return &mt('Reserve a time/place to work');
+             } elsif ($slot_status == $res->NOTRESERVABLE) {
+                 return &mt('Reservation not available');
+             } elsif ($slot_status == $res->WAITING_FOR_GRADE) {
+                 return &mt('Submission in grading queue');
+             }
+         }
      }
      if ($status == $res->OPEN) {
-         if ($res->duedate($part)) {
+         if ($due) {
-             return "Due " . timeToHumanString($res->duedate($part));
+ 	    if ($res->is_practice()) {
+ 		return &mt("Closes ")."  " .timeToHumanString($due,'start');
+ 	    } else {
+ 		return &mt("Due")."  " .timeToHumanString($due,'end');
+ 	    }
          } else {
-             return "Open, no due date";
+             return &mt("Open, no due date");
          }
      }
      if ($status == $res->PAST_DUE_ANSWER_LATER) {
-         return "Answer open " . timeToHumanString($res->answerdate($part));
+         return &mt("Answer open")." " .timeToHumanString($answer,'start');
      }
      if ($status == $res->PAST_DUE_NO_ANSWER) {
-         return "Was due " . timeToHumanString($res->duedate($part));
+ 	if ($res->is_practice()) {
-     }
+ 	    return &mt("Closed")." " . timeToHumanString($due,'start');
-     if ($status == $res->ANSWER_OPEN) {
+ 	} else {
-         return "Answer available";
+ 	    return &mt("Was due")." " . timeToHumanString($due,'end');
+ 	}
+     }
+     if (($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT)
+ 	&& $res->handgrade($part) ne 'yes') {
+         return &mt("Answer available");
      }
      if ($status == $res->EXCUSED) {
-         return "Excused by instructor";
+         return &mt("Excused by instructor");
      }
      if ($status == $res->ATTEMPTED) {
-         return "Not yet graded.";
+         if ($res->is_anonsurvey($part) || $res->is_survey($part)) {
+             return &mt("Survey submission recorded");
+         } else {
+             return &mt("Answer submitted, not yet graded");
+         }
      }
      if ($status == $res->TRIES_LEFT) {
          my $tries = $res->tries($part);
          my $maxtries = $res->maxtries($part);
          my $triesString = "";
          if ($tries && $maxtries) {
-             $triesString = "<font size=\"-1\"><i>($tries of $maxtries tries used)</i></font>";
+             $triesString = '<font size="-1"><i>('.&mt('[_1] of [quant,_2,try,tries] used',$tries,$maxtries).')</i></font>';
              if ($maxtries > 1 && $maxtries - $tries == 1) {
                  $triesString = "<b>$triesString</b>";
              }
          }
-         if ($res->duedate()) {
+         if ($due) {
-             return "Due " . timeToHumanString($res->duedate($part)) .
+             return &mt("Due")." " . timeToHumanString($due,'end') .
                  " $triesString";
          } else {
-             return "No due date $triesString";
+             return &mt("No due date")." $triesString";
          }
      }
+     if ($status == $res->ANSWER_SUBMITTED) {
+         return &mt('Answer submitted');
+     }
  }
- # Convenience function, so others can use it: Is the problem due in less then
- # 24 hours, and still can be done?
- sub dueInLessThen24Hours {
+ sub dueInLessThan24Hours {
      my $res = shift;
      my $part = shift;
      my $status = $res->status($part);
-     return ($status == $res->OPEN() || $status == $res->ATTEMPTED() ||
+     return ($status == $res->OPEN() ||
              $status == $res->TRIES_LEFT()) &&
-            $res->duedate() && $res->duedate() < time()+(24*60*60) &&
+ 	    $res->duedate($part) && $res->duedate($part) < time()+(24*60*60) &&
-            $res->duedate() > time();
+ 	    $res->duedate($part) > time();
  }
- # Convenience function, so others can use it: Is there only one try remaining for the
- # part, with more then one try to begin with, not due yet and still can be done?
  sub lastTry {
      my $res = shift;
      my $part = shift;
- Line 338  sub lastTry {
+ Line 748  sub lastTry {
      my $tries = $res->tries($part);
      my $maxtries = $res->maxtries($part);
      return $tries && $maxtries && $maxtries > 1 &&
-         $maxtries - $tries == 1 && $res->duedate() &&
+         $maxtries - $tries == 1 && $res->duedate($part) &&
-         $res->duedate() > time();
+         $res->duedate($part) > time();
  }
- # This puts a human-readable name on the ENV variable.
- # FIXME: This needs better logic: Who gets the advanced view of navmaps?
- #   As of 3-13-03, it's an open question. Guy doesn't want to check
- #   roles directly because it should be a check of capabilities for future
- #   role compatibity. There is no capability that matches this one for
- #   now, so this is done. (A hack for 1.0 might be to simply check roles
- #   anyhow.)
  sub advancedUser {
-     return $ENV{'user.adv'};
+     return $env{'request.role.adv'};
  }
- # timeToHumanString takes a time number and converts it to a
- # human-readable representation, meant to be used in the following
- # manner:
- # print "Due $timestring"
- # print "Open $timestring"
- # print "Answer available $timestring"
- # Very, very, very, VERY English-only... goodness help a localizer on
- # this func...
  sub timeToHumanString {
-     my ($time) = @_;
+     my ($time,$type,$format) = @_;
      # zero, '0' and blank are bad times
      if (!$time) {
-         return 'never';
+         return &mt('never');
      }
+     unless (&Apache::lonlocal::current_language()=~/^en/) {
+ 	return &Apache::lonlocal::locallocaltime($time);
+     }
      my $now = time();
-     my @time = localtime($time);
-     my @now = localtime($now);
      # Positive = future
      my $delta = $time - $now;
- Line 399  sub timeToHumanString {
+ Line 794  sub timeToHumanString {
          my $tense = $inPast ? " ago" : "";
          my $prefix = $inPast ? "" : "in ";
-         # Less then a minute
+         # Less than a minute
          if ( $delta < $minute ) {
              if ($delta == 1) { return "${prefix}1 second$tense"; }
              return "$prefix$delta seconds$tense";
          }
-         # Less then an hour
+         # Less than an hour
          if ( $delta < $hour ) {
              # If so, use minutes
              my $minutes = floor($delta / 60);
- Line 413  sub timeToHumanString {
+ Line 808  sub timeToHumanString {
              return "$prefix$minutes minutes$tense";
          }
-         # Is it less then 24 hours away? If so,
+         # Is it less than 24 hours away? If so,
          # display hours + minutes
          if ( $delta < $hour * 24) {
              my $hours = floor($delta / $hour);
- Line 432  sub timeToHumanString {
+ Line 827  sub timeToHumanString {
              return "$prefix$hourString$minuteString$tense";
          }
-         # Less then 5 days away, display day of the week and
+ 	my $dt = DateTime->from_epoch(epoch => $time)
+ 	                 ->set_time_zone(&Apache::lonlocal::gettimezone());
+ 	# If there's a caller supplied format, use it.
+ 	if ($format ne '') {
+ 	    my $timeStr = $dt->strftime($format);
+ 	    return $timeStr.' ('.$dt->time_zone_short_name().')';
+ 	}
+         # Less than 5 days away, display day of the week and
          # HH:MM
          if ( $delta < $day * 5 ) {
-             my $timeStr = strftime("%A, %b %e at %I:%M %P", localtime($time));
+             my $timeStr = $dt->strftime("%A, %b %e at %I:%M %P (%Z)");
-             $timeStr =~ s/12:00 am/midnight/;
+             $timeStr =~ s/12:00 am/00:00/;
              $timeStr =~ s/12:00 pm/noon/;
-             return ($inPast ? "last " : "next ") .
+             return ($inPast ? "last " : "this ") .
                  $timeStr;
          }
+ 	my $conjunction='on';
+ 	if ($type eq 'start') {
+ 	    $conjunction='at';
+ 	} elsif ($type eq 'end') {
+ 	    $conjunction='by';
+ 	}
          # Is it this year?
-         if ( $time[5] == $now[5]) {
+ 	my $dt_now = DateTime->from_epoch(epoch => $now)
+ 	                     ->set_time_zone(&Apache::lonlocal::gettimezone());
+         if ( $dt->year() == $dt_now->year()) {
              # Return on Month Day, HH:MM meridian
-             my $timeStr = strftime("on %A, %b %e at %I:%M %P", localtime($time));
+             my $timeStr = $dt->strftime("$conjunction %A, %b %e at %I:%M %P (%Z)");
-             $timeStr =~ s/12:00 am/midnight/;
+             $timeStr =~ s/12:00 am/00:00/;
              $timeStr =~ s/12:00 pm/noon/;
              return $timeStr;
          }
          # Not this year, so show the year
-         my $timeStr = strftime("on %A, %b %e %G at %I:%M %P", localtime($time));
+         my $timeStr =
-         $timeStr =~ s/12:00 am/midnight/;
+ 	    $dt->strftime("$conjunction %A, %b %e %Y at %I:%M %P (%Z)");
+         $timeStr =~ s/12:00 am/00:00/;
          $timeStr =~ s/12:00 pm/noon/;
          return $timeStr;
      }
  }
- =pod
- =head1 NAME
- Apache::lonnavmap - Subroutines to handle and render the navigation maps
- =head1 SYNOPSIS
- The main handler generates the navigational listing for the course,
- the other objects export this information in a usable fashion for
- other modules
- =head1 Object: render
- The navmap renderer 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 <input>
- 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<resource>:
- 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<resource_nolink>:
- If true, the resource will not be linked. Default: false, resource
- will have links.
- =item * B<resource_part_count>:
- 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.
- =item * B<resource_no_folder_link>:
- If true, the resource's folder will not be clickable to open or close
- it. Default is false. True implies printCloseAll is false, since you
- can't close or open folders when this is on anyhow.
- =back
- =item B<communication_status>:
- 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<quick_status>:
- 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<long_status>:
- 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 '<td>' . $resource->{ID} . ' ' . $part . '</td>'; }
-   return '<td>' . $resource->{ID} . '</td>';
-  }
- Note these functions are responsible for the TD tags, which allow them
- to override vertical and horizontal alignment, etc.
- =head2 Parameters
- Most of these parameters are only useful if you are *not* using the
- folder interface (i.e., the default first column), which is probably
- the common case. If you are using this interface, then you should be
- able to get away with just using 'cols' (to specify the columns
- shown), 'url' (necessary for the folders to link to the current screen
- correctly), and possibly 'queryString' if your app calls for it. In
- that case, maintaining the state of the folders will be done
- automatically.
- =over 4
- =item * B<iterator>:
- 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. If
- one is not passed, the renderer will attempt to construct one from
- ENV{'form.filter'} and ENV{'form.condition'} information, plus the
- 'iterator_map' parameter if any.
- =item * B<iterator_map>:
- If you are letting the renderer do the iterator handling, you can
- instruct the renderer to render only a particular map by passing it
- the source of the map you want to process, like
- '/res/103/jerf/navmap.course.sequence'.
- =item * B<navmap>:
- A reference to a navmap, used only if an iterator is not passed in. If
- this is necessary to make an iterator but it is not passed in, a new
- one will be constructed based on ENV info. This is useful to do basic
- error checking before passing it off to render.
- =item * B<r>:
- The standard Apache response object. This must be passed to the
- renderer or the course hash will be locked.
- =item * B<cols>:
- An array reference
- =item * B<showParts>:
- 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<condenseParts>:
- 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<jumpCount>:
- 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. By default, determined through
- the use of the ENV{} 'jump' information, and should normally "just
- work" correctly.
- =item * B<here>:
- A Symb identifying where to place the 'here' marker. Default empty,
- which means no marker.
- =item * B<indentString>:
- A string identifying the indentation string to use. By default, this
- is a 25 pixel whitespace image with no alt text.
- =item * B<queryString>:
- A string which will be prepended to the query string used when the
- folders are opened or closed.
- =item * B<url>:
- The url the folders will link to, which should be the current
- page. Required if the resource info column is shown.
- =item * B<currentJumpIndex>:
- Describes the currently-open row number to cause the browser to jump
- to, because the user just opened that folder. By default, pulled from
- the Jump information in the ENV{'form.*'}.
- =item * B<printKey>:
- If true, print the key that appears on the top of the standard
- navmaps. Default is false.
- =item * B<printCloseAll>:
- If true, print the "Close all folders" or "open all folders"
- links. Default is true.
- =item * B<filterFunc>:
- A function that takes the resource object as its only parameter and
- returns a true or false value. If true, the resource is displayed. If
- false, it is simply skipped in the display. By default, all resources
- are shown.
- =item * B<suppressNavmaps>:
- If true, will not display Navigate Content resources. Default to
- false.
- =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:
- If you want to know how many rows were printed, the 'counter' element
- of the hash passed into the render function will contain the
- count. You may want to check whether any resources were printed at
- all.
- =over 4
- =back
- =cut
  sub resource { return 0; }
  sub communication_status { return 1; }
  sub quick_status { return 2; }
  sub long_status { return 3; }
+ sub part_status_summary { return 4; }
- # Data for render_resource
  sub render_resource {
      my ($resource, $part, $params) = @_;
- Line 724  sub render_resource {
+ Line 887  sub render_resource {
      my $nonLinkedText = ''; # stuff after resource title not in link
      my $link = $params->{"resourceLink"};
+     #  The URL part is not escaped at this point, but the symb is...
      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 = "";
+     my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
      # If this is a new branch, label it so
      if ($params->{'isNewBranch'}) {
-         $newBranchText = "<img src='/adm/lonIcons/branch.gif' border='0' />";
+         $newBranchText = "<img src='$location/branch.gif' alt=".mt('Branch')." />";
      }
      # links to open and close the folder
-     my $linkopen = "<a href='$link'>";
+     my $whitespace = $location.'/whitespace_21.gif';
+     my $linkopen = "<img src='$whitespace' alt='' />"."<a href=\"$link\">";
      my $linkclose = "</a>";
-     # Default icon: HTML page
+     # Default icon: unknown page
-     my $icon = "<img src='/adm/lonIcons/html.gif' alt='' border='0' />";
+     my $icon = "<img class=\"LC_contentImage\" src='$location/unknown.gif' alt='' />";
      if ($resource->is_problem()) {
-         if ($part eq "" || $params->{'condensed'}) {
+         if ($part eq '0' || $params->{'condensed'}) {
-             $icon = '<img src="/adm/lonIcons/problem.gif" alt="" border="0" />';
+ 	    $icon = '<img class="LC_contentImage" src="'.$location.'/';
+ 	    if ($resource->is_task()) {
+ 		$icon .= 'task.gif" alt="'.&mt('Task');
+ 	    } else {
+ 		$icon .= 'problem.gif" alt="'.&mt('Problem');
+ 	    }
+ 	    $icon .='" />';
          } else {
              $icon = $params->{'indentString'};
          }
+     } else {
+ 	$icon = "<img class=\"LC_contentImage\" src='".&Apache::loncommon::icon($resource->src)."' alt='' />";
      }
      # Display the correct map icon to open or shut map
- Line 763  sub render_resource {
+ Line 936  sub render_resource {
          if ($it->{CONDITION}) {
              $nowOpen = !$nowOpen;
          }
+ 	my $folderType = $resource->is_sequence() ? 'folder' : 'page';
+         my $title=$resource->title;
+ 		$title=~s/\"/\&qout;/g;
          if (!$params->{'resource_no_folder_link'}) {
-             $icon = 'navmap.folder.' . ($nowOpen ? 'closed' : 'open') . '.gif';
+             $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') . '.gif';
-             $icon = "<img src='/adm/lonIcons/$icon' alt='' border='0' />";
+             $icon = "<img src='$location/arrow." . ($nowOpen ? 'closed' : 'open') . ".gif' alt='' />"
+                     ."<img class=\"LC_contentImage\" src='$location/$icon' alt=\""
-             $linkopen = "<a href='" . $params->{'url'} . '?' .
+                     .($nowOpen ? &mt('Open Folder') : &mt('Close Folder')).' '.$title."\" />";
-                 $params->{'queryString'} . '&filter=';
+             $linkopen = "<a href=\"" . $params->{'url'} . '?' .
+                 $params->{'queryString'} . '&amp;filter=';
              $linkopen .= ($nowOpen xor $it->{CONDITION}) ?
                  addToFilter($filter, $mapId) :
                  removeFromFilter($filter, $mapId);
-             $linkopen .= "&condition=" . $it->{CONDITION} . '&hereType='
+             $linkopen .= "&amp;condition=" . $it->{CONDITION} . '&amp;hereType='
-                 . $params->{'hereType'} . '&here=' .
+                 . $params->{'hereType'} . '&amp;here=' .
-                 &Apache::lonnet::escape($params->{'here'}) .
+                 &escape($params->{'here'}) .
-                 '&jump=' .
+                 '&amp;jump=' .
-                 &Apache::lonnet::escape($resource->symb()) .
+                 &escape($resource->symb()) .
-                 "&folderManip=1'>";
+                 "&amp;folderManip=1\">";
          } else {
              # Don't allow users to manipulate folder
-             $icon = 'navmap.folder.' . ($nowOpen ? 'closed' : 'open') .
+             $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') . '.gif';
-                 '.nomanip.gif';
+             $icon = "<img class=\"LC_space\" src='$whitespace' alt='' />"."<img class=\"LC_contentImage\" src='$location/$icon' alt=\"".($nowOpen ? &mt('Open Folder') : &mt('Close Folder')).' '.$title."\" />";
-             $icon = "<img src='/adm/lonIcons/$icon' alt='' border='0' />";
              $linkopen = "";
              $linkclose = "";
- Line 791  sub render_resource {
+ Line 968  sub render_resource {
      }
      if ($resource->randomout()) {
-         $nonLinkedText .= ' <i>(hidden)</i> ';
+         $nonLinkedText .= ' <i>('.&mt('hidden').')</i> ';
+     }
+     if (!$resource->condval()) {
+         $nonLinkedText .= ' <i>('.&mt('conditionally hidden').')</i> ';
+     }
+     if (($resource->is_practice()) && ($resource->is_raw_problem())) {
+         $nonLinkedText .=' <font color="green"><b>'.&mt('not graded').'</b></font>';
      }
-     # We're done preparing and finally ready to start the rendering
-     my $result = "<td align='left' valign='center'>";
+     # We're done preparing and finally ready to start the rendering
+     my $result = '<td class="LC_middle">';
+     my $newfolderType = $resource->is_sequence() ? 'folder' : 'page';
      my $indentLevel = $params->{'indentLevel'};
      if ($newBranchText) { $indentLevel--; }
- Line 814  sub render_resource {
+ Line 998  sub render_resource {
      # Is this the current resource?
      if (!$params->{'displayedHereMarker'} &&
          $resource->symb() eq $params->{'here'} ) {
-         $curMarkerBegin = '<font color="red" size="+2">&gt; </font>';
+         $curMarkerBegin = '<em>';
-         $curMarkerEnd = '<font color="red" size="+2">&lt;</font>';
+         $curMarkerEnd = '</em>';
-         $params->{'displayedHereMarker'} = 1;
+ 	$params->{'displayedHereMarker'} = 1;
      }
-     if ($resource->is_problem() && $part ne "" &&
+     if ($resource->is_problem() && $part ne '0' &&
          !$params->{'condensed'}) {
-         $partLabel = " (Part $part)";
+ 	my $displaypart=$resource->part_display($part);
+         $partLabel = " (".&mt('Part: [_1]', $displaypart).")";
+ 	if ($link!~/\#/) { $link.='#'.&escape($part); }
          $title = "";
      }
      if ($params->{'condensed'} && $resource->countParts() > 1) {
-         $nonLinkedText .= ' (' . $resource->countParts() . ' parts)';
+         $nonLinkedText .= ' ('.&mt('[_1] parts', $resource->countParts()).')';
      }
-     if (!$params->{'resource_nolink'}) {
+     my $target;
-         $result .= "  $curMarkerBegin<a href='$link'>$title$partLabel</a>$curMarkerEnd $nonLinkedText</td>";
+     if ($env{'environment.remotenavmap'} eq 'on') {
+ 	$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 {
-         $result .= "  $curMarkerBegin$title$partLabel$curMarkerEnd $nonLinkedText</td>";
+         $result .= "$curMarkerBegin$linkopen$title$partLabel</a>$curMarkerEnd$nonLinkedText</td>";
      }
      return $result;
- Line 843  sub render_communication_status {
+ Line 1033  sub render_communication_status {
      my $discussionHTML = ""; my $feedbackHTML = ""; my $errorHTML = "";
      my $link = $params->{"resourceLink"};
-     my $linkopen = "<a href='$link'>";
+     my $target;
+     if ($env{'environment.remotenavmap'} eq 'on') {
+ 	$target=' target="loncapaclient" ';
+     }
+     my $linkopen = "<a $target href=\"$link\">";
      my $linkclose = "</a>";
+     my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
      if ($resource->hasDiscussion()) {
          $discussionHTML = $linkopen .
-             '<img border="0" src="/adm/lonMisc/chat.gif" />' .
+             '<img alt="'.&mt('New Discussion').'" src="'.$location.'/chat.gif" title="'.&mt('New Discussion').'"/>' .
              $linkclose;
      }
      if ($resource->getFeedback()) {
          my $feedback = $resource->getFeedback();
-         foreach (split(/\,/, $feedback)) {
+         foreach my $msgid (split(/\,/, $feedback)) {
-             if ($_) {
+             if ($msgid) {
-                 $feedbackHTML .= '&nbsp;<a href="/adm/email?display='
+                 $feedbackHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
-                     . &Apache::lonnet::escape($_) . '">'
+                     . &escape($msgid) . '">'
-                     . '<img src="/adm/lonMisc/feedback.gif" '
+                     . '<img alt="'.&mt('New E-mail').'" src="'.$location.'/feedback.gif" title="'.&mt('New E-mail').'"/></a>';
-                     . 'border="0" /></a>';
              }
          }
      }
      if ($resource->getErrors()) {
          my $errors = $resource->getErrors();
-         foreach (split(/,/, $errors)) {
+         my $errorcount = 0;
-             if ($_) {
+         foreach my $msgid (split(/,/, $errors)) {
-                 $errorHTML .= '&nbsp;<a href="/adm/email?display='
+             last if ($errorcount>=10); # Only output 10 bombs maximum
-                     . &Apache::lonnet::escape($_) . '">'
+             if ($msgid) {
-                     . '<img src="/adm/lonMisc/bomb.gif" '
+                 $errorcount++;
-                     . 'border="0" /></a>';
+                 $errorHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
+                     . &escape($msgid) . '">'
+                     . '<img alt="'.&mt('New Error').'" src="'.$location.'/bomb.gif" title="'.&mt('New Error').'"/></a>';
              }
          }
      }
-     return "<td width=\"75\" align=\"left\" valign=\"center\">$discussionHTML$feedbackHTML$errorHTML&nbsp;</td>";
+     if ($params->{'multipart'} && $part != '0') {
+ 	$discussionHTML = $feedbackHTML = $errorHTML = '';
+     }
+     return "<td class=\"LC_middle\">$discussionHTML$feedbackHTML$errorHTML&nbsp;</td>";
  }
  sub render_quick_status {
- Line 886  sub render_quick_status {
+ Line 1084  sub render_quick_status {
          $params->{'multipart'} && $part eq "0";
      my $link = $params->{"resourceLink"};
-     my $linkopen = "<a href='$link'>";
+     my $target;
+     if ($env{'environment.remotenavmap'} eq 'on') {
+ 	$target=' target="loncapaclient" ';
+     }
+     my $linkopen = "<a $target href=\"$link\">";
      my $linkclose = "</a>";
+ 	$result .= '<td class="LC_middle">';
      if ($resource->is_problem() &&
          !$firstDisplayed) {
-         my $icon = $statusIconMap{$resource->status($part)};
+         my $icon = $statusIconMap{$resource->simpleStatus($part)};
          my $alt = $iconAltTags{$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 .= $linkopen.'<img src="'.$location.'" alt="'.&mt($alt).'" title="'.&mt($alt).'" />'.$linkclose;
          } else {
-             $result .= "<td width='30'>&nbsp;</td>\n";
+             $result .= "&nbsp;";
          }
      } else { # not problem, no icon
-         $result .= "<td width='30'>&nbsp;</td>\n";
+         $result .= "&nbsp;";
      }
+ 	$result .= "</td>\n";
      return $result;
  }
  sub render_long_status {
      my ($resource, $part, $params) = @_;
-     my $result = "<td align='right' valign='center'>\n";
+     my $result = '<td class="LC_middle LC_right">';
      my $firstDisplayed = !$params->{'condensed'} &&
          $params->{'multipart'} && $part eq "0";
      my $color;
-     if ($resource->is_problem()) {
+     if ($resource->is_problem() || $resource->is_practice()) {
          $color = $colormap{$resource->status};
-         if (dueInLessThen24Hours($resource, $part) ||
+         if (dueInLessThan24Hours($resource, $part) ||
              lastTry($resource, $part)) {
              $color = $hurryUpColor;
          }
      }
      if ($resource->kind() eq "res" &&
-         $resource->is_problem() &&
+         ($resource->is_problem() || $resource->is_practice()) &&
          !$firstDisplayed) {
          if ($color) {$result .= "<font color=\"$color\"><b>"; }
          $result .= getDescription($resource, $part);
          if ($color) {$result .= "</b></font>"; }
      }
-     if ($resource->is_map() && advancedUser() && $resource->randompick()) {
+     if ($resource->is_map() && &advancedUser() && $resource->randompick()) {
-         $result .= '(randomly select ' . $resource->randompick() .')';
+         $result .= &mt('(randomly select [_1])', $resource->randompick());
      }
+     if ($resource->is_map() && &advancedUser() && $resource->randomorder()) {
-     $result .= "&nbsp;</td>\n";
+         $result .= &mt('(randomly ordered)');
+     }
+     # Debugging code
+     #$result .= " " . $resource->awarded($part) . '/' . $resource->weight($part) .
+     #	' - Part: ' . $part;
+     $result .= "</td>\n";
      return $result;
  }
+ # Colors obtained by taking the icons, matching the colors, and
+ # possibly reducing the Value (HSV) of the color, if it's too bright
+ # for text, generally by one third or so.
+ my %statusColors =
+     (
+      $resObj->CLOSED => '#000000',
+      $resObj->OPEN   => '#998b13',
+      $resObj->CORRECT => '#26933f',
+      $resObj->INCORRECT => '#c48207',
+      $resObj->ATTEMPTED => '#a87510',
+      $resObj->ERROR => '#000000'
+      );
+ my %statusStrings =
+     (
+      $resObj->CLOSED => 'Not yet open',
+      $resObj->OPEN   => 'Open',
+      $resObj->CORRECT => 'Correct',
+      $resObj->INCORRECT => 'Incorrect',
+      $resObj->ATTEMPTED => 'Attempted',
+      $resObj->ERROR => 'Network Error'
+      );
+ my @statuses = ($resObj->CORRECT, $resObj->ATTEMPTED, $resObj->INCORRECT, $resObj->OPEN, $resObj->CLOSED, $resObj->ERROR);
+ sub render_parts_summary_status {
+     my ($resource, $part, $params) = @_;
+     if (!$resource->is_problem() && !$resource->contains_problem) { return '<td></td>'; }
+     if ($params->{showParts}) {
+ 	return '<td></td>';
+     }
+     my $td = "<td align='right'>\n";
+     my $endtd = "</td>\n";
+     my @probs;
+     if ($resource->contains_problem) {
+ 	@probs=$resource->retrieveResources($resource,sub { $_[0]->is_problem() },1,0);
+     } else {
+ 	@probs=($resource);
+     }
+     my $return;
+     my %overallstatus;
+     my $totalParts;
+     foreach my $resource (@probs) {
+ 	# If there is a single part, just show the simple status
+ 	if ($resource->singlepart()) {
+ 	    my $status = $resource->simpleStatus(${$resource->parts}[0]);
+ 	    $overallstatus{$status}++;
+ 	    $totalParts++;
+ 	    next;
+ 	}
+ 	# 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>";
+ 	}
+     }
+     $return.= $endtd;
+     return $return;
+ }
  my @preparedColumns = (\&render_resource, \&render_communication_status,
-                        \&render_quick_status, \&render_long_status);
+                        \&render_quick_status, \&render_long_status,
+ 		       \&render_parts_summary_status);
  sub setDefault {
      my ($val, $default) = @_;
- Line 945  sub setDefault {
+ Line 1232  sub setDefault {
      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 {
      my $args = shift;
      &Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
      my $result = '';
      # Configure the renderer.
      my $cols = $args->{'cols'};
      if (!defined($cols)) {
          # no columns, no nav maps.
          return '';
      }
-     my $mustCloseNavMap = 0;
      my $navmap;
      if (defined($args->{'navmap'})) {
          $navmap = $args->{'navmap'};
- Line 967  sub render {
+ Line 1259  sub render {
      my $jump = $args->{'jump'};
      my $here = $args->{'here'};
      my $suppressNavmap = setDefault($args->{'suppressNavmap'}, 0);
+     my $closeAllPages = setDefault($args->{'closeAllPages'}, 0);
      my $currentJumpDelta = 2; # change this to change how many resources are displayed
                               # before the current resource when using #current
- Line 976  sub render {
+ Line 1269  sub render {
      # marker
      my $filterHash = {};
      # Figure out what we're not displaying
-     foreach (split(/\,/, $ENV{"form.filter"})) {
+     foreach my $item (split(/\,/, $env{"form.filter"})) {
-         if ($_) {
+         if ($item) {
-             $filterHash->{$_} = "1";
+             $filterHash->{$item} = "1";
          }
      }
+     # Filter: Remember filter function and add our own filter: Refuse
+     # to show hidden resources unless the user can see them.
+     my $userCanSeeHidden = advancedUser();
+     my $filterFunc = setDefault($args->{'filterFunc'},
+                                 sub {return 1;});
+     if (!$userCanSeeHidden) {
+         # Without renaming the filterfunc, the server seems to go into
+         # an infinite loop
+         my $oldFilterFunc = $filterFunc;
+         $filterFunc = sub { my $res = shift; return !$res->randomout() &&
+                                 &$oldFilterFunc($res);};
+     }
      my $condition = 0;
-     if ($ENV{'form.condition'}) {
+     if ($env{'form.condition'}) {
          $condition = 1;
      }
-     if (!$ENV{'form.folderManip'} && !defined($args->{'iterator'})) {
+     if (!$env{'form.folderManip'} && !defined($args->{'iterator'})) {
          # Step 1: Check to see if we have a navmap
          if (!defined($navmap)) {
-             $navmap = Apache::lonnavmaps::navmap->new(
+             $navmap = Apache::lonnavmaps::navmap->new();
-                         $ENV{"request.course.fn"}.".db",
+ 	    if (!defined($navmap)) {
-                         $ENV{"request.course.fn"}."_parms.db", 1, 1);
+ 		# no longer in course
-             $mustCloseNavMap = 1;
+ 		return '<span class="LC_error">'.&mt('No course selected').'</span><br />
-         }
+                         <a href="/adm/roles">'.&mt('Select a course').'</a><br />';
-         $navmap->init();
+ 	    }
+ 	}
          # Step two: Locate what kind of here marker is necessary
          # Determine where the "here" marker is and where the screen jumps to.
-         if ($ENV{'form.postsymb'}) {
+         if ($env{'form.postsymb'} ne '') {
-             $here = $jump = $ENV{'form.postsymb'};
+             $here = $jump = &Apache::lonnet::symbclean($env{'form.postsymb'});
-         } elsif ($ENV{'form.postdata'}) {
+         } elsif ($env{'form.postdata'} ne '') {
              # couldn't find a symb, is there a URL?
-             my $currenturl = $ENV{'form.postdata'};
+             my $currenturl = $env{'form.postdata'};
              #$currenturl=~s/^http\:\/\///;
              #$currenturl=~s/^[^\/]+//;
              $here = $jump = &Apache::lonnet::symbread($currenturl);
-         }
+ 	}
+ 	if ($here eq '') {
+ 	    my $last;
+ 	    if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
+                     &GDBM_READER(),0640)) {
+ 		$last=$hash{'last_known'};
+ 		untie(%hash);
+ 	    }
+ 	    if ($last) { $here = $jump = $last; }
+ 	}
          # Step three: Ensure the folders are open
          my $mapIterator = $navmap->getIterator(undef, undef, undef, 1);
-         my $depth = 1;
+         my $curRes;
-         $mapIterator->next(); # discard the first BEGIN_MAP
-         my $curRes = $mapIterator->next();
          my $found = 0;
          # 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
          # for the jump marker with this loop.
-         while ($depth > 0 && !$found) {
+         while ($here && ($curRes = $mapIterator->next()) && !$found) {
-             if ($curRes == $mapIterator->BEGIN_MAP()) { $depth++; }
-             if ($curRes == $mapIterator->END_MAP()) { $depth--; }
              if (ref($curRes) && $curRes->symb() eq $here) {
                  my $mapStack = $mapIterator->getStack();
- Line 1038  sub render {
+ Line 1349  sub render {
                  }
                  $found = 1;
              }
-             $curRes = $mapIterator->next();
          }
      }
-     if ( !defined($args->{'iterator'}) && $ENV{'form.folderManip'} ) { # we came from a user's manipulation of the nav page
+     if ( !defined($args->{'iterator'}) && $env{'form.folderManip'} ) { # we came from a user's manipulation of the nav page
          # If this is a click on a folder or something, we want to preserve the "here"
          # from the querystring, and get the new "jump" marker
-         $here = $ENV{'form.here'};
+         $here = $env{'form.here'};
-         $jump = $ENV{'form.jump'};
+         $jump = $env{'form.jump'};
      }
      my $it = $args->{'iterator'};
      if (!defined($it)) {
-         # Construct a default iterator based on $ENV{'form.'} information
+         # Construct a default iterator based on $env{'form.'} information
          # Step 1: Check to see if we have a navmap
          if (!defined($navmap)) {
-             $navmap = Apache::lonnavmaps::navmap->new($r,
+             $navmap = Apache::lonnavmaps::navmap->new();
-                         $ENV{"request.course.fn"}.".db",
+             if (!defined($navmap)) {
-                         $ENV{"request.course.fn"}."_parms.db", 1, 1);
+                 # no longer in course
-             $mustCloseNavMap = 1;
+                 return '<span class="LC_error">'.&mt('No course selected').'</span><br />
+                         <a href="/adm/roles">'.&mt('Select a course').'</a><br />';
+             }
          }
-         # Paranoia: Make sure it's ready
-         $navmap->init();
          # See if we're being passed a specific map
          if ($args->{'iterator_map'}) {
- Line 1073  sub render {
+ Line 1382  sub render {
              $args->{'iterator'} = $it = $navmap->getIterator($firstResource, $finishResource, $filterHash, $condition);
          } else {
-             $args->{'iterator'} = $it = $navmap->getIterator(undef, undef, $filterHash, $condition);
+             $args->{'iterator'} = $it = $navmap->getIterator(undef, undef, $filterHash, $condition,undef,$args->{'include_top_level_map'});
          }
      }
      # (re-)Locate the jump point, if any
+     # Note this does not take filtering or hidden into account... need
+     # to be fixed?
      my $mapIterator = $navmap->getIterator(undef, undef, $filterHash, 0);
-     my $depth = 1;
+     my $curRes;
-     $mapIterator->next();
-     my $curRes = $mapIterator->next();
      my $foundJump = 0;
      my $counter = 0;
-     while ($depth > 0 && !$foundJump) {
+     while (($curRes = $mapIterator->next()) && !$foundJump) {
-         if ($curRes == $mapIterator->BEGIN_MAP()) { $depth++; }
-         if ($curRes == $mapIterator->END_MAP()) { $depth--; }
          if (ref($curRes)) { $counter++; }
          if (ref($curRes) && $jump eq $curRes->symb()) {
- Line 1098  sub render {
+ Line 1405  sub render {
              $args->{'currentJumpIndex'} = $counter;
              $foundJump = 1;
          }
-         $curRes = $mapIterator->next();
      }
      my $showParts = setDefault($args->{'showParts'}, 1);
- Line 1110  sub render {
+ Line 1415  sub render {
      my $printKey = $args->{'printKey'};
      my $printCloseAll = $args->{'printCloseAll'};
      if (!defined($printCloseAll)) { $printCloseAll = 1; }
-     my $filterFunc = setDefault($args->{'filterFunc'},
-                                 sub {return 1;});
      # Print key?
      if ($printKey) {
          $result .= '<table border="0" cellpadding="2" cellspacing="0">';
-         my $date=localtime;
          $result.='<tr><td align="right" valign="bottom">Key:&nbsp;&nbsp;</td>';
+ 	my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
          if ($navmap->{LAST_CHECK}) {
              $result .=
-                 '<img src="/adm/lonMisc/chat.gif"> New discussion since '.
+                 '<img src="'.$location.'/chat.gif" alt="" /> '.&mt('New discussion since').' '.
                  strftime("%A, %b %e at %I:%M %P", localtime($navmap->{LAST_CHECK})).
                  '</td><td align="center" valign="bottom">&nbsp;&nbsp;'.
-                 '<img src="/adm/lonMisc/feedback.gif"> New message (click to open)<p>'.
+                 '<img src="'.$location.'/feedback.gif" alt="" /> '.&mt('New message (click to open)').'<p>'.
                  '</td>';
          } else {
              $result .= '<td align="center" valign="bottom">&nbsp;&nbsp;'.
-                 '<img src="/adm/lonMisc/chat.gif"> Discussions</td><td align="center" valign="bottom">'.
+                 '<img src="'.$location.'/chat.gif" alt="" /> '.&mt('Discussions').'</td><td align="center" valign="bottom">'.
-                 '&nbsp;&nbsp;<img src="/adm/lonMisc/feedback.gif"> New message (click to open)'.
+                 '&nbsp;&nbsp;<img src="'.$location.'/feedback.gif" alt="" /> '.&mt('New message (click to open)').
                  '</td>';
          }
- Line 1136  sub render {
+ Line 1439  sub render {
      }
      if ($printCloseAll && !$args->{'resource_no_folder_link'}) {
+ 	my ($link,$text);
          if ($condition) {
-             $result.="<a href=\"navmaps?condition=0&filter=&$queryString" .
+ 	    $link='"navmaps?condition=0&amp;filter=&amp;'.$queryString.
-                 "&here=" . Apache::lonnet::escape($here) .
+ 		'&here='.&escape($here).'"';
-                 "\">Close All Folders</a>";
+ 	    $text='Close all folders';
+         } else {
+ 	    $link='"navmaps?condition=1&amp;filter=&amp;'.$queryString.
+ 		'&here='.&escape($here).'"';
+ 	    $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()) {
+ 		    $haveDisc .= $resource->wrap_symb().':';
+ 		    $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>&nbsp;</td>';
          } else {
-             $result.="<a href=\"navmaps?condition=1&filter=&$queryString" .
+ 	    $result .= '</tr><tr>';
-                 "&here=" . Apache::lonnet::escape($here) .
-                 "\">Open All Folders</a>";
          }
-         $result .= "<br /><br />\n";
+ 	$result.="<td class=\"LC_middle\">".mt('Tools:')."</td>";
-     }
+ 	$result.=&show_linkitems_toolbar($args->{'linkitems'});
+         if ($args->{'sort_html'}) {
+ 	    if ($env{'environment.remotenavmap'} ne 'on') {
+ 		$result.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</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) {
          $r->print($result);
          $r->rflush();
          $result = "";
      }
      # End parameter setting
+     $result .= "<br />\n";
      # Data
-     $result .= '<table cellspacing="0" cellpadding="3" border="0" bgcolor="#FFFFFF">' ."\n";
+     $result.=&Apache::loncommon::start_data_table("LC_tableOfContent");
      my $res = "Apache::lonnavmaps::resource";
      my %condenseStatuses =
          ( $res->NETWORK_FAILURE    => 1,
            $res->NOTHING_SET        => 1,
            $res->CORRECT            => 1 );
-     my @backgroundColors = ("#FFFFFF", "#F6F6F6");
      # Shared variables
      $args->{'counter'} = 0; # counts the rows
      $args->{'indentLevel'} = 0;
      $args->{'isNewBranch'} = 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/whitespace_21.gif");
+     $args->{'indentString'} = setDefault($args->{'indentString'}, "<img src='$location' alt='' />");
      $args->{'displayedHereMarker'} = 0;
+     # If we're suppressing empty sequences, look for them here. Use DFS for speed,
+     # since structure actually doesn't matter, except what map has what resources.
+     if ($args->{'suppressEmptySequences'}) {
+         my $dfsit = Apache::lonnavmaps::DFSiterator->new($navmap,
+                                                          $it->{FIRST_RESOURCE},
+                                                          $it->{FINISH_RESOURCE},
+                                                          {}, undef, 1);
+         my $depth = 0;
+         $dfsit->next();
+         my $curRes = $dfsit->next();
+         while ($depth > -1) {
+             if ($curRes == $dfsit->BEGIN_MAP()) { $depth++; }
+             if ($curRes == $dfsit->END_MAP()) { $depth--; }
+             if (ref($curRes)) {
+                 # Parallel pre-processing: Do sequences have non-filtered-out children?
+                 if ($curRes->is_map()) {
+                     $curRes->{DATA}->{HAS_VISIBLE_CHILDREN} = 0;
+                     # Sequences themselves do not count as visible children,
+                     # unless those sequences also have visible children.
+                     # This means if a sequence appears, there's a "promise"
+                     # that there's something under it if you open it, somewhere.
+                 } else {
+                     # Not a sequence: if it's filtered, ignore it, otherwise
+                     # rise up the stack and mark the sequences as having children
+                     if (&$filterFunc($curRes)) {
+                         for my $sequence (@{$dfsit->getStack()}) {
+                             $sequence->{DATA}->{HAS_VISIBLE_CHILDREN} = 1;
+                         }
+                     }
+                 }
+             }
+         } continue {
+             $curRes = $dfsit->next();
+         }
+     }
      my $displayedJumpMarker = 0;
      # Set up iteration.
-     $depth = 1;
-     $it->next(); # discard initial BEGIN_MAP
-     $curRes = $it->next();
      my $now = time();
      my $in24Hours = $now + 24 * 60 * 60;
      my $rownum = 0;
- Line 1184  sub render {
+ Line 1590  sub render {
      # export "here" marker information
      $args->{'here'} = $here;
-     while ($depth > 0) {
+     $args->{'indentLevel'} = -1; # first BEGIN_MAP takes this to 0
-         if ($curRes == $it->BEGIN_MAP()) { $depth++; }
+     my @resources;
-         if ($curRes == $it->END_MAP()) { $depth--; }
+     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.
          if ($curRes == $it->BEGIN_MAP() ||
- Line 1207  sub render {
+ Line 1664  sub render {
              next;
          }
-         $args->{'counter'}++;
          # If this has been filtered out, continue on
          if (!(&$filterFunc($curRes))) {
              $args->{'isNewBranch'} = 0; # Don't falsely remember this
              next;
          }
+         # If this is an empty sequence and we're filtering them, continue on
+         if ($curRes->is_map() && $args->{'suppressEmptySequences'} &&
+             !$curRes->{DATA}->{HAS_VISIBLE_CHILDREN}) {
+             next;
+         }
          # If we're suppressing navmaps and this is a navmap, continue on
          if ($suppressNavmap && $curRes->src() =~ /^\/adm\/navmaps/) {
              next;
          }
+         $args->{'counter'}++;
          # Does it have multiple parts?
          $args->{'multipart'} = 0;
          $args->{'condensed'} = 0;
- Line 1228  sub render {
+ Line 1691  sub render {
          # Decide what parts to show.
          if ($curRes->is_problem() && $showParts) {
              @parts = @{$curRes->parts()};
-             $args->{'multipart'} = scalar(@parts) > 1;
+             $args->{'multipart'} = $curRes->multipart();
              if ($condenseParts) { # do the condensation
-                 if (!$curRes->opendate("0")) {
-                     @parts = ();
-                     $args->{'condensed'} = 1;
-                 }
                  if (!$args->{'condensed'}) {
                      # Decide whether to condense based on similarity
-                     my $status = $curRes->status($parts[1]);
+                     my $status = $curRes->status($parts[0]);
-                     my $due = $curRes->duedate($parts[1]);
+                     my $due = $curRes->duedate($parts[0]);
-                     my $open = $curRes->opendate($parts[1]);
+                     my $open = $curRes->opendate($parts[0]);
                      my $statusAllSame = 1;
                      my $dueAllSame = 1;
                      my $openAllSame = 1;
-                     for (my $i = 2; $i < scalar(@parts); $i++) {
+                     for (my $i = 1; $i < scalar(@parts); $i++) {
                          if ($curRes->status($parts[$i]) != $status){
                              $statusAllSame = 0;
                          }
- Line 1264  sub render {
+ Line 1723  sub render {
                      if (($statusAllSame && defined($condenseStatuses{$status})) ||
                          ($dueAllSame && $status == $curRes->OPEN && $statusAllSame)||
                          ($openAllSame && $status == $curRes->OPEN_LATER && $statusAllSame) ){
-                         @parts = ();
+                         @parts = ($parts[0]);
                          $args->{'condensed'} = 1;
                      }
                  }
+ 		# Multipart problem with one part: always "condense" (happens
+ 		#  to match the desirable behavior)
+ 		if ($curRes->countParts() == 1) {
+ 		    @parts = ($parts[0]);
+ 		    $args->{'condensed'} = 1;
+ 		}
              }
          }
          # If the multipart problem was condensed, "forget" it was multipart
          if (scalar(@parts) == 1) {
              $args->{'multipart'} = 0;
+         } else {
+             # Add part 0 so we display it correctly.
+             unshift @parts, '0';
          }
+ 	{
+ 	    my ($src,$symb,$anchor,$stack);
+ 	    if ($args->{'sort'}) {
+ 		my $it = $navmap->getIterator(undef, undef, undef, 1);
+ 		while ( my $res=$it->next()) {
+ 		    if (ref($res) &&
+ 			$res->symb() eq  $curRes->symb()) { last; }
+ 		}
+ 		$stack=$it->getStack();
+ 	    } else {
+ 		$stack=$it->getStack();
+ 	    }
+ 	    ($src,$symb,$anchor)=getLinkForResource($stack);
+ 	    if (defined($anchor)) { $anchor='#'.$anchor; }
+ 	    my $srcHasQuestion = $src =~ /\?/;
+ 	    $args->{"resourceLink"} = $src.
+ 		($srcHasQuestion?'&':'?') .
+ 		'symb=' . &escape($symb).$anchor;
+ 	}
          # Now, we've decided what parts to show. Loop through them and
          # show them.
-         foreach my $part ('', @parts) {
+         foreach my $part (@parts) {
-             if ($part eq '0') {
-                 next;
-             }
              $rownum ++;
-             my $backgroundColor = $backgroundColors[$rownum % scalar(@backgroundColors)];
-             $result .= "  <tr bgcolor='$backgroundColor'>\n";
+             $result .= &Apache::loncommon::start_data_table_row();
              # 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) {
                  my $colHTML = '';
- Line 1319  sub render {
+ Line 1794  sub render {
                  }
                  $result .= $colHTML . "\n";
              }
-             $result .= "    </tr>\n";
+             $result .= &Apache::loncommon::end_data_table_row();
              $args->{'isNewBranch'} = 0;
          }
- Line 1329  sub render {
+ Line 1804  sub render {
              $r->rflush();
          }
      } continue {
-         $curRes = $it->next();
+ 	if ($r) {
+ 	    # If we have the connection, make sure the user is still connected
+ 	    my $c = $r->connection;
+ 	    if ($c->aborted()) {
+ 		# Who cares what we do, nobody will see it anyhow.
+ 		return '';
+ 	    }
+ 	}
      }
      # Print out the part that jumps to #curloc if it exists
- Line 1340  sub render {
+ Line 1822  sub render {
      # it's quite likely this might fix other browsers, too, and
      # certainly won't hurt anything.
      if ($displayedJumpMarker) {
-         $result .= "<script>setTimeout(\"location += '#curloc';\", 0)</script>\n";
+         $result .= "
+ <script>
+ if (location.href.indexOf('#curloc')==-1) {
+     setTimeout(\"location += '#curloc';\", 0)
+ }
+ </script>";
      }
-     $result .= "</table>";
+     $result.=&Apache::loncommon::end_data_table();
      if ($r) {
          $r->print($result);
          $result = "";
          $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 = ("blank","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">
+                        <span class="LC_nobreak"><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>&nbsp;<input type="button" name="chgnav"
+                    value="Go" onClick="javascript:changeNavDisplay()" />
+                 </span></form></td>'."\n";
      return $result;
  }
+ sub show_linkitems_toolbar {
+     my ($linkitems,$condition)=@_;
+     my @linkorder = ("blank","launchnav","closenav","firsthomework",
+ 		     "everything","uncompleted","changefolder","clearbubbles");
+     my $result .='
+               <td align="left">
+                        <span class="LC_nobreak">'."\n<ul id=\"LC_toolbar\">";
+ 	foreach my $link (@linkorder) {
+         my $link_id = "LC_content_toolbar_".$link;
+ 	if (defined($linkitems->{$link})) {
+ 	    if ($linkitems->{$link}{'text'} ne '') {
+ 		$linkitems->{$link}{'cmd'}=~s/"/'/g;
+ 		if($linkitems->{$link}{'cmd'}){
+                    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="'.$linkitems->{$link}{'cmd'}.'"'.
+                                 ' id="'.$link_id.'"'.
+                                 ' class="LC_toolbarItem"'.
+ 			   	' title="'.$linkitems->{$link}{'text'}.'"></a></li>'."\n";
+ 		}
+ 	    }
+ 	}
+     }
+     $result .= '</ul>';
+     $result .= ' </span></td>'."\n";
+     return $result;
+ }
 ;
  package Apache::lonnavmaps::navmap;
  =pod
- lonnavmaps provides functions and objects for dealing with the
+ =head1 Object: Apache::lonnavmaps::navmap
- 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 Object: navmap
+ =head2 Overview
- Encapsulating the compiled nav map
+ The navmap object's job is to provide access to the resources
+ in the course as Apache::lonnavmaps::resource objects, and to
+ query and manage the relationship between those resource objects.
- navmap is an object that encapsulates a compiled course map and
+ Generally, you'll use the navmap object in one of three basic ways.
- provides a reasonable interface to it.
+ In order of increasing complexity and power:
- Most notably it provides a way to navigate the map sensibly and a
+ =over 4
- flexible iterator that makes it easy to write various renderers based
- on nav maps.
- You must obtain resource objects through the navmap object.
+ =item * C<$navmap-E<gt>getByX>, where X is B<Id>, B<Symb> or B<MapPc> and getResourceByUrl. This provides
+     various ways to obtain resource objects, based on various identifiers.
+     Use this when you want to request information about one object or
+     a handful of resources you already know the identities of, from some
+     other source. For more about Ids, Symbs, and MapPcs, see the
+     Resource documentation. Note that Url should be a B<last resort>,
+     not your first choice; it only really works when there is only one
+     instance of the resource in the course, which only applies to
+     maps, and even that may change in the future (see the B<getResourceByUrl>
+     documentation for more details.)
+ =item * C<my @resources = $navmap-E<gt>retrieveResources(args)>. This
+     retrieves resources matching some criterion and returns them
+     in a flat array, with no structure information. Use this when
+     you are manipulating a series of resources, based on what map
+     the are in, but do not care about branching, or exactly how
+     the maps and resources are related. This is the most common case.
+ =item * C<$it = $navmap-E<gt>getIterator(args)>. This allows you traverse
+     the course's navmap in various ways without writing the traversal
+     code yourself. See iterator documentation below. Use this when
+     you need to know absolutely everything about the course, including
+     branches and the precise relationship between maps and resources.
- =head2 Methods
+ =back
+ =head2 Creation And Destruction
+ To create a navmap object, use the following function:
  =over 4
- =item * B<new>(navHashFile, parmHashFile, genCourseAndUserOptions,
+ =item * B<Apache::lonnavmaps::navmap-E<gt>new>():
-   genMailDiscussStatus):
- Binds a new navmap object to the compiled nav map hash and parm hash
+ Creates a new navmap object. Returns the navmap object if this is
- given as filenames. genCourseAndUserOptions is a flag saying whether
+ successful, or B<undef> if not.
- the course options and user options hash should be generated. This is
- for when you are using the parameters of the resources that require
+ =back
- them; see documentation in resource object
- documentation. genMailDiscussStatus causes the nav map to retreive
+ =head2 Methods
- information about the email and discussion status of
- resources. Returns the navmap object if this is successful, or
+ =over 4
- B<undef> if not. You must check for undef; errors will occur when you
- try to use the other methods otherwise.
  =item * B<getIterator>(first, finish, filter, condition):
- Line 1406  See iterator documentation below.
+ Line 1994  See iterator documentation below.
  use strict;
  use GDBM_File;
+ use Apache::lonnet;
+ use LONCAPA;
  sub new {
      # magic invocation to create a class instance
- Line 1413  sub new {
+ Line 2003  sub new {
      my $class = ref($proto) || $proto;
      my $self = {};
-     $self->{NAV_HASH_FILE} = shift;
-     $self->{PARM_HASH_FILE} = shift;
-     $self->{GENERATE_COURSE_USER_OPT} = shift;
-     $self->{GENERATE_EMAIL_DISCUSS_STATUS} = shift;
      # 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.
      $self->{RESOURCE_CACHE} = {};
- Line 1430  sub new {
+ Line 2015  sub new {
      my %navmaphash;
      my %parmhash;
-     if (!(tie(%navmaphash, 'GDBM_File', $self->{NAV_HASH_FILE},
+     my $courseFn = $env{"request.course.fn"};
+     if (!(tie(%navmaphash, 'GDBM_File', "${courseFn}.db",
                &GDBM_READER(), 0640))) {
          return undef;
      }
-     if (!(tie(%parmhash, 'GDBM_File', $self->{PARM_HASH_FILE},
+     if (!(tie(%parmhash, 'GDBM_File', "${courseFn}_parms.db",
                &GDBM_READER(), 0640)))
      {
          untie %{$self->{PARM_HASH}};
- Line 1444  sub new {
+ Line 2030  sub new {
      $self->{NAV_HASH} = \%navmaphash;
      $self->{PARM_HASH} = \%parmhash;
-     $self->{INITED} = 0;
+     $self->{PARM_CACHE} = {};
      bless($self);
      return $self;
  }
- sub init {
+ sub generate_course_user_opt {
      my $self = shift;
-     if ($self->{INITED}) { return; }
+     if ($self->{COURSE_USER_OPT_GENERATED}) { return; }
-     # If the course opt hash and the user opt hash should be generated,
+     my $uname=$env{'user.name'};
-     # generate them
+     my $udom=$env{'user.domain'};
-     if ($self->{GENERATE_COURSE_USER_OPT}) {
+     my $cid=$env{'request.course.id'};
-         my $uname=$ENV{'user.name'};
+     my $cdom=$env{'course.'.$cid.'.domain'};
-         my $udom=$ENV{'user.domain'};
+     my $cnum=$env{'course.'.$cid.'.num'};
-         my $uhome=$ENV{'user.home'};
-         my $cid=$ENV{'request.course.id'};
-         my $chome=$ENV{'course.'.$cid.'.home'};
-         my ($cdom,$cnum)=split(/\_/,$cid);
-         my $userprefix=$uname.'_'.$udom.'_';
-         my %courserdatas; my %useropt; my %courseopt; my %userrdatas;
-         unless ($uhome eq 'no_host') {
  # ------------------------------------------------- Get coursedata (if present)
-             unless ((time-$courserdatas{$cid.'.last_cache'})<240) {
+     my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
-                 my $reply=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.
+     # Check for network failure
-                                                  ':resourcedata',$chome);
+     if (!ref($courseopt)) {
-                 if ($reply!~/^error\:/) {
+ 	if ( $courseopt =~ /no.such.host/i || $courseopt =~ /con_lost/i) {
-                     $courserdatas{$cid}=$reply;
+ 	    $self->{NETWORK_FAILURE} = 1;
-                     $courserdatas{$cid.'.last_cache'}=time;
+ 	}
-                 }
+ 	undef($courseopt);
-                 # check to see if network failed
+     }
-                 elsif ( $reply=~/no.such.host/i || $reply=~/con.*lost/i )
-                 {
-                     $self->{NETWORK_FAILURE} = 1;
-                 }
-             }
-             foreach (split(/\&/,$courserdatas{$cid})) {
-                 my ($name,$value)=split(/\=/,$_);
-                 $courseopt{$userprefix.&Apache::lonnet::unescape($name)}=
-                     &Apache::lonnet::unescape($value);
-             }
  # --------------------------------------------------- Get userdata (if present)
-             unless ((time-$userrdatas{$uname.'___'.$udom.'.last_cache'})<240) {
-                 my $reply=&Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome);
+     my $useropt=&Apache::lonnet::get_userresdata($uname,$udom);
-                 if ($reply!~/^error\:/) {
+     # Check for network failure
-                     $userrdatas{$uname.'___'.$udom}=$reply;
+     if (!ref($useropt)) {
-                     $userrdatas{$uname.'___'.$udom.'.last_cache'}=time;
+ 	if ( $useropt =~ /no.such.host/i || $useropt =~ /con_lost/i) {
-                 }
+ 	    $self->{NETWORK_FAILURE} = 1;
-                 # check to see if network failed
+ 	}
-                 elsif ( $reply=~/no.such.host/i || $reply=~/con.*lost/i )
+ 	undef($useropt);
-                 {
+     }
-                     $self->{NETWORK_FAILURE} = 1;
-                 }
+     $self->{COURSE_OPT} = $courseopt;
+     $self->{USER_OPT} = $useropt;
+     $self->{COURSE_USER_OPT_GENERATED} = 1;
+     return;
+ }
+ sub generate_email_discuss_status {
+     my $self = shift;
+     my $symb = shift;
+     if ($self->{EMAIL_DISCUSS_GENERATED}) { return; }
+     my $cid=$env{'request.course.id'};
+     my $cdom=$env{'course.'.$cid.'.domain'};
+     my $cnum=$env{'course.'.$cid.'.num'};
+     my %emailstatus = &Apache::lonnet::dump('email_status');
+     my $logoutTime = $emailstatus{'logout'};
+     my $courseLeaveTime = $emailstatus{'logout_'.$env{'request.course.id'}};
+     $self->{LAST_CHECK} = (($courseLeaveTime > $logoutTime) ?
+ 			   $courseLeaveTime : $logoutTime);
+     my %discussiontime = &Apache::lonnet::dump('discussiontimes',
+ 					       $cdom, $cnum);
+     my %lastread = &Apache::lonnet::dump('nohist_'.$cid.'_discuss',
+                                         $env{'user.domain'},$env{'user.name'},'lastread');
+     my %lastreadtime = ();
+     foreach my $key (keys %lastread) {
+         my $shortkey = $key;
+         $shortkey =~ s/_lastread$//;
+         $lastreadtime{$shortkey} = $lastread{$key};
+     }
+     my %feedback=();
+     my %error=();
+     my @keys = &Apache::lonnet::getkeys('nohist_email',$env{'user.domain'},
+ 					$env{'user.name'});
+     foreach my $msgid (@keys) {
+ 	if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
+             my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,
+                 $symb,$error) = &Apache::lonmsg::unpackmsgid($msgid);
+             &Apache::lonenc::check_decrypt(\$symb);
+             if (($fromcid ne '') && ($fromcid ne $cid)) {
+                 next;
              }
-             foreach (split(/\&/,$userrdatas{$uname.'___'.$udom})) {
+             if (defined($symb)) {
-                 my ($name,$value)=split(/\=/,$_);
+                 if (defined($error) && $error == 1) {
-                 $useropt{$userprefix.&Apache::lonnet::unescape($name)}=
+                     $error{$symb}.=','.$msgid;
-                     &Apache::lonnet::unescape($value);
+                 } else {
-             }
+                     $feedback{$symb}.=','.$msgid;
-             $self->{COURSE_OPT} = \%courseopt;
-             $self->{USER_OPT} = \%useropt;
-         }
-     }
-     if ($self->{GENERATE_EMAIL_DISCUSS_STATUS}) {
-         my $cid=$ENV{'request.course.id'};
-         my ($cdom,$cnum)=split(/\_/,$cid);
-         my %emailstatus = &Apache::lonnet::dump('email_status');
-         my $logoutTime = $emailstatus{'logout'};
-         my $courseLeaveTime = $emailstatus{'logout_'.$ENV{'request.course.id'}};
-         $self->{LAST_CHECK} = ($courseLeaveTime < $logoutTime ?
-                                $courseLeaveTime : $logoutTime);
-         my %discussiontime = &Apache::lonnet::dump('discussiontimes',
-                                                    $cdom, $cnum);
-         my %feedback=();
-         my %error=();
-         my $keys = &Apache::lonnet::reply('keys:'.
-                                           $ENV{'user.domain'}.':'.
-                                           $ENV{'user.name'}.':nohist_email',
-                                           $ENV{'user.home'});
-         foreach my $msgid (split(/\&/, $keys)) {
-             $msgid=&Apache::lonnet::unescape($msgid);
-             my $plain=&Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid));
-             if ($plain=~/(Error|Feedback) \[([^\]]+)\]/) {
-                 my ($what,$url)=($1,$2);
-                 my %status=
-                     &Apache::lonnet::get('email_status',[$msgid]);
-                 if ($status{$msgid}=~/^error\:/) {
-                     $status{$msgid}='';
                  }
+             } else {
-                 if (($status{$msgid} eq 'new') ||
+                 my $plain=
-                     (!$status{$msgid})) {
+                     &LONCAPA::unescape(&LONCAPA::unescape($msgid));
-                     if ($what eq 'Error') {
+                 if ($plain=~/ \[([^\]]+)\]\:/) {
-                         $error{$url}.=','.$msgid;
+                     my $url=$1;
+                     if ($plain=~/\:Error \[/) {
+                         $error{$url}.=','.$msgid;
                      } else {
                          $feedback{$url}.=','.$msgid;
                      }
                  }
              }
-         }
+ 	}
+     }
-         $self->{FEEDBACK} = \%feedback;
-         $self->{ERROR_MSG} = \%error; # what is this? JB
+     #symbs of resources that have feedbacks (will be urls pre-2.3)
-         $self->{DISCUSSION_TIME} = \%discussiontime;
+     $self->{FEEDBACK} = \%feedback;
-         $self->{EMAIL_STATUS} = \%emailstatus;
+     #or errors (will be urls pre 2.3)
+     $self->{ERROR_MSG} = \%error;
-     }
+     $self->{DISCUSSION_TIME} = \%discussiontime;
+     $self->{EMAIL_STATUS} = \%emailstatus;
+     $self->{LAST_READ} = \%lastreadtime;
+     $self->{EMAIL_DISCUSS_GENERATED} = 1;
+ }
-     $self->{PARM_CACHE} = {};
+ sub get_user_data {
-     $self->{INITED} = 1;
+     my $self = shift;
+     if ($self->{RETRIEVED_USER_DATA}) { return; }
+     # Retrieve performance data on problems
+     my %student_data = Apache::lonnet::currentdump($env{'request.course.id'},
+ 						   $env{'user.domain'},
+ 						   $env{'user.name'});
+     $self->{STUDENT_DATA} = \%student_data;
+     $self->{RETRIEVED_USER_DATA} = 1;
+ }
+ sub get_discussion_data {
+     my $self = shift;
+     if ($self->{RETRIEVED_DISCUSSION_DATA}) {
+ 	return $self->{DISCUSSION_DATA};
+     }
+     $self->generate_email_discuss_status();
+     my $cid=$env{'request.course.id'};
+     my $cdom=$env{'course.'.$cid.'.domain'};
+     my $cnum=$env{'course.'.$cid.'.num'};
+     # Retrieve discussion data for resources in course
+     my %discussion_data = &Apache::lonnet::dumpstore($cid,$cdom,$cnum);
+     $self->{DISCUSSION_DATA} = \%discussion_data;
+     $self->{RETRIEVED_DISCUSSION_DATA} = 1;
+     return $self->{DISCUSSION_DATA};
  }
  # Internal function: Takes a key to look up in the nav hash and implements internal
  # memory caching of that key.
  sub navhash {
- Line 1569  sub navhash {
+ Line 2187  sub navhash {
      return $self->{NAV_HASH}->{$key};
  }
+ =pod
+ =item * B<courseMapDefined>(): Returns true if the course map is defined,
+     false otherwise. Undefined course maps indicate an error somewhere in
+     LON-CAPA, and you will not be able to proceed with using the navmap.
+     See the B<NAV> screen for an example of using this.
+ =cut
  # Checks to see if coursemap is defined, matching test in old lonnavmaps
  sub courseMapDefined {
      my $self = shift;
-     my $uri = &Apache::lonnet::clutter($ENV{'request.course.uri'});
+     my $uri = &Apache::lonnet::clutter($env{'request.course.uri'});
      my $firstres = $self->navhash("map_start_$uri");
      my $lastres = $self->navhash("map_finish_$uri");
- Line 1582  sub courseMapDefined {
+ Line 2209  sub courseMapDefined {
  sub getIterator {
      my $self = shift;
      my $iterator = Apache::lonnavmaps::iterator->new($self, shift, shift,
-                                                      shift, undef, shift);
+                                                      shift, undef, shift,
+ 						     shift, shift);
      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
  # current discussion? Returns 0 if chat/mail data not extracted.
  sub hasDiscussion {
      my $self = shift;
      my $symb = shift;
+     $self->generate_email_discuss_status();
      if (!defined($self->{DISCUSSION_TIME})) { return 0; }
      #return defined($self->{DISCUSSION_TIME}->{$symb});
-     return $self->{DISCUSSION_TIME}->{$symb} >
-            $self->{LAST_CHECK};
+     # backward compatibility (bulletin boards used to be 'wrapped')
+     my $ressymb = $self->wrap_symb($symb);
+     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).
+     }
+ }
+ sub last_post_time {
+     my $self = shift;
+     my $symb = shift;
+     my $ressymb = $self->wrap_symb($symb);
+     return $self->{DISCUSSION_TIME}->{$ressymb};
+ }
+ sub discussion_info {
+     my $self = shift;
+     my $symb = shift;
+     my $filter = shift;
+     $self->get_discussion_data();
+     my $ressymb = $self->wrap_symb($symb);
+     # keys used to store bulletinboard postings use 'unwrapped' symb.
+     my $discsymb = &escape($self->unwrap_symb($ressymb));
+     my $version = $self->{DISCUSSION_DATA}{'version:'.$discsymb};
+     if (!$version) { return; }
+     my $prevread = $self->{LAST_READ}{$ressymb};
+     my $count = 0;
+     my $hiddenflag = 0;
+     my $deletedflag = 0;
+     my ($hidden,$deleted,%info);
+     for (my $id=$version; $id>0; $id--) {
+ 	my $vkeys=$self->{DISCUSSION_DATA}{$id.':keys:'.$discsymb};
+ 	my @keys=split(/:/,$vkeys);
+ 	if (grep(/^hidden$/ ,@keys)) {
+ 	    if (!$hiddenflag) {
+ 		$hidden = $self->{DISCUSSION_DATA}{$id.':'.$discsymb.':hidden'};
+ 		$hiddenflag = 1;
+ 	    }
+ 	} elsif (grep(/^deleted$/,@keys)) {
+ 	    if (!$deletedflag) {
+ 		$deleted = $self->{DISCUSSION_DATA}{$id.':'.$discsymb.':deleted'};
+ 		$deletedflag = 1;
+ 	    }
+ 	} else {
+ 	    if (($hidden !~/\.$id\./) && ($deleted !~/\.$id\./)) {
+                 if ($filter eq 'unread') {
+ 		    if ($prevread >= $self->{DISCUSSION_DATA}{$id.':'.$discsymb.':timestamp'}) {
+                         next;
+                     }
+                 }
+ 		$count++;
+ 		$info{$count}{'subject'} =
+ 		    $self->{DISCUSSION_DATA}{$id.':'.$discsymb.':subject'};
+                 $info{$count}{'id'} = $id;
+                 $info{$count}{'timestamp'} = $self->{DISCUSSION_DATA}{$id.':'.$discsymb.':timestamp'};
+             }
+ 	}
+     }
+     if (wantarray) {
+ 	return ($count,%info);
+     }
+     return $count;
+ }
+ sub wrap_symb {
+     my $self = shift;
+     my $symb = shift;
+     if ($symb =~ m-___(adm/[^/]+/[^/]+/)(\d+)(/bulletinboard)$-) {
+         unless ($symb =~ m|adm/wrapper/adm|) {
+             $symb = 'bulletin___'.$2.'___adm/wrapper/'.$1.$2.$3;
+         }
+     }
+     return $symb;
+ }
+ sub unwrap_symb {
+     my $self = shift;
+     my $ressymb = shift;
+     my $discsymb = $ressymb;
+     if ($ressymb =~ m-^(bulletin___\d+___)adm/wrapper/(adm/[^/]+/[^/]+/\d+/bulletinboard)$-) {
+          $discsymb = $1.$2;
+     }
+     return $discsymb;
  }
  # 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 {
      my $self = shift;
      my $symb = shift;
+     my $source = shift;
+     $self->generate_email_discuss_status();
      if (!defined($self->{FEEDBACK})) { return ""; }
-     return $self->{FEEDBACK}->{$symb};
+     my $feedback;
+     if ($self->{FEEDBACK}->{$symb}) {
+         $feedback = $self->{FEEDBACK}->{$symb};
+         if ($self->{FEEDBACK}->{$source}) {
+             $feedback .= ','.$self->{FEEDBACK}->{$source};
+         }
+     } else {
+         if ($self->{FEEDBACK}->{$source}) {
+             $feedback = $self->{FEEDBACK}->{$source};
+         }
+     }
+     return $feedback;
  }
  # Private method: Get the errors for that resource (by source).
  sub getErrors {
      my $self = shift;
+     my $symb = shift;
      my $src = shift;
+     $self->generate_email_discuss_status();
      if (!defined($self->{ERROR_MSG})) { return ""; }
-     return $self->{ERROR_MSG}->{$src};
+     my $errors;
+     if ($self->{ERROR_MSG}->{$symb}) {
+         $errors = $self->{ERROR_MSG}->{$symb};
+         if ($self->{ERROR_MSG}->{$src}) {
+             $errors .= ','.$self->{ERROR_MSG}->{$src};
+         }
+     } else {
+         if ($self->{ERROR_MSG}->{$src}) {
+             $errors = $self->{ERROR_MSG}->{$src};
+         }
+     }
+     return $errors;
  }
  =pod
- Line 1635  object for that resource. This method, o
+ Line 2377  object for that resource. This method, o
  (as in the resource object) is the only proper way to obtain a
  resource object.
+ =item * B<getBySymb>(symb):
+ Based on the symb of the resource, get a resource object for that
+ resource. This is one of the proper ways to get a resource object.
+ =item * B<getMapByMapPc>(map_pc):
+ Based on the map_pc of the resource, get a resource object for
+ the given map. This is one of the proper ways to get a resource object.
  =cut
  # The strategy here is to cache the resource objects, and only construct them
  # as we use them. The real point is to prevent reading any more from the tied
- # hash then we have to, which should hopefully alleviate speed problems.
+ # hash than we have to, which should hopefully alleviate speed problems.
- # Caching is just an incidental detail I throw in because it makes sense.
  sub getById {
      my $self = shift;
- Line 1660  sub getById {
+ Line 2411  sub getById {
  sub getBySymb {
      my $self = shift;
      my $symb = shift;
-     my ($mapUrl, $id, $filename) = split (/___/, $symb);
+     my ($mapUrl, $id, $filename) = &Apache::lonnet::decode_symb($symb);
      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 {
+     my $self = shift;
+     my $map_pc = shift;
+     my $map_id = $self->{NAV_HASH}->{'map_id_' . $map_pc};
+     $map_id = $self->{NAV_HASH}->{'ids_' . $map_id};
+     return $self->getById($map_id);
  }
  =pod
- Line 1677  resource in the navmap.
+ Line 2441  resource in the navmap.
  sub firstResource {
      my $self = shift;
      my $firstResource = $self->navhash('map_start_' .
-                      &Apache::lonnet::clutter($ENV{'request.course.uri'}));
+                      &Apache::lonnet::clutter($env{'request.course.uri'}));
      return $self->getById($firstResource);
  }
- Line 1693  in the navmap.
+ Line 2457  in the navmap.
  sub finishResource {
      my $self = shift;
      my $firstResource = $self->navhash('map_finish_' .
-                      &Apache::lonnet::clutter($ENV{'request.course.uri'}));
+                      &Apache::lonnet::clutter($env{'request.course.uri'}));
      return $self->getById($firstResource);
  }
- Line 1701  sub finishResource {
+ Line 2465  sub finishResource {
  # the actual lookup; parmval caches the results.
  sub parmval {
      my $self = shift;
-     my ($what,$symb)=@_;
+     my ($what,$symb,$recurse)=@_;
      my $hashkey = $what."|||".$symb;
      if (defined($self->{PARM_CACHE}->{$hashkey})) {
-         return $self->{PARM_CACHE}->{$hashkey};
+         if (ref($self->{PARM_CACHE}->{$hashkey}) eq 'ARRAY') {
+             if (defined($self->{PARM_CACHE}->{$hashkey}->[0])) {
+                 if (wantarray) {
+                     return @{$self->{PARM_CACHE}->{$hashkey}};
+                 } else {
+                     return $self->{PARM_CACHE}->{$hashkey}->[0];
+                 }
+             }
+         } else {
+             return $self->{PARM_CACHE}->{$hashkey};
+         }
      }
+     my $result = $self->parmval_real($what, $symb, $recurse);
-     my $result = $self->parmval_real($what, $symb);
      $self->{PARM_CACHE}->{$hashkey} = $result;
-     return $result;
+     if (wantarray) {
+         return @{$result};
+     }
+     return $result->[0];
  }
  sub parmval_real {
      my $self = shift;
-     my ($what,$symb) = @_;
+     my ($what,$symb,$recurse) = @_;
-     my $cid=$ENV{'request.course.id'};
+     # Make sure the {USER_OPT} and {COURSE_OPT} hashes are populated
-     my $csec=$ENV{'request.course.sec'};
+     $self->generate_course_user_opt();
-     my $uname=$ENV{'user.name'};
-     my $udom=$ENV{'user.domain'};
-     unless ($symb) { return ''; }
+     my $cid=$env{'request.course.id'};
-     my $result='';
+     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=$env{'user.name'};
+     my $udom=$env{'user.domain'};
-     my ($mapname,$id,$fn)=split(/\_\_\_/,$symb);
+     unless ($symb) { return ['']; }
+     my $result='';
+     my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb);
+     $mapname = &Apache::lonnet::deversion($mapname);
  # ----------------------------------------------------- Cascading lookup scheme
      my $rwhat=$what;
      $what=~s/^parameter\_//;
- Line 1734  sub parmval_real {
+ Line 2519  sub parmval_real {
      my $symbparm=$symb.'.'.$what;
      my $mapparm=$mapname.'___(all).'.$what;
-     my $usercourseprefix=$uname.'_'.$udom.'_'.$cid;
+     my $usercourseprefix=$cid;
+     my $grplevel=$usercourseprefix.'.['.$cgroup.'].'.$what;
+     my $grplevelr=$usercourseprefix.'.['.$cgroup.'].'.$symbparm;
+     my $grplevelm=$usercourseprefix.'.['.$cgroup.'].'.$mapparm;
      my $seclevel= $usercourseprefix.'.['.$csec.'].'.$what;
      my $seclevelr=$usercourseprefix.'.['.$csec.'].'.$symbparm;
- Line 1750  sub parmval_real {
+ Line 2539  sub parmval_real {
  # ---------------------------------------------------------- first, check user
      if ($uname and defined($useropt)) {
-         if (defined($$useropt{$courselevelr})) { return $$useropt{$courselevelr}; }
+         if (defined($$useropt{$courselevelr})) { return [$$useropt{$courselevelr},'resource']; }
-         if (defined($$useropt{$courselevelm})) { return $$useropt{$courselevelm}; }
+         if (defined($$useropt{$courselevelm})) { return [$$useropt{$courselevelm},'map']; }
-         if (defined($$useropt{$courselevel})) { return $$useropt{$courselevel}; }
+         if (defined($$useropt{$courselevel})) { return [$$useropt{$courselevel},'course']; }
      }
  # ------------------------------------------------------- second, check course
+     if ($cgroup ne '' and defined($courseopt)) {
+         if (defined($$courseopt{$grplevelr})) { return [$$courseopt{$grplevelr},'resource']; }
+         if (defined($$courseopt{$grplevelm})) { return [$$courseopt{$grplevelm},'map']; }
+         if (defined($$courseopt{$grplevel})) { return [$$courseopt{$grplevel},'course']; }
+     }
      if ($csec and defined($courseopt)) {
-         if (defined($$courseopt{$seclevelr})) { return $$courseopt{$seclevelr}; }
+         if (defined($$courseopt{$seclevelr})) { return [$$courseopt{$seclevelr},'resource']; }
-         if (defined($$courseopt{$seclevelm})) { return $$courseopt{$seclevelm}; }
+         if (defined($$courseopt{$seclevelm})) { return [$$courseopt{$seclevelm},'map']; }
-         if (defined($$courseopt{$seclevel})) { return $$courseopt{$seclevel}; }
+         if (defined($$courseopt{$seclevel})) { return [$$courseopt{$seclevel},'course']; }
      }
      if (defined($courseopt)) {
-         if (defined($$courseopt{$courselevelr})) { return $$courseopt{$courselevelr}; }
+         if (defined($$courseopt{$courselevelr})) { return [$$courseopt{$courselevelr},'resource']; }
-         if (defined($$courseopt{$courselevelm})) { return $$courseopt{$courselevelm}; }
-         if (defined($$courseopt{$courselevel})) { return $$courseopt{$courselevel}; }
      }
  # ----------------------------------------------------- third, check map parms
      my $thisparm=$$parmhash{$symbparm};
-     if (defined($thisparm)) { return $thisparm; }
+     if (defined($thisparm)) { return [$thisparm,'map']; }
  # ----------------------------------------------------- fourth , check default
-     my $default=&Apache::lonnet::metadata($fn,$rwhat.'.default');
+     my $meta_rwhat=$rwhat;
-     if (defined($default)) { return $default}
+     $meta_rwhat=~s/\./_/g;
+     my $default=&Apache::lonnet::metadata($fn,$meta_rwhat);
- # --------------------------------------------------- fifth , cascade up parts
+     if (defined($default)) { return [$default,'resource']}
+     $default=&Apache::lonnet::metadata($fn,'parameter_'.$meta_rwhat);
+     if (defined($default)) { return [$default,'resource']}
+ # --------------------------------------------------- fifth, check more course
+     if (defined($courseopt)) {
+         if (defined($$courseopt{$courselevelm})) { return [$$courseopt{$courselevelm},'map']; }
+         if (defined($$courseopt{$courselevel})) {
+            my $ret = [$$courseopt{$courselevel},'course'];
+            return $ret;
+        }
+     }
+ # --------------------------------------------------- sixth , cascade up parts
      my ($space,@qualifier)=split(/\./,$rwhat);
      my $qualifier=join('.',@qualifier);
- Line 1787  sub parmval_real {
+ Line 2591  sub parmval_real {
  	my $id=pop(@parts);
  	my $part=join('_',@parts);
  	if ($part eq '') { $part='0'; }
- 	my $partgeneral=$self->parmval($part.".$qualifier",$symb);
+        my @partgeneral=$self->parmval($part.".$qualifier",$symb,1);
- 	if (defined($partgeneral)) { return $partgeneral; }
+        if (defined($partgeneral[0])) { return \@partgeneral; }
      }
-     return '';
+     if ($recurse) { return []; }
+     my $pack_def=&Apache::lonnet::packages_tab_default($fn,'resource.'.$rwhat);
+     if (defined($pack_def)) { return [$pack_def,'resource']; }
+     return [''];
  }
  =pod
- =item * B<getResourceByUrl>(url):
+ =item * B<getResourceByUrl>(url,multiple):
- Retrieves a resource object by URL of the resource. If passed a
+ Retrieves a resource object by URL of the resource, unless the optional
- resource object, it will simply return it, so it is safe to use this
+ multiple parameter is included in which case an array of resource
- method in code like "$res = $navmap->getResourceByUrl($res)", if
+ objects is returned. If passed a resource object, it will simply return
- you're not sure if $res is already an object, or just a URL. If the
+ it, so it is safe to use this method in code like
- resource appears multiple times in the course, only the first instance
+ "$res = $navmap->getResourceByUrl($res)"
- will be returned. As a result, this is probably useful only for maps.
+ if you're not sure if $res is already an object, or just a URL. If the
+ resource appears multiple times in the course, only the first instance
+ will be returned (useful for maps), unless the multiple parameter has
+ been included, in which case all instances are returned in an array.
- =item * B<retrieveResources>(map, filterFunc, recursive, bailout):
+ =item * B<retrieveResources>(map, filterFunc, recursive, bailout, showall):
  The map is a specification of a map to retreive the resources from,
  either as a url or as an object. The filterFunc is a reference to a
- Line 1812  function that takes a resource object as
+ Line 2622  function that takes a resource object as
  true if the resource should be included, or false if it should not
  be. If recursive is true, the map will be recursively examined,
  otherwise it will not be. If bailout is true, the function will return
- as soon as it finds a resource, if false it will finish. By default,
+ as soon as it finds a resource, if false it will finish. If showall is
- the map is the top-level map of the course, filterFunc is a function
+ true it will not hide maps that contain nothing but one other map. By
- that always returns 1, recursive is true, bailout is false. The
+ default, the map is the top-level map of the course, filterFunc is a
- resources will be returned in a list containing the resource objects
+ function that always returns 1, recursive is true, bailout is false,
- for the corresponding resources, with B<no structure information> in
+ showall is false. The resources will be returned in a list containing
- the list; regardless of branching, recursion, etc., it will be a flat
+ the resource objects for the corresponding resources, with B<no
- list.
+ structure information> in the list; regardless of branching,
+ recursion, etc., it will be a flat list.
  Thus, this is suitable for cases where you don't want the structure,
  just a list of all resources. It is also suitable for finding out how
- Line 1827  want to know is if I<any> resources matc
+ Line 2638  want to know is if I<any> resources matc
  parameter will allow you to avoid potentially expensive enumeration of
  all matching resources.
- =item * B<hasResources>(map, filterFunc, recursive):
+ =item * B<hasResource>(map, filterFunc, recursive, showall):
- Convience method for
+ Convenience method for
-  scalar(retrieveResources($map, $filterFunc, $recursive, 1)) > 0
+  scalar(retrieveResources($map, $filterFunc, $recursive, 1, $showall)) > 0
  which will tell whether the map has resources matching the description
  in the filter function.
+ =item * B<usedVersion>(url):
+ Retrieves version infomation for a url. Returns the version (a number, or
+ the string "mostrecent") for resources which have version information in
+ the big hash.
  =cut
  sub getResourceByUrl {
      my $self = shift;
      my $resUrl = shift;
+     my $multiple = shift;
      if (ref($resUrl)) { return $resUrl; }
      $resUrl = &Apache::lonnet::clutter($resUrl);
      my $resId = $self->{NAV_HASH}->{'ids_' . $resUrl};
-     if ($resId =~ /,/) {
-         $resId = (split (/,/, $resId))[0];
-     }
      if (!$resId) { return ''; }
-     return $self->getById($resId);
+     if ($multiple) {
+         my @resources = ();
+         my @resIds = split (/,/, $resId);
+         foreach my $id (@resIds) {
+             my $resourceId = $self->getById($id);
+             if ($resourceId) {
+                 push(@resources,$resourceId);
+             }
+         }
+         return @resources;
+     } else {
+         if ($resId =~ /,/) {
+             $resId = (split (/,/, $resId))[0];
+         }
+         return $self->getById($resId);
+     }
  }
  sub retrieveResources {
- Line 1864  sub retrieveResources {
+ Line 2695  sub retrieveResources {
      if (!defined($recursive)) { $recursive = 1; }
      my $bailout = shift;
      if (!defined($bailout)) { $bailout = 0; }
+     my $showall = shift;
      # Create the necessary iterator.
      if (!ref($map)) { # assume it's a url of a map.
          $map = $self->getResourceByUrl($map);
      }
+     # If nothing was passed, assume top-level map
+     if (!$map) {
+ 	$map = $self->getById('0.0');
+     }
      # Check the map's validity.
-     if (!$map || !$map->is_map()) {
+     if (!$map->is_map()) {
          # Oh, to throw an exception.... how I'd love that!
          return ();
      }
      # Get an iterator.
      my $it = $self->getIterator($map->map_start(), $map->map_finish(),
-                                 !$recursive);
+                                 undef, $recursive, $showall);
      my @resources = ();
+     if (&$filterFunc($map)) {
+ 	push(@resources, $map);
+     }
      # Run down the iterator and collect the resources.
-     my $depth = 1;
+     my $curRes;
-     $it->next();
-     my $curRes = $it->next();
+     while ($curRes = $it->next()) {
-     while ($depth > 0) {
-         if ($curRes == $it->BEGIN_MAP()) {
-             $depth++;
-         }
-         if ($curRes == $it->END_MAP()) {
-             $depth--;
-         }
          if (ref($curRes)) {
              if (!&$filterFunc($curRes)) {
                  next;
              }
-             push @resources, $curRes;
+             push(@resources, $curRes);
              if ($bailout) {
                  return @resources;
              }
          }
-         $curRes = $it->next();
      }
      return @resources;
- Line 1918  sub hasResource {
+ Line 2748  sub hasResource {
      my $map = shift;
      my $filterFunc = shift;
      my $recursive = shift;
+     my $showall = shift;
-     return scalar($self->retrieveResources($map, $filterFunc, $recursive, 1)) > 0;
+     return scalar($self->retrieveResources($map, $filterFunc, $recursive, 1, $showall)) > 0;
+ }
+ sub usedVersion {
+     my $self = shift;
+     my $linkurl = shift;
+     return $self->navhash("version_$linkurl");
  }
 ;
  package Apache::lonnavmaps::iterator;
+ use Scalar::Util qw(weaken);
+ use Apache::lonnet;
  =pod
- Line 1959  corresponds to where you want the iterat
+ Line 2798  corresponds to where you want the iterat
  navmap->finishResource(). filterHash is a hash used as a set
  containing strings representing the resource IDs, defaulting to
  empty. Condition is a 1 or 0 that sets what to do with the filter
- hash: If a 0, then only resource that exist IN the filterHash will be
+ hash: If a 0, then only resources that exist IN the filterHash will be
  recursed on. If it is a 1, only resources NOT in the filterHash will
  be recursed on. Defaults to 0. forceTop is a boolean value. If it is
  false (default), the iterator will only return the first level of map
- Line 1983  new branch. The possible tokens are:
+ Line 2822  new branch. The possible tokens are:
  =over 4
- =item * BEGIN_MAP:
+ =item * B<END_ITERATOR>:
+ The iterator has returned all that it's going to. Further calls to the
+ iterator will just produce more of these. This is a "false" value, and
+ is the only false value the iterator which will be returned, so it can
+ be used as a loop sentinel.
+ =item * B<BEGIN_MAP>:
  A new map is being recursed into. This is returned I<after> the map
  resource itself is returned.
- =item * END_MAP:
+ =item * B<END_MAP>:
  The map is now done.
- =item * BEGIN_BRANCH:
+ =item * B<BEGIN_BRANCH>:
  A branch is now starting. The next resource returned will be the first
  in that branch.
- =item * END_BRANCH:
+ =item * B<END_BRANCH>:
  The branch is now done.
- Line 2015  but only one resource will be returned.
+ Line 2861  but only one resource will be returned.
  =back
+ =head2 Normal Usage
+ Normal usage of the iterator object is to do the following:
+  my $it = $navmap->getIterator([your params here]);
+  my $curRes;
+  while ($curRes = $it->next()) {
+    [your logic here]
+  }
+ Note that inside of the loop, it's frequently useful to check if
+ "$curRes" is a reference or not with the reference function; only
+ resource objects will be references, and any non-references will
+ be the tokens described above.
+ Also note there is some old code floating around that trys to track
+ the depth of the iterator to see when it's done; do not copy that
+ code. It is difficult to get right and harder to understand than
+ this. They should be migrated to this new style.
  =cut
  # Here are the tokens for the iterator:
+ sub END_ITERATOR { return 0; }
  sub BEGIN_MAP { return 1; }    # begining of a new map
  sub END_MAP { return 2; }      # end of the map
  sub BEGIN_BRANCH { return 3; } # beginning of a branch
- Line 2031  sub min {
+ Line 2898  sub min {
      if ($a < $b) { return $a; } else { return $b; }
  }
- # In the CVS repository, documentation of this algorithm is included
- # in /doc/lonnavdocs, as a PDF and .tex source. Markers like **1**
- # will reference the same location in the text as the part of the
- # algorithm is running through.
  sub new {
      # magic invocation to create a class instance
      my $proto = shift;
      my $class = ref($proto) || $proto;
      my $self = {};
-     $self->{NAV_MAP} = shift;
+     weaken($self->{NAV_MAP} = shift);
      return undef unless ($self->{NAV_MAP});
      # Handle the parameters
- Line 2091  sub new {
+ Line 2953  sub new {
      # that isn't just a redirector.
      my $resource; my $resourceCount = 0;
+     # Documentation on this algorithm can be found in the CVS repository at
+     # /docs/lonnavdocs; these "**#**" markers correspond to documentation
+     # in that file.
      # **1**
      foreach my $pass (@iterations) {
- Line 2106  sub new {
+ Line 2971  sub new {
          # prime the recursion
          $self->{$firstResourceName}->{DATA}->{$valName} = 0;
-         my $depth = 0;
+ 	$iterator->next();
-         $iterator->next();
          my $curRes = $iterator->next();
-         while ($depth > -1) {
+ 	my $depth = 1;
-             if ($curRes == $iterator->BEGIN_MAP()) { $depth++; }
+         while ($depth > 0) {
-             if ($curRes == $iterator->END_MAP()) { $depth--; }
+ 	    if ($curRes == $iterator->BEGIN_MAP()) { $depth++; }
+ 	    if ($curRes == $iterator->END_MAP()) { $depth--; }
              if (ref($curRes)) {
                  # If there's only one resource, this will save it
                  # we have to filter empty resources from consideration here,
- Line 2145  sub new {
+ Line 3010  sub new {
                  $curRes->{DATA}->{DISPLAY_DEPTH} = $finalDepth;
                  if ($finalDepth > $maxDepth) {$maxDepth = $finalDepth;}
-                 }
+             }
-             $curRes = $iterator->next();
+ 	    $curRes = $iterator->next();
          }
      }
      # 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 $finishResource = $resource->map_finish();
          return
              Apache::lonnavmaps::iterator->new($self->{NAV_MAP}, $firstResource,
                                                $finishResource, $self->{FILTER},
                                                $self->{ALREADY_SEEN},
-                                               $self->{CONDITION}, 0);
+                                               $self->{CONDITION},
+ 					      $self->{FORCE_TOP});
      }
- Line 2167  sub new {
+ Line 3034  sub new {
      $self->{MAX_DEPTH} = $maxDepth;
      $self->{STACK} = [];
      $self->{RECURSIVE_ITERATOR_FLAG} = 0;
+     $self->{FINISHED} = 0; # When true, the iterator has finished
      for (my $i = 0; $i <= $self->{MAX_DEPTH}; $i++) {
          push @{$self->{STACK}}, [];
- Line 2183  sub new {
+ Line 3051  sub new {
  sub next {
      my $self = shift;
+     my $closeAllPages=shift;
+     if ($self->{FINISHED}) {
+ 	return END_ITERATOR();
+     }
      # If we want to return the top-level map object, and haven't yet,
      # do so.
- Line 2190  sub next {
+ Line 3062  sub next {
          $self->{HAVE_RETURNED_0} = 1;
          return $self->{NAV_MAP}->getById('0.0');
      }
+     if ($self->{RETURN_0} && !$self->{HAVE_RETURNED_0_BEGIN_MAP}) {
+ 	$self->{HAVE_RETURNED_0_BEGIN_MAP} = 1;
+ 	return $self->BEGIN_MAP();
+     }
      if ($self->{RECURSIVE_ITERATOR_FLAG}) {
          # 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
          if ($next == BEGIN_MAP() ) { $self->{RECURSIVE_DEPTH}++; }
- Line 2243  sub next {
+ Line 3119  sub next {
              $self->{CURRENT_DEPTH}--;
              return END_BRANCH();
          } else {
+ 	    $self->{FINISHED} = 1;
              return END_MAP();
          }
      }
- Line 2290  sub next {
+ Line 3167  sub next {
      }
      # Is this the end of a branch? If so, all of the resources examined above
-     # led to lower levels then the one we are currently at, so we push a END_BRANCH
+     # led to lower levels than the one we are currently at, so we push a END_BRANCH
      # marker onto the stack so we don't forget.
      # Example: For the usual A(BC)(DE)F case, when the iterator goes down the
      # BC branch and gets to C, it will see F as the only next resource, but it's
- Line 2306  sub next {
+ Line 3183  sub next {
      # That ends the main iterator logic. Now, do we want to recurse
      # 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})) {
          $self->{RECURSIVE_ITERATOR_FLAG} = 1;
          my $firstResource = $self->{HERE}->map_start();
- Line 2315  sub next {
+ Line 3192  sub next {
          $self->{RECURSIVE_ITERATOR} =
              Apache::lonnavmaps::iterator->new($self->{NAV_MAP}, $firstResource,
                                                $finishResource, $self->{FILTER},
-                                               $self->{ALREADY_SEEN}, $self->{CONDITION});
+                                               $self->{ALREADY_SEEN},
+ 					      $self->{CONDITION},
+ 					      $self->{FORCE_TOP});
      }
      # If this is a blank resource, don't actually return it.
- Line 2324  sub next {
+ Line 3203  sub next {
      my $browsePriv = $self->{HERE}->browsePriv();
      if (!$self->{HERE}->src() ||
          (!($browsePriv eq 'F') && !($browsePriv eq '2')) ) {
-         return $self->next();
+         return $self->next($closeAllPages);
      }
      return $self->{HERE};
- Line 2368  sub populateStack {
+ Line 3247  sub populateStack {
 ;
  package Apache::lonnavmaps::DFSiterator;
+ use Scalar::Util qw(weaken);
+ use Apache::lonnet;
  # 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
- Line 2376  package Apache::lonnavmaps::DFSiterator;
+ Line 3257  package Apache::lonnavmaps::DFSiterator;
  #  useful for pre-processing of some kind, and is in fact used by the main
  #  iterator that way, but that's about it.
  # 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
  # Unlike the main iterator, this DOES return all resources, even blank ones.
- Line 2396  sub new {
+ Line 3277  sub new {
      my $class = ref($proto) || $proto;
      my $self = {};
-     $self->{NAV_MAP} = shift;
+     weaken($self->{NAV_MAP} = shift);
      return undef unless ($self->{NAV_MAP});
      $self->{FIRST_RESOURCE} = shift || $self->{NAV_MAP}->firstResource();
- Line 2495  sub next {
+ Line 3376  sub next {
      # filter the next possibilities to remove things we've
      # already seen.
-     foreach (@$nextUnfiltered) {
+     foreach my $item (@$nextUnfiltered) {
-         if (!defined($self->{ALREADY_SEEN}->{$_->{ID}})) {
+         if (!defined($self->{ALREADY_SEEN}->{$item->{ID}})) {
-             push @$next, $_;
+             push @$next, $item;
          }
      }
- Line 2522  sub next {
+ Line 3403  sub next {
      return $self->{HERE};
  }
+ # Identical to the full iterator methods of the same name. Hate to copy/paste
+ # but I also hate to "inherit" either iterator from the other.
+ sub getStack {
+     my $self=shift;
+     my @stack;
+     $self->populateStack(\@stack);
+     return \@stack;
+ }
+ # Private method: Calls the iterators recursively to populate the stack.
+ sub populateStack {
+     my $self=shift;
+     my $stack = shift;
+     push @$stack, $self->{HERE} if ($self->{HERE});
+     if ($self->{RECURSIVE_ITERATOR_FLAG}) {
+         $self->{RECURSIVE_ITERATOR}->populateStack($stack);
+     }
+ }
 ;
  package Apache::lonnavmaps::resource;
+ use Scalar::Util qw(weaken);
  use Apache::lonnet;
  =pod
  =head1 Object: resource
+ X<resource, navmap object>
  A resource object encapsulates a resource in a resource map, allowing
  easy manipulation of the resource, querying the properties of the
  resource (including user properties), and represents a reference that
- Line 2545  You will probably never need to instanti
+ Line 3452  You will probably never need to instanti
  Apache::lonnavmaps::navmap, and use the "start" method to obtain the
  starting resource.
- =head2 Public Members
+ Resource objects respect the parameter_hiddenparts, which suppresses
+ various parts according to the wishes of the map author. As of this
- resource objects have a hash called DATA ($resourceRef->{DATA}) that
+ writing, there is no way to override this parameter, and suppressed
- you can store whatever you want in. This allows you to easily do
+ parts will never be returned, nor will their response types or ids be
- two-pass algorithms without worrying about managing your own
+ stored.
- resource->data hash.
+ =head2 Overview
- =head2 Methods
+ A B<Resource> is the most granular type of object in LON-CAPA that can
- =over 4
+ be included in a course. It can either be a particular resource, like
+ an HTML page, external resource, problem, etc., or it can be a
- =item * B<new>($navmapRef, $idString):
+ container sequence, such as a "page" or a "map".
- The first arg is a reference to the parent navmap object. The second
+ To see a sequence from the user's point of view, please see the
- is the idString of the resource itself. Very rarely, if ever, called
+ B<Creating a Course: Maps and Sequences> chapter of the Author's
- directly. Use the nav map->getByID() method.
+ Manual.
- =back
+ A Resource Object, once obtained from a navmap object via a B<getBy*>
+ method of the navmap, or from an iterator, allows you to query
+ information about that resource.
+ Generally, you do not ever want to create a resource object yourself,
+ so creation has been left undocumented. Always retrieve resources
+ from navmap objects.
+ =head3 Identifying Resources
+ X<big hash>Every resource is identified by a Resource ID in the big hash that is
+ unique to that resource for a given course. X<resource ID, in big hash>
+ The Resource ID has the form #.#, where the first number is the same
+ for every resource in a map, and the second is unique. For instance,
+ for a course laid out like this:
+  * Problem 1
+  * Map
+    * Resource 2
+    * Resource 3
+ C<Problem 1> and C<Map> will share a first number, and C<Resource 2>
+ C<Resource 3> will share a first number. The second number may end up
+ re-used between the two groups.
+ The resource ID is only used in the big hash, but can be used in the
+ context of a course to identify a resource easily. (For instance, the
+ printing system uses it to record which resources from a sequence you
+ wish to print.)
+ X<symb> X<resource, symb>
+ All resources also have B<symb>s, which uniquely identify a resource
+ in a course. Many internal LON-CAPA functions expect a symb. A symb
+ carries along with it the URL of the resource, and the map it appears
+ in. Symbs are much larger than resource IDs.
  =cut
- Line 2572  sub new {
+ Line 3513  sub new {
      my $class = ref($proto) || $proto;
      my $self = {};
-     $self->{NAV_MAP} = shift;
+     weaken($self->{NAV_MAP} = shift);
      $self->{ID} = shift;
      # Store this new resource in the parent nav map's cache.
- Line 2596  sub navHash {
+ Line 3537  sub navHash {
      my $self = shift;
      my $param = shift;
      my $id = shift;
-     return $self->{NAV_MAP}->navhash($param . ($id?$self->{ID}:""));
+     my $arg = $param . ($id?$self->{ID}:"");
+     if (defined($arg)) {
+         return $self->{NAV_MAP}->navhash($arg);
+     }
+     return;
  }
  =pod
- B<Metadata Retreival>
+ =head2 Methods
+ Once you have a resource object, here's what you can do with it:
- These are methods that help you retrieve metadata about the resource:
+ =head3 Attribute Retrieval
- Method names are based on the fields in the compiled course
- representation.
+ Every resource has certain attributes that can be retrieved and used:
  =over 4
+ =item * B<ID>: Every resource has an ID that is unique for that
+     resource in the course it is in. The ID is actually in the hash
+     representing the resource, so for a resource object $res, obtain
+     it via C<$res->{ID}).
  =item * B<compTitle>:
  Returns a "composite title", that is equal to $res->title() if the
- Line 2619  resource has a title, and is otherwise t
+ Line 3571  resource has a title, and is otherwise t
  Returns true if the resource is external.
- =item * B<goesto>:
- Returns the "goesto" value from the compiled nav map. (It is likely
- you want to use B<getNext> instead.)
  =item * B<kind>:
  Returns the kind of the resource from the compiled nav map.
- Line 2636  false.
+ Line 3583  false.
  =item * B<randompick>:
- Returns true for a map if the randompick feature is being used on the
+ Returns the number of randomly picked items for a map if the randompick
- map. (?)
+ feature is being used on the map.
+ =item * B<randomorder>:
+ Returns true for a map if the randomorder feature is being used on the
+ map.
  =item * B<src>:
- Line 2651  Returns the symb for the resource.
+ Line 3603  Returns the symb for the resource.
  Returns the title of the resource.
- =item * B<to>:
- Returns the "to" value from the compiled nav map. (It is likely you
- want to use B<getNext> instead.)
  =back
  =cut
- Line 2663  want to use B<getNext> instead.)
+ Line 3610  want to use B<getNext> instead.)
  # These info functions can be used directly, as they don't return
  # resource information.
  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 from { my $self=shift; return $self->navHash("from_", 1); }
+ # considered private and undocumented
  sub goesto { my $self=shift; return $self->navHash("goesto_", 1); }
  sub kind { my $self=shift; return $self->navHash("kind_", 1); }
  sub randomout { my $self=shift; return $self->navHash("randomout_", 1); }
  sub randompick {
      my $self = shift;
-     return $self->{NAV_MAP}->{PARM_HASH}->{$self->symb .
+     my $randompick = $self->parmval('randompick');
-                                                '.0.parameter_randompick'};
+     return $randompick;
+ }
+ sub randomorder {
+     my $self = shift;
+     my $randomorder = $self->parmval('randomorder');
+     return ($randomorder =~ /^yes$/i);
+ }
+ sub link {
+     my $self=shift;
+     if ($self->encrypted()) { return &Apache::lonenc::encrypted($self->src); }
+     return $self->src;
  }
  sub src {
      my $self=shift;
      return $self->navHash("src_", 1);
  }
+ sub shown_symb {
+     my $self=shift;
+     if ($self->encrypted()) {return &Apache::lonenc::encrypted($self->symb());}
+     return $self->symb();
+ }
+ sub id {
+     my $self=shift;
+     return $self->{ID};
+ }
+ sub enclosing_map_src {
+     my $self=shift;
+     (my $first, my $second) = $self->{ID} =~ /(\d+).(\d+)/;
+     return $self->navHash('map_id_'.$first);
+ }
  sub symb {
      my $self=shift;
      (my $first, my $second) = $self->{ID} =~ /(\d+).(\d+)/;
      my $symbSrc = &Apache::lonnet::declutter($self->src());
-     return &Apache::lonnet::declutter(
+     my $symb = &Apache::lonnet::declutter($self->navHash('map_id_'.$first))
-          $self->navHash('map_id_'.$first))
          . '___' . $second . '___' . $symbSrc;
+     return &Apache::lonnet::symbclean($symb);
+ }
+ sub wrap_symb {
+     my $self = shift;
+     return $self->{NAV_MAP}->wrap_symb($self->symb());
  }
- sub title { my $self=shift; return $self->navHash("title_", 1); }
+ sub title {
+     my $self=shift;
+     if ($self->{ID} eq '0.0') {
+ 	# If this is the top-level map, return the title of the course
+ 	# since this map can not be titled otherwise.
+ 	return $env{'course.'.$env{'request.course.id'}.'.description'};
+     }
+     return $self->navHash("title_", 1); }
+ # considered private and undocumented
  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 condval {
+     my $self=shift;
+     my ($pathname,$filename) =
+ 	&Apache::lonnet::split_uri_for_cond($self->src());
+     my $match=($env{'acc.res.'.$env{'request.course.id'}.'.'.$pathname}=~
+ 	       /\&\Q$filename\E\:([\d\|]+)\&/);
+     if ($match) {
+ 	return &Apache::lonnet::condval($1);
+     }
+     return 0;
+ }
  sub compTitle {
      my $self = shift;
      my $title = $self->title();
- Line 2697  sub compTitle {
+ Line 3703  sub compTitle {
      }
      return $title;
  }
  =pod
  B<Predicate Testing the Resource>
- Line 2727  Returns true if the resource is a sequen
+ Line 3734  Returns true if the resource is a sequen
  =cut
+ sub hasResource {
+    my $self = shift;
+    return $self->{NAV_MAP}->hasResource(@_);
+ }
+ sub retrieveResources {
+    my $self = shift;
+    return $self->{NAV_MAP}->retrieveResources(@_);
+ }
+ sub is_exam {
+     my ($self,$part) = @_;
+     my $type = $self->parmval('type',$part);
+     if ($type eq 'exam') {
+         return 1;
+     }
+     if ($self->src() =~ /\.(exam)$/) {
+         return 1;
+     }
+     return 0;
+ }
  sub is_html {
      my $self=shift;
      my $src = $self->src();
- Line 2737  sub is_map { my $self=shift; return defi
+ Line 3764  sub is_map { my $self=shift; return defi
  sub is_page {
      my $self=shift;
      my $src = $self->src();
-     return ($src =~ /page$/);
+     return $self->navHash("is_map_", 1) &&
+ 	$self->navHash("map_type_" . $self->map_pc()) eq 'page';
+ }
+ sub is_practice {
+     my $self=shift;
+     my ($part) = @_;
+     my $type = $self->parmval('type',$part);
+     if ($type eq 'practice') {
+         return 1;
+     }
+     return 0;
  }
  sub is_problem {
      my $self=shift;
      my $src = $self->src();
-     return ($src =~ /problem$/);
+     if ($src =~ /\.(problem|exam|quiz|assess|survey|form|library|task)$/) {
+ 	return !($self->is_practice());
+     }
+     return 0;
+ }
+ #
+ #  The has below is the set of status that are considered 'incomplete'
+ #
+ my %incomplete_hash =
+ (
+  TRIES_LEFT()     => 1,
+  OPEN()           => 1,
+  ATTEMPTED()      => 1
+  );
+ #
+ #  Return tru if a problem is incomplete... for now incomplete means that
+ #  any part of the problem is incomplete.
+ #  Note that if the resources is not a problem, 0 is returned.
+ #
+ sub is_incomplete {
+     my $self = shift;
+     if ($self->is_problem()) {
+ 	&Apache::lonnet::logthis('is problem');
+ 	foreach my $part (@{$self->parts()}) {
+ 	    &Apache::lonnet::logthis("$part status ".$self->status($part));
+ 	    if (exists($incomplete_hash{$self->status($part)})) {
+ 		return 1;
+ 	    }
+ 	}
+     }
+     return 0;
+ }
+ sub is_raw_problem {
+     my $self=shift;
+     my $src = $self->src();
+     if ($src =~ /\.(problem|exam|quiz|assess|survey|form|library|task)$/) {
+         return 1;
+     }
+     return 0;
+ }
+ 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 map_contains_problem {
+     my $self=shift;
+     if ($self->is_map()) {
+ 	my $has_problem=
+ 	    $self->hasResource($self,sub { $_[0]->is_problem() },1);
+ 	return $has_problem;
+     }
+     return 0;
  }
  sub is_sequence {
      my $self=shift;
+     return $self->navHash("is_map_", 1) &&
+     $self->navHash("map_type_" . $self->map_pc()) eq 'sequence';
+ }
+ sub is_survey {
+     my $self = shift();
+     my $part = shift();
+     my $type = $self->parmval('type',$part);
+     if (($type eq 'survey') || ($type eq 'surveycred')) {
+         return 1;
+     }
+     if ($self->src() =~ /\.(survey)$/) {
+         return 1;
+     }
+     return 0;
+ }
+ sub is_anonsurvey {
+     my $self = shift();
+     my $part = shift();
+     my $type = $self->parmval('type',$part);
+     if (($type eq 'anonsurvey') || ($type eq 'anonsurveycred')) {
+         return 1;
+     }
+     return 0;
+ }
+ sub is_task {
+     my $self=shift;
+     my $src = $self->src();
+     return ($src =~ /\.(task)$/)
+ }
+ sub is_empty_sequence {
+     my $self=shift;
      my $src = $self->src();
-     return ($src =~ /sequence$/);
+     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.
  sub parmval {
      my $self = shift;
      my $what = shift;
-     my $part = shift || "0";
+     my $part = shift;
+     if (!defined($part)) {
+         $part = '0';
+     }
      return $self->{NAV_MAP}->parmval($part.'.'.$what, $self->symb());
  }
- Line 2795  Returns a string with the type of the ma
+ Line 3925  Returns a string with the type of the ma
  sub map_finish {
      my $self = shift;
      my $src = $self->src();
-     $src = Apache::lonnet::clutter($src);
+     $src = &Apache::lonnet::clutter($src);
      my $res = $self->navHash("map_finish_$src", 0);
      $res = $self->{NAV_MAP}->getById($res);
      return $res;
- Line 2808  sub map_pc {
+ Line 3938  sub map_pc {
  sub map_start {
      my $self = shift;
      my $src = $self->src();
-     $src = Apache::lonnet::clutter($src);
+     $src = &Apache::lonnet::clutter($src);
      my $res = $self->navHash("map_start_$src", 0);
      $res = $self->{NAV_MAP}->getById($res);
      return $res;
- Line 2819  sub map_type {
+ Line 3949  sub map_type {
      return $self->navHash("map_type_$pc", 0);
  }
  #####
  # Property queries
  #####
  # These functions will be responsible for returning the CORRECT
  # VALUE for the parameter, no matter what. So while they may look
- # like direct calls to parmval, they can be more then that.
+ # like direct calls to parmval, they can be more than that.
  # So, for instance, the duedate function should use the "duedatetype"
- # information, rather then the resource object user.
+ # information, rather than the resource object user.
  =pod
- Line 2858  Get the Client IP/Name Access Control in
+ Line 3986  Get the Client IP/Name Access Control in
  Get the answer-reveal date for the problem.
+ =item * B<awarded>:
+ Gets the awarded value for the problem part. Requires genUserData set to
+ true when the navmap object was created.
  =item * B<duedate>:
  Get the due date for the problem.
- Line 2900  Get the weight for the problem.
+ Line 4033  Get the weight for the problem.
  sub acc {
      (my $self, my $part) = @_;
-     return $self->parmval("acc", $part);
+     my $acc = $self->parmval("acc", $part);
+     return $acc;
  }
  sub answerdate {
      (my $self, my $part) = @_;
      # Handle intervals
-     if ($self->parmval("answerdate.type", $part) eq 'date_interval') {
+     my $answerdatetype = $self->parmval("answerdate.type", $part);
-         return $self->duedate($part) +
+     my $answerdate = $self->parmval("answerdate", $part);
-             $self->parmval("answerdate", $part);
+     my $duedate = $self->parmval("duedate", $part);
+     if ($answerdatetype eq 'date_interval') {
+         $answerdate = $duedate + $answerdate;
+     }
+     return $answerdate;
+ }
+ sub awarded {
+     my $self = shift; my $part = shift;
+     $self->{NAV_MAP}->get_user_data();
+     if (!defined($part)) { $part = '0'; }
+     return $self->{NAV_MAP}->{STUDENT_DATA}->{$self->symb()}->{'resource.'.$part.'.awarded'};
+ }
+ sub taskversion {
+     my $self = shift; my $part = shift;
+     $self->{NAV_MAP}->get_user_data();
+     if (!defined($part)) { $part = '0'; }
+     return $self->{NAV_MAP}->{STUDENT_DATA}->{$self->symb()}->{'resource.'.$part.'.version'};
+ }
+ sub taskstatus {
+     my $self = shift; my $part = shift;
+     $self->{NAV_MAP}->get_user_data();
+     if (!defined($part)) { $part = '0'; }
+     return $self->{NAV_MAP}->{STUDENT_DATA}->{$self->symb()}->{'resource.'.$self->taskversion($part).'.'.$part.'.status'};
+ }
+ sub solved {
+     my $self = shift; my $part = shift;
+     $self->{NAV_MAP}->get_user_data();
+     if (!defined($part)) { $part = '0'; }
+     return $self->{NAV_MAP}->{STUDENT_DATA}->{$self->symb()}->{'resource.'.$part.'.solved'};
+ }
+ sub checkedin {
+     my $self = shift; my $part = shift;
+     $self->{NAV_MAP}->get_user_data();
+     if (!defined($part)) { $part = '0'; }
+     if ($self->is_task()) {
+         my $version = $self->taskversion($part);
+         return ($self->{NAV_MAP}->{STUDENT_DATA}->{$self->symb()}->{'resource.'.$version .'.'.$part.'.checkedin'},$self->{NAV_MAP}->{STUDENT_DATA}->{$self->symb()}->{'resource.'.$version .'.'.$part.'.checkedin.slot'});
+     } else {
+         return ($self->{NAV_MAP}->{STUDENT_DATA}->{$self->symb()}->{'resource.'.$part.'.checkedin'},$self->{NAV_MAP}->{STUDENT_DATA}->{$self->symb()}->{'resource.'.$part.'.checkedin.slot'});
      }
-     return $self->parmval("answerdate", $part);
  }
- sub awarded { my $self = shift; return $self->queryRestoreHash('awarded', shift); }
+ # this should work exactly like the copy in lonhomework.pm
  sub duedate {
      (my $self, my $part) = @_;
-     return $self->parmval("duedate", $part);
+     my $date;
+     my @interval=$self->parmval("interval", $part);
+     my $due_date=$self->parmval("duedate", $part);
+     if ($interval[0] =~ /\d+/) {
+        my $first_access=&Apache::lonnet::get_first_access($interval[1],
+                                                           $self->symb);
+ 	if (defined($first_access)) {
+            my $interval = $first_access+$interval[0];
+ 	    $date = (!$due_date || $interval < $due_date) ? $interval
+                                                           : $due_date;
+ 	} else {
+ 	    $date = $due_date;
+ 	}
+     } else {
+ 	$date = $due_date;
+     }
+     return $date;
+ }
+ sub handgrade {
+     (my $self, my $part) = @_;
+     my @response_ids = $self->responseIds($part);
+     if (@response_ids) {
+ 	foreach my $response_id (@response_ids) {
+             my $handgrade = $self->parmval("handgrade",$part.'_'.$response_id);
+ 	    if (lc($handgrade) eq 'yes') {
+ 		return 'yes';
+ 	    }
+ 	}
+     }
+     my $handgrade = $self->parmval("handgrade", $part);
+     return $handgrade;
  }
  sub maxtries {
      (my $self, my $part) = @_;
-     return $self->parmval("maxtries", $part);
+     my $maxtries = $self->parmval("maxtries", $part);
+     return $maxtries;
  }
  sub opendate {
      (my $self, my $part) = @_;
-     if ($self->parmval("opendate.type", $part) eq 'date_interval') {
+     my $opendatetype = $self->parmval("opendate.type", $part);
-         return $self->duedate($part) -
+     my $opendate = $self->parmval("opendate", $part);
-             $self->parmval("opendate", $part);
+     if ($opendatetype eq 'date_interval') {
+         my $duedate = $self->duedate($part);
+         $opendate = $duedate - $opendate;
      }
-     return $self->parmval("opendate");
+     return $opendate;
+ }
+ sub problemstatus {
+     (my $self, my $part) = @_;
+     my $problemstatus = $self->parmval("problemstatus", $part);
+     return lc($problemstatus);
  }
  sub sig {
      (my $self, my $part) = @_;
-     return $self->parmval("sig", $part);
+     my $sig = $self->parmval("sig", $part);
+     return $sig;
  }
  sub tol {
      (my $self, my $part) = @_;
-     return $self->parmval("tol", $part);
+     my $tol = $self->parmval("tol", $part);
+     return $tol;
  }
  sub tries {
      my $self = shift;
      my $tries = $self->queryRestoreHash('tries', shift);
      if (!defined($tries)) { return '0';}
- Line 2944  sub tries {
+ Line 4155  sub tries {
  }
  sub type {
      (my $self, my $part) = @_;
-     return $self->parmval("type", $part);
+     my $type = $self->parmval("type", $part);
+     return $type;
  }
  sub weight {
      my $self = shift; my $part = shift;
-     return $self->parmval("weight", $part);
+     if (!defined($part)) { $part = '0'; }
+     my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',
+                                 $self->symb(), $env{'user.domain'},
+                                 $env{'user.name'},
+                                 $env{'request.course.sec'});
+     return $weight;
+ }
+ 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;
+ }
+ sub slot_control {
+     my $self=shift(); my $part = shift();
+     if (!defined($part)) { $part = '0'; }
+     my $useslots = $self->parmval("useslots", $part);
+     my $availablestudent = $self->parmval("availablestudent", $part);
+     my $available = $self->parmval("available", $part);
+     return ($useslots,$availablestudent,$available);
  }
  # Multiple things need this
- Line 2989  Returns a false value if there has been
+ Line 4224  Returns a false value if there has been
  logged in, true if there has. Always returns false if the discussion
  data was not extracted when the nav map was constructed.
+ =item * B<last_post_time>:
+ Returns a false value if there hasn't been discussion otherwise returns
+ unix timestamp of last time a discussion posting (or edit) was made.
+ =item * B<discussion_info>:
+ optional argument is a filter (currently can be 'unread');
+ returns in scalar context the count of the number of discussion postings.
+ returns in list context both the count of postings and a hash ref
+ containing information about the postings (subject, id, timestamp) in a hash.
+ Default is to return counts for all postings.  However if called with a second argument set to 'unread', will return information about only unread postings.
  =item * B<getFeedback>:
  Gets the feedback for the resource and returns the raw feedback string
- Line 2996  for the resource, or the null string if
+ Line 4246  for the resource, or the null string if
  email data was not extracted when the nav map was constructed. Usually
  used like this:
-  for (split(/\,/, $res->getFeedback())) {
+  for my $url (split(/\,/, $res->getFeedback())) {
-     my $link = &Apache::lonnet::escape($_);
+     my $link = &escape($url);
      ...
  and use the link as appropriate.
- Line 3009  sub hasDiscussion {
+ Line 4259  sub hasDiscussion {
      return $self->{NAV_MAP}->hasDiscussion($self->symb());
  }
+ sub last_post_time {
+     my $self = shift;
+     return $self->{NAV_MAP}->last_post_time($self->symb());
+ }
+ sub discussion_info {
+     my ($self,$filter) = @_;
+     return $self->{NAV_MAP}->discussion_info($self->symb(),$filter);
+ }
  sub getFeedback {
      my $self = shift;
      my $source = $self->src();
+     my $symb = $self->symb();
      if ($source =~ /^\/res\//) { $source = substr $source, 5; }
-     return $self->{NAV_MAP}->getFeedback($source);
+     return $self->{NAV_MAP}->getFeedback($symb,$source);
  }
  sub getErrors {
      my $self = shift;
      my $source = $self->src();
+     my $symb = $self->symb();
      if ($source =~ /^\/res\//) { $source = substr $source, 5; }
-     return $self->{NAV_MAP}->getErrors($source);
+     return $self->{NAV_MAP}->getErrors($symb,$source);
  }
  =pod
- Line 3028  sub getErrors {
+ Line 4290  sub getErrors {
  =item * B<parts>():
  Returns a list reference containing sorted strings corresponding to
- each part of the problem. To count the number of parts, use the list
+ each part of the problem. Single part problems have only a part '0'.
- in a scalar context, and subtract one if greater than two. (One part
+ Multipart problems do not return their part '0', since they typically
- problems have a part 0. Multi-parts have a part 0, plus a part for
+ do not really matter.
- each part. Filtering part 0 if you want it is up to you.)
  =item * B<countParts>():
  Returns the number of parts of the problem a student can answer. Thus,
  for single part problems, returns 1. For multipart, it returns the
- number of parts in the problem, not including psuedo-part 0. Thus,
+ number of parts in the problem, not including psuedo-part 0.
- B<parts> may return an array with fewer parts in it then countParts
- might lead you to believe.
+ =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>():
+ Returns true if the problem is multipart, false otherwise. Use this instead
+ of countParts if all you want is multipart/not multipart.
+ =item * B<responseType>($part):
+ Returns the response type of the part, without the word "response" on the
+ end. Example return values: 'string', 'essay', 'numeric', etc.
+ =item * B<responseIds>($part):
+ Retreives the response IDs for the given part as an array reference containing
+ strings naming the response IDs. This may be empty.
  =back
- Line 3048  might lead you to believe.
+ Line 4332  might lead you to believe.
  sub parts {
      my $self = shift;
-     if ($self->ext) { return ['0']; }
+     if ($self->ext) { return []; }
      $self->extractParts();
      return $self->{PARTS};
- Line 3058  sub countParts {
+ Line 4342  sub countParts {
      my $self = shift;
      my $parts = $self->parts();
-     my $delta = 0;
-     for my $part (@$parts) {
+     # If I left this here, then it's not necessary.
-         if ($part eq '0') { $delta--; }
+     #my $delta = 0;
-     }
+     #for my $part (@$parts) {
+     #    if ($part eq '0') { $delta--; }
+     #}
      if ($self->{RESOURCE_ERROR}) {
          return 0;
      }
-     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 {
+     my $self = shift;
+     return $self->countParts() > 1;
+ }
+ sub singlepart {
+     my $self = shift;
+     return $self->countParts() == 1;
+ }
+ sub responseType {
+     my $self = shift;
+     my $part = shift;
+     $self->extractParts();
+     if (defined($self->{RESPONSE_TYPES}->{$part})) {
+ 	return @{$self->{RESPONSE_TYPES}->{$part}};
+     } else {
+ 	return undef;
+     }
+ }
+ sub responseIds {
+     my $self = shift;
+     my $part = shift;
+     $self->extractParts();
+     if (defined($self->{RESPONSE_IDS}->{$part})) {
+ 	return @{$self->{RESPONSE_IDS}->{$part}};
+     } else {
+ 	return undef;
+     }
  }
- # Private function: Extracts the parts information and saves it
+ # Private function: Extracts the parts information, both part names and
+ # part types, and saves it.
  sub extractParts {
      my $self = shift;
- Line 3079  sub extractParts {
+ Line 4420  sub extractParts {
      $self->{PARTS} = [];
+     my %parts;
      # Retrieve part count, if this is a problem
      if ($self->is_problem()) {
+ 	my $partorder = &Apache::lonnet::metadata($self->src(), 'partorder');
          my $metadata = &Apache::lonnet::metadata($self->src(), 'packages');
-         if (!$metadata) {
-             $self->{RESOURCE_ERROR} = 1;
+ 	if ($partorder) {
-             $self->{PARTS} = [];
+ 	    my @parts;
-             return;
+ 	    for my $part (split (/,/,$partorder)) {
-         }
+ 		if (!Apache::loncommon::check_if_partid_hidden($part, $self->symb())) {
-         foreach (split(/\,/,$metadata)) {
+ 		    push @parts, $part;
-             if ($_ =~ /^part_(.*)$/) {
+ 		    $parts{$part} = 1;
-                 my $part = $1;
+ 		}
-                 # check to see if part is turned off.
+ 	    }
-                 if (! Apache::loncommon::check_if_partid_hidden($part, $self->symb())) {
+ 	    $self->{PARTS} = \@parts;
-                     push @{$self->{PARTS}}, $1;
+ 	} else {
+ 	    if (!$metadata) {
+ 		$self->{RESOURCE_ERROR} = 1;
+ 		$self->{PARTS} = [];
+ 		$self->{PART_TYPE} = {};
+ 		return;
+ 	    }
+ 	    foreach my $entry (split(/\,/,$metadata)) {
+ 		if ($entry =~ /^(?:part|Task)_(.*)$/) {
+ 		    my $part = $1;
+ 		    # This floods the logs if it blows up
+ 		    if (defined($parts{$part})) {
+ 			&Apache::lonnet::logthis("$part multiply defined in metadata for " . $self->symb());
+ 		    }
+ 		    # check to see if part is turned off.
+ 		    if (!Apache::loncommon::check_if_partid_hidden($part, $self->symb())) {
+ 			$parts{$part} = 1;
+ 		    }
+ 		}
+ 	    }
+ 	    my @sortedParts = sort keys %parts;
+ 	    $self->{PARTS} = \@sortedParts;
+         }
+         # These hashes probably do not need names that end with "Hash"....
+         my %responseIdHash;
+         my %responseTypeHash;
+         # Init the responseIdHash
+         foreach my $part (@{$self->{PARTS}}) {
+             $responseIdHash{$part} = [];
+         }
+         # Now, the unfortunate thing about this is that parts, part name, and
+         # response id are delimited by underscores, but both the part
+         # name and response id can themselves have underscores in them.
+         # So we have to use our knowlege of part names to figure out
+         # where the part names begin and end, and even then, it is possible
+         # to construct ambiguous situations.
+         foreach my $data (split /,/, $metadata) {
+             if ($data =~ /^([a-zA-Z]+)response_(.*)/
+ 		|| $data =~ /^(Task)_(.*)/) {
+                 my $responseType = $1;
+                 my $partStuff = $2;
+                 my $partIdSoFar = '';
+                 my @partChunks = split /_/, $partStuff;
+                 my $i = 0;
+                 for ($i = 0; $i < scalar(@partChunks); $i++) {
+                     if ($partIdSoFar) { $partIdSoFar .= '_'; }
+                     $partIdSoFar .= $partChunks[$i];
+                     if ($parts{$partIdSoFar}) {
+                         my @otherChunks = @partChunks[$i+1..$#partChunks];
+                         my $responseId = join('_', @otherChunks);
+ 			if ($self->is_task()) {
+ 			    push(@{$responseIdHash{$partIdSoFar}},
+ 				 $partIdSoFar);
+ 			} else {
+ 			    push(@{$responseIdHash{$partIdSoFar}},
+ 				 $responseId);
+ 			}
+                         push(@{$responseTypeHash{$partIdSoFar}},
+ 			     $responseType);
+                     }
                  }
              }
          }
+ 	my $resorder = &Apache::lonnet::metadata($self->src(),'responseorder');
+         #
-         my @sortedParts = sort @{$self->{PARTS}};
+         # Reorder the arrays in the %responseIdHash and %responseTypeHash
-         $self->{PARTS} = \@sortedParts;
+ 	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_TYPES} = \%responseTypeHash;
      }
      return;
- Line 3118  the completion information.
+ Line 4550  the completion information.
  Idiomatic usage of these two methods would probably look something
  like
-  foreach ($resource->parts()) {
+  foreach my $part ($resource->parts()) {
-     my $dateStatus = $resource->getDateStatus($_);
+     my $dateStatus = $resource->getDateStatus($part);
-     my $completionStatus = $resource->getCompletionStatus($_);
+     my $completionStatus = $resource->getCompletionStatus($part);
      or
-     my $status = $resource->status($_);
+     my $status = $resource->status($part);
      ... use it here ...
   }
- Line 3185  sub OPEN                   { return 1; }
+ Line 4617  sub OPEN                   { return 1; }
  sub PAST_DUE_NO_ANSWER     { return 2; }
  sub PAST_DUE_ANSWER_LATER  { return 3; }
  sub ANSWER_OPEN            { return 4; }
  sub NOTHING_SET            { return 5; }
  sub NETWORK_FAILURE        { return 100; }
  # getDateStatus gets the date status for a given problem part.
- Line 3285  sub ATTEMPTED             { return 16; }
+ Line 4717  sub ATTEMPTED             { return 16; }
  sub getCompletionStatus {
      my $self = shift;
+     my $part = shift;
      return $self->NETWORK_FAILURE if ($self->{NAV_MAP}->{NETWORK_FAILURE});
-     my $status = $self->queryRestoreHash('solved', shift);
+     my $status = $self->queryRestoreHash('solved', $part);
-     # 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_override') {return $self->CORRECT_BY_OVERRIDE; }
+     if ($status eq 'correct_by_scantron') {return $self->CORRECT;}
+     if ($status eq 'correct_by_override') {
+ 	return $self->CORRECT_BY_OVERRIDE;
+     }
      if ($status eq 'incorrect_attempted') {return $self->INCORRECT; }
      if ($status eq 'incorrect_by_override') {return $self->INCORRECT_BY_OVERRIDE; }
      if ($status eq 'excused') {return $self->EXCUSED; }
- Line 3303  sub queryRestoreHash {
+ Line 4739  sub queryRestoreHash {
      my $self = shift;
      my $hashentry = shift;
      my $part = shift;
-     $part = "0" if (!defined($part));
+     $part = "0" if (!defined($part) || $part eq '');
      return $self->NETWORK_FAILURE if ($self->{NAV_MAP}->{NETWORK_FAILURE});
      $self->getReturnHash();
- Line 3318  B<Composite Status>
+ Line 4754  B<Composite Status>
  Along with directly returning the date or completion status, the
  resource object includes a convenience function B<status>() that will
  combine the two status tidbits into one composite status that can
- represent the status of the resource as a whole. The precise logic is
+ represent the status of the resource as a whole. This method represents
+ the concept of the thing we want to display to the user on the nav maps
+ screen, which is a combination of completion and open status. The precise logic is
  documented in the comments of the status method. The following results
  may be returned, all available as methods on the resource object
- ($res->NETWORK_FAILURE):
+ ($res->NETWORK_FAILURE): In addition to the return values that match
+ the date or completion status, this function can return "ANSWER_SUBMITTED"
+ if that problemstatus parameter value is set to No, suppressing the
+ incorrect/correct feedback.
  =over 4
- Line 3380  The item is open and not yet tried.
+ Line 4821  The item is open and not yet tried.
  The problem has been attempted.
+ =item * B<ANSWER_SUBMITTED>:
+ An answer has been submitted, but the student should not see it.
  =back
  =cut
- sub TRIES_LEFT { return 10; }
+ sub TRIES_LEFT        { return 20; }
+ sub ANSWER_SUBMITTED  { return 21; }
+ sub PARTIALLY_CORRECT { return 22; }
+ sub RESERVED_LATER    { return 30; }
+ sub RESERVED          { return 31; }
+ sub RESERVED_LOCATION { return 32; }
+ sub RESERVABLE        { return 33; }
+ sub RESERVABLE_LATER  { return 34; }
+ sub NOTRESERVABLE     { return 35; }
+ sub NOT_IN_A_SLOT     { return 36; }
+ sub NEEDS_CHECKIN     { return 37; }
+ sub WAITING_FOR_GRADE { return 38; }
+ sub UNKNOWN           { return 39; }
  sub status {
      my $self = shift;
- Line 3397  sub status {
+ Line 4855  sub status {
      # dimension and 5 entries on the other, which we want to colorize,
      # plus network failure and "no date data at all".
+     #if ($self->{RESOURCE_ERROR}) { return NETWORK_FAILURE; }
      if ($completionStatus == NETWORK_FAILURE) { return NETWORK_FAILURE; }
+     my $suppressFeedback = 0;
+     if (($self->problemstatus($part) eq 'no') ||
+         ($self->problemstatus($part) eq 'no_feedback_ever')) {
+         $suppressFeedback = 1;
+     }
+     # If there's an answer date and we're past it, don't
+     # suppress the feedback; student should know
+     if ($self->duedate($part) && $self->duedate($part) < time() &&
+ 	$self->answerdate($part) && $self->answerdate($part) < time()) {
+ 	$suppressFeedback = 0;
+     }
      # There are a few whole rows we can dispose of:
      if ($completionStatus == CORRECT ||
          $completionStatus == CORRECT_BY_OVERRIDE ) {
-         return CORRECT;
+ 	if ( $suppressFeedback ) { return ANSWER_SUBMITTED }
+ 	my $awarded=$self->awarded($part);
+ 	if ($awarded < 1 && $awarded > 0) {
+             return PARTIALLY_CORRECT;
+ 	} elsif ($awarded<1) {
+ 	    return INCORRECT;
+ 	}
+ 	return CORRECT;
+     }
+     # If it's WRONG... and not open
+     if ( ($completionStatus == INCORRECT ||
+ 	  $completionStatus == INCORRECT_BY_OVERRIDE)
+ 	 && (!$self->opendate($part) ||  $self->opendate($part) > time()) ) {
+ 	return INCORRECT;
      }
      if ($completionStatus == ATTEMPTED) {
- Line 3423  sub status {
+ Line 4908  sub status {
      if ($dateStatus == PAST_DUE_ANSWER_LATER ||
          $dateStatus == PAST_DUE_NO_ANSWER ) {
-         return $dateStatus;
+         return $suppressFeedback ? ANSWER_SUBMITTED : $dateStatus;
      }
      if ($dateStatus == ANSWER_OPEN) {
- Line 3441  sub status {
+ Line 4926  sub status {
      if ($completionStatus == INCORRECT || $completionStatus == INCORRECT_BY_OVERRIDE) {
          # and there are TRIES LEFT:
          if ($self->tries($part) < $self->maxtries($part) || !$self->maxtries($part)) {
-             return TRIES_LEFT;
+             return $suppressFeedback ? ANSWER_SUBMITTED : TRIES_LEFT;
          }
-         return INCORRECT; # otherwise, return orange; student can't fix this
+         return $suppressFeedback ? ANSWER_SUBMITTED : INCORRECT; # otherwise, return orange; student can't fix this
      }
      # Otherwise, it's untried and open
      return OPEN;
  }
+ sub check_for_slot {
+     my $self = shift;
+     my $part = shift;
+     my ($use_slots,$available,$availablestudent) = $self->slot_control($part);
+     if (($use_slots ne '') && ($use_slots !~ /^\s*no\s*$/i)) {
+         my @slots = (split(/:/,$availablestudent),split(/:/,$available));
+         my $cid=$env{'request.course.id'};
+         my $cdom=$env{'course.'.$cid.'.domain'};
+         my $cnum=$env{'course.'.$cid.'.num'};
+         my $now = time;
+         if (@slots > 0) {
+             my %slots=&Apache::lonnet::get('slots',[@slots],$cdom,$cnum);
+             if (&Apache::lonnet::error(%slots)) {
+                 return (UNKNOWN);
+             }
+             my @sorted_slots = &Apache::loncommon::sorted_slots(\@slots,\%slots);
+             my ($checkedin,$checkedinslot);
+             foreach my $slot_name (@sorted_slots) {
+                 next if (!defined($slots{$slot_name}) ||
+                          !ref($slots{$slot_name}));
+                 my $end = $slots{$slot_name}->{'endtime'};
+                 my $start = $slots{$slot_name}->{'starttime'};
+                 my $ip = $slots{$slot_name}->{'ip'};
+                 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) {
+                         ($checkedin,$checkedinslot) = $self->checkedin();
+                         if ($startreserve < $now) {
+                             if ($start > $now) {
+                                 return (RESERVED_LATER,$start,$slot_name);
+                             } else {
+                                 if ($ip ne '') {
+                                     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 {
+                             if ($start > $now) {
+                                 return (RESERVABLE,$startreserve,$slot_name);
+                             }
+                         }
+                     }
+                 }
+             }
+             my ($is_correct,$got_grade);
+             if ($self->is_task()) {
+                 my $taskstatus = $self->taskstatus();
+                 $is_correct = (($taskstatus eq 'pass') ||
+                                ($self->solved() =~ /^correct_/));
+                 $got_grade = ($self->solved() =~ /^(?:pass|fail)$/);
+             } else {
+                 $got_grade = 1;
+                 $is_correct = ($self->solved() =~ /^correct_/);
+             }
+             ($checkedin,$checkedinslot) = $self->checkedin();
+             if ($checkedin) {
+                 if (!$got_grade) {
+                     return (WAITING_FOR_GRADE);
+                 } elsif ($is_correct) {
+                     return (CORRECT);
+                 }
+             }
+             return(NOT_IN_A_SLOT);
+         } 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(NOTRESERVABLE);
+         }
+     }
+     return;
+ }
+ sub get_future_slots {
+     my ($cdom,$cnum,$now) = @_;
+     my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum);
+     my $future_slots = 0;
+     foreach my $slot (keys(%slots)) {
+         if (($slots{$slot}->{'starttime'} > $now) &&
+             ($slots{$slot}->{'endtime'} > $now)) {
+             $future_slots ++;
+         }
+     }
+     return $future_slots;
+ }
+ sub CLOSED { return 23; }
+ sub ERROR { return 24; }
+ =pod
+ B<Simple Status>
+ Convenience method B<simpleStatus> provides a "simple status" for the resource.
+ "Simple status" corresponds to "which icon is shown on the
+ Navmaps". There are six "simple" statuses:
+ =over 4
+ =item * B<CLOSED>: The problem is currently closed. (No icon shown.)
+ =item * B<OPEN>: The problem is open and unattempted.
+ =item * B<CORRECT>: The problem is correct for any reason.
+ =item * B<INCORRECT>: The problem is incorrect and can still be
+ completed successfully.
+ =item * B<ATTEMPTED>: The problem has been attempted, but the student
+ does not know if they are correct. (The ellipsis icon.)
+ =item * B<ERROR>: There is an error retrieving information about this
+ problem.
+ =back
+ =cut
+ # This hash maps the composite status to this simple status, and
+ # can be used directly, if you like
+ my %compositeToSimple =
+     (
+       NETWORK_FAILURE()       => ERROR,
+       NOTHING_SET()           => CLOSED,
+       CORRECT()               => CORRECT,
+       PARTIALLY_CORRECT()     => PARTIALLY_CORRECT,
+       EXCUSED()               => CORRECT,
+       PAST_DUE_NO_ANSWER()    => INCORRECT,
+       PAST_DUE_ANSWER_LATER() => INCORRECT,
+       ANSWER_OPEN()           => INCORRECT,
+       OPEN_LATER()            => CLOSED,
+       TRIES_LEFT()            => OPEN,
+       INCORRECT()             => INCORRECT,
+       OPEN()                  => OPEN,
+       ATTEMPTED()             => ATTEMPTED,
+       ANSWER_SUBMITTED()      => ATTEMPTED
+      );
+ sub simpleStatus {
+     my $self = shift;
+     my $part = shift;
+     my $status = $self->status($part);
+     return $compositeToSimple{$status};
+ }
+ =pod
+ B<simpleStatusCount> will return an array reference containing, in
+ this order, the number of OPEN, CLOSED, CORRECT, INCORRECT, ATTEMPTED,
+ and ERROR parts the given problem has.
+ =cut
+ # This maps the status to the slot we want to increment
+ my %statusToSlotMap =
+     (
+      OPEN()      => 0,
+      CLOSED()    => 1,
+      CORRECT()   => 2,
+      INCORRECT() => 3,
+      ATTEMPTED() => 4,
+      ERROR()     => 5
+      );
+ sub statusToSlot { return $statusToSlotMap{shift()}; }
+ sub simpleStatusCount {
+     my $self = shift;
+     my @counts = (0, 0, 0, 0, 0, 0, 0);
+     foreach my $part (@{$self->parts()}) {
+ 	$counts[$statusToSlotMap{$self->simpleStatus($part)}]++;
+     }
+     return \@counts;
+ }
+ =pod
+ B<Completable>
+ The completable method represents the concept of I<whether the student can
+ currently do the problem>. If the student can do the problem, which means
+ that it is open, there are tries left, and if the problem is manually graded
+ or the grade is suppressed via problemstatus, the student has not tried it
+ yet, then the method returns 1. Otherwise, it returns 0, to indicate that
+ either the student has tried it and there is no feedback, or that for
+ some reason it is no longer completable (not open yet, successfully completed,
+ out of tries, etc.). As an example, this is used as the filter for the
+ "Uncompleted Homework" option for the nav maps.
+ If this does not quite meet your needs, do not fiddle with it (unless you are
+ fixing it to better match the student's conception of "completable" because
+ it's broken somehow)... make a new method.
+ =cut
+ sub completable {
+     my $self = shift;
+     if (!$self->is_problem()) { return 0; }
+     my $partCount = $self->countParts();
+     foreach my $part (@{$self->parts()}) {
+         if ($part eq '0' && $partCount != 1) { next; }
+         my $status = $self->status($part);
+         # "If any of the parts are open, or have tries left (implies open),
+         # and it is not "attempted" (manually graded problem), it is
+         # not "complete"
+ 	if ($self->getCompletionStatus($part) == ATTEMPTED() ||
+ 	    $status == ANSWER_SUBMITTED() ) {
+ 	    # did this part already, as well as we can
+ 	    next;
+ 	}
+ 	if ($status == OPEN() || $status == TRIES_LEFT()) {
+ 	    return 1;
+ 	}
+     }
+     # If all the parts were complete, so was this problem.
+     return 0;
+ }
  =pod
  =head2 Resource/Nav Map Navigation
- Line 3474  sub getNext {
+ Line 5197  sub getNext {
      my $to = $self->to();
      foreach my $branch ( split(/,/, $to) ) {
          my $choice = $self->{NAV_MAP}->getById($branch);
+         #if (!$choice->condition()) { next; }
          my $next = $choice->goesto();
          $next = $self->{NAV_MAP}->getById($next);
- Line 3502  sub browsePriv {
+ Line 5226  sub browsePriv {
          return $self->{BROWSE_PRIV};
      }
-     $self->{BROWSE_PRIV} = &Apache::lonnet::allowed('bre', $self->src());
+     $self->{BROWSE_PRIV} = &Apache::lonnet::allowed('bre',$self->src(),
+ 						    $self->symb());
  }
  =pod

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

Removed from v.1.176
changed lines
	Added in v.1.444