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.443 and 1.545

-version 1.443, 2010/01/26 11:33:48
+version 1.545, 2018/12/29 23:24:40
  Line 2
  # Navigate Maps Handler
  #
  # $Id$
  #
  # Copyright Michigan State University Board of Trustees
  #
- Line 52  described at http://www.lon-capa.org.
+ Line 51  described at http://www.lon-capa.org.
  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
+ LON-CAPA, in a course, by going to /adm/test. The content of
- tweak the /home/httpd/lonTabs/htpasswd file to view it.) The
+ the hash will be under the heading "Big Hash".
- content of the hash will be under the heading "Big Hash".
+ Access to /adm/test is controlled by a domain configuration,
+ which a Domain Coordinator will set for a server's default domain
+ via: Main Menu > Set domain configuration > Display (Access to
+ server status pages checked), and entering a username:domain
+ or IP address in the "Show user environment" row. Users with
+ an unexpired domain coordinator role in the server's domain
+ automatically receive access to /adm/test.
  Big Hash contains, among other things, how resources are related
  to each other (next/previous), what resources are maps, which
- Line 65  processed.
+ Line 71  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
+ the hash. It also provides access to several auxiliary 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.
- Line 78  Apache::lonnavmaps also provides fairly
+ Line 84  Apache::lonnavmaps also provides fairly
  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
+ B<Note>: Apache::lonnavmaps by default will show information
- logged in user"; if you want things like "due dates for another
+ for the "currently logged in user".  However, if information
- student" lonnavmaps can not directly retrieve information like
+ about resources is needed for a different user, e.g., a bubblesheet
- that. You need the EXT function. This module can still help,
+ exam which uses randomorder, or randompick needs to be printed or
- because many things, such as the course structure, are constant
+ graded for named user(s) or specific CODEs, then the username,
+ domain, or CODE can be passed as arguments when creating a new
+ navmap object.
+ Note if you want things like "due dates for another student",
+ you would use the EXT function instead of lonnavmaps.
+ That said, the lonnavmaps module can still help, because many
+ things, such as the course structure, are usually constant
  between users, and Apache::lonnavmaps can help by providing
  symbs for the EXT call.
- Line 92  all, then documents the Apache::lonnavma
+ Line 105  all, then documents the Apache::lonnavma
  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
+ Apache::lonnavmaps::Resource objects that are returned singularly
+ by: getBySymb(), getById(), getByMapPc(), and getResourceByUrl()
+ (can also be as an array), or in an array by retrieveResources().
  =head1 Subroutine: render
- Line 164  If true, the resource's folder will not
+ Line 179  If true, the resource's folder will not
  it. Default is false. True implies printCloseAll is false, since you
  can't close or open folders when this is on anyhow.
+ =item * B<map_no_edit_link>:
+ If true, the title of the folder or page will not be followed by an
+ icon/link to direct editing of a folder or composite page, originally
+ added via the Course Editor.
  =back
  =item * B<Apache::lonnavmaps::communication_status>:
- Line 464  returns 4
+ Line 485  returns 4
  =item add_linkitem()
- =item show_linkitems()
+ =item show_linkitems_toolbar()
  =back
- Line 478  use Apache::loncommon();
+ Line 499  use Apache::loncommon();
  use Apache::lonenc();
  use Apache::lonlocal;
  use Apache::lonnet;
+ use Apache::lonmap;
- use POSIX qw (floor strftime);
+ use POSIX qw (ceil floor strftime);
  use Time::HiRes qw( gettimeofday tv_interval );
  use LONCAPA;
  use DateTime();
+ use HTML::Entities;
+ # For debugging
+ #use Data::Dumper;
  # symbolic constants
  sub SYMB { return 1; }
- Line 509  my %statusIconMap =
+ Line 537  my %statusIconMap =
  my %iconAltTags =   #texthash does not work here
      ( 'navmap.correct.gif'  => 'Correct',
        'navmap.wrong.gif'    => 'Incorrect',
-       'navmap.open.gif'     => 'Open',
+       'navmap.open.gif'     => 'Is Open',
        'navmap.partial.gif'  => 'Partially Correct',
        'navmap.ellipsis.gif' => 'Attempted',
       );
- Line 528  my %colormap =
+ Line 556  my %colormap =
        $resObj->OPEN                   => '',
        $resObj->NOTHING_SET            => '',
        $resObj->ATTEMPTED              => '',
+       $resObj->CREDIT_ATTEMPTED       => '',
        $resObj->ANSWER_SUBMITTED       => '',
        $resObj->PARTIALLY_CORRECT      => '#006600'
        );
- Line 535  my %colormap =
+ Line 564  my %colormap =
  # is not yet done and due in less than 24 hours
  my $hurryUpColor = "#FF0000";
- my $future_slots_checked = 0;
- my $future_slots = 0;
- sub close {
-     if ($env{'environment.remotenavmap'} ne 'on') { return ''; }
-     return(<<ENDCLOSE);
- <script type="text/javascript">
- window.status='Accessing Nav Control';
- menu=window.open("/adm/rat/empty.html","loncapanav",
-                  "height=600,width=400,scrollbars=1");
- window.status='Closing Nav Control';
- menu.close();
- window.status='Done.';
- </script>
- ENDCLOSE
- }
- sub update {
-     if ($env{'environment.remotenavmap'} ne 'on') { return ''; }
-     if (!$env{'request.course.id'}) { return ''; }
-     if ($ENV{'REQUEST_URI'}=~m|^/adm/navmaps|) { return ''; }
-     return(<<ENDUPDATE);
- <form name="navform"></form>
- <script type="text/javascript">
- this.document.navform.action='/adm/navmaps#curloc';
- this.document.navform.target='loncapanav';
- this.document.navform.submit();
- </script>
- ENDUPDATE
- }
  sub addToFilter {
      my $hashIn = shift;
      my $addition = shift;
- Line 637  sub getDescription {
+ Line 634  sub getDescription {
          return &mt("Having technical difficulties; please check status later");
      }
      if ($status == $res->NOTHING_SET) {
-         return &mt("Not currently assigned.");
+         return &Apache::lonhtmlcommon::direct_parm_link(&mt('Not currently assigned'),$res->symb(),'opendate',$part);
      }
      if ($status == $res->OPEN_LATER) {
-         return &mt("Open ") .timeToHumanString($open,'start');
+         return &mt("Open [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($open,'start'),$res->symb(),'opendate',$part));
      }
+     my $slotinfo;
      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);
+             my $slotmsg;
              if ($slot_status == $res->UNKNOWN) {
-                 return &mt('Reservation status unknown');
+                 $slotmsg = &mt('Reservation status unknown');
              } elsif ($slot_status == $res->RESERVED) {
-                 return &mt('Reserved - ends [_1]',
+                 $slotmsg = &mt('Reserved - ends [_1]',
                             timeToHumanString($slot_time,'end'));
              } elsif ($slot_status == $res->RESERVED_LOCATION) {
-                 return &mt('Reserved - specific location(s) - ends [_1]',
+                 $slotmsg = &mt('Reserved - specific location(s) - ends [_1]',
                             timeToHumanString($slot_time,'end'));
              } elsif ($slot_status == $res->RESERVED_LATER) {
-                 return &mt('Reserved - next open [_1]',
+                 $slotmsg = &mt('Reserved - next open [_1]',
                             timeToHumanString($slot_time,'start'));
              } elsif ($slot_status == $res->RESERVABLE) {
-                 return &mt('Reservable ending [_1]',
+                 $slotmsg = &mt('Reservable, reservations close [_1]',
+                            timeToHumanString($slot_time,'end'));
+             } elsif ($slot_status == $res->NEEDS_CHECKIN) {
+                 $slotmsg = &mt('Reserved, check-in needed - ends [_1]',
                             timeToHumanString($slot_time,'end'));
              } elsif ($slot_status == $res->RESERVABLE_LATER) {
-                 return &mt('Reservable starting [_1]',
+                 $slotmsg = &mt('Reservable, reservations open [_1]',
                             timeToHumanString($slot_time,'start'));
              } elsif ($slot_status == $res->NOT_IN_A_SLOT) {
-                 return &mt('Reserve a time/place to work');
+                 $slotmsg = &mt('Reserve a time/place to work');
              } elsif ($slot_status == $res->NOTRESERVABLE) {
-                 return &mt('Reservation not available');
+                 $slotmsg = &mt('Reservation not available');
              } elsif ($slot_status == $res->WAITING_FOR_GRADE) {
-                 return &mt('Submission in grading queue');
+                 $slotmsg = &mt('Submission in grading queue');
+             }
+             if ($slotmsg) {
+                 if ($res->is_task() || !$due) {
+                      return $slotmsg;
+                 }
+                 $slotinfo = ('&nbsp;' x 2).'('.$slotmsg.')';
              }
          }
      }
      if ($status == $res->OPEN) {
          if ($due) {
  	    if ($res->is_practice()) {
- 		return &mt("Closes ")."  " .timeToHumanString($due,'start');
+ 		return &mt("Closes [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'duedate',$part)).$slotinfo;
  	    } else {
- 		return &mt("Due")."  " .timeToHumanString($due,'end');
+ 		return &mt("Due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'duedate',$part)).$slotinfo;
  	    }
          } else {
-             return &mt("Open, no due date");
+             return &Apache::lonhtmlcommon::direct_parm_link(&mt("Open, no due date"),$res->symb(),'duedate',$part).$slotinfo;
          }
      }
      if ($status == $res->PAST_DUE_ANSWER_LATER) {
-         return &mt("Answer open")." " .timeToHumanString($answer,'start');
+         return &mt("Answer open [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($answer,'start'),$res->symb(),'answerdate',$part));
      }
      if ($status == $res->PAST_DUE_NO_ANSWER) {
  	if ($res->is_practice()) {
- 	    return &mt("Closed")." " . timeToHumanString($due,'start');
+ 	    return &mt("Closed [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'answerdate,duedate',$part));
  	} else {
- 	    return &mt("Was due")." " . timeToHumanString($due,'end');
+ 	    return &mt("Was due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'answerdate,duedate',$part));
  	}
      }
      if (($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT)
  	&& $res->handgrade($part) ne 'yes') {
-         return &mt("Answer available");
+         my $msg = &mt('Answer available');
+         my $parmlist = 'answerdate,duedate';
+         if (($res->is_tool) && ($res->is_gradable())) {
+             if (($status == $res->PARTIALLY_CORRECT) && ($res->parmval('retrypartial',$part))) {
+                 $msg = &mt('Grade received');
+                 $parmlist = 'retrypartial';
+             } else {
+                 $msg = &mt('Grade available');
+             }
+         }
+         return &Apache::lonhtmlcommon::direct_parm_link($msg,$res->symb(),$parmlist,$part);
      }
      if ($status == $res->EXCUSED) {
          return &mt("Excused by instructor");
      }
      if ($status == $res->ATTEMPTED) {
-         return &mt("Answer submitted, 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->CREDIT_ATTEMPTED) {
+         if ($res->is_anonsurvey($part) || $res->is_survey($part)) {
+             return &mt("Credit for survey submission");
+         }
      }
      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>('.&mt('[_1] of [quant,_2,try,tries] used',$tries,$maxtries).')</i></font>';
+             $triesString = '<span class="LC_fontsize_medium"><i>('.&mt('[_1] of [quant,_2,try,tries] used',$tries,$maxtries).')</i></span>';
              if ($maxtries > 1 && $maxtries - $tries == 1) {
                  $triesString = "<b>$triesString</b>";
              }
          }
          if ($due) {
-             return &mt("Due")." " . timeToHumanString($due,'end') .
+             return &mt("Due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'duedate',$part)) .
                  " $triesString";
          } else {
-             return &mt("No due date")." $triesString";
+             return &Apache::lonhtmlcommon::direct_parm_link(&mt("No due date"),$res->symb(),'duedate',$part)." $triesString";
          }
      }
      if ($status == $res->ANSWER_SUBMITTED) {
- Line 798  sub timeToHumanString {
+ Line 825  sub timeToHumanString {
          # Less than an hour
          if ( $delta < $hour ) {
-             # If so, use minutes
+             # If so, use minutes; or minutes, seconds (if format requires)
              my $minutes = floor($delta / 60);
+             if (($format ne '') && ($format =~ /\%(T|S)/)) {
+                 my $display;
+                 if ($minutes == 1) {
+                     $display = "${prefix}1 minute";
+                 } else {
+                     $display = "$prefix$minutes minutes";
+                 }
+                 my $seconds = $delta % $minute;
+                 if ($seconds == 0) {
+                     $display .= $tense;
+                 } elsif ($seconds == 1) {
+                     $display .= ", 1 second$tense";
+                 } else {
+                     $display .= ", $seconds seconds$tense";
+                 }
+                 return $display;
+             }
              if ($minutes == 1) { return "${prefix}1 minute$tense"; }
              return "$prefix$minutes minutes$tense";
          }
          # Is it less than 24 hours away? If so,
-         # display hours + minutes
+         # display hours + minutes, (and + seconds, if format specified it)
          if ( $delta < $hour * 24) {
              my $hours = floor($delta / $hour);
              my $minutes = floor(($delta % $hour) / $minute);
- Line 820  sub timeToHumanString {
+ Line 864  sub timeToHumanString {
              if ($minutes == 0) {
                  $minuteString = "";
              }
+             if (($format ne '') && ($format =~ /\%(T|S)/)) {
+                 my $display = "$prefix$hourString$minuteString";
+                 my $seconds = $delta-(($hours * $hour)+($minutes * $minute));
+                 if ($seconds == 0) {
+                     $display .= $tense;
+                 } elsif ($seconds == 1) {
+                     $display .= ", 1 second$tense";
+                 } else {
+                     $display .= ", $seconds seconds$tense";
+                 }
+                 return $display;
+             }
              return "$prefix$hourString$minuteString$tense";
          }
+         # Date/time is more than 24 hours away
  	my $dt = DateTime->from_epoch(epoch => $time)
  	                 ->set_time_zone(&Apache::lonlocal::gettimezone());
- 	# If there's a caller supplied format, use it.
+ 	# If there's a caller supplied format, use it, unless it only displays
+         # H:M:S or H:M.
- 	if ($format ne '') {
+ 	if (($format ne '') && ($format ne '%T') && ($format ne '%R')) {
  	    my $timeStr = $dt->strftime($format);
  	    return $timeStr.' ('.$dt->time_zone_short_name().')';
  	}
- Line 880  sub part_status_summary { return 4; }
+ Line 939  sub part_status_summary { return 4; }
  sub render_resource {
      my ($resource, $part, $params) = @_;
+     my $editmapLink;
      my $nonLinkedText = ''; # stuff after resource title not in link
      my $link = $params->{"resourceLink"};
+     if ($resource->ext()) {
+         $link =~ s/\#.+(\?)/$1/g;
+     }
      #  The URL part is not escaped at this point, but the symb is...
- Line 900  sub render_resource {
+ Line 963  sub render_resource {
          $newBranchText = "<img src='$location/branch.gif' alt=".mt('Branch')." />";
      }
-     # links to open and close the folder
      my $whitespace = $location.'/whitespace_21.gif';
-     my $linkopen = "<img src='$whitespace' alt='' />"."<a href=\"$link\">";
+     my ($nomodal,$linkopen,$linkclose);
-     my $linkclose = "</a>";
+     unless ($resource->is_map() || $params->{'resource_nolink'}) {
+         $linkopen = "<img src='$whitespace' alt='' />";
+         $linkclose = "</a>";
+         if (($params->{'modalLink'}) && (!$resource->is_sequence())) {
+             if ($link =~m{^(?:|/adm/wrapper)/ext/([^#]+)}) {
+                 my $exturl = $1;
+                 if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) {
+                     $nomodal = 1;
+                 }
+             } elsif (($link eq "/public/$LONCAPA::match_domain/$LONCAPA::match_courseid/syllabus") &&
+                      ($env{'request.course.id'}) && ($ENV{'SERVER_PORT'} == 443) &&
+                      ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
+                 $nomodal = 1;
+             }
+             my $esclink = &js_escape($link);
+             if ($nomodal) {
+                 $linkopen .= "<a href=\"#\" onclick=\"javascript:window.open('$esclink','resourcepreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1'); return false;\" />";
+             } else {
+                 $linkopen .= "<a href=\"$link\" onclick=\"javascript:openMyModal('$esclink',600,500,'yes','true'); return false;\">";
+             }
+         } else {
+             $linkopen .= "<a href=\"$link\">";
+         }
+     }
      # Default icon: unknown page
      my $icon = "<img class=\"LC_contentImage\" src='$location/unknown.gif' alt='' />";
- Line 952  sub render_resource {
+ Line 1036  sub render_resource {
                  '&amp;jump=' .
                  &escape($resource->symb()) .
                  "&amp;folderManip=1\">";
+             $linkclose = '</a>';
          } else {
              # Don't allow users to manipulate folder
              $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') . '.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."\" />";
+             if ($params->{'caller'} eq 'sequence') {
-             $linkopen = "";
+                 $linkopen = "<a href=\"$link\">";
-             $linkclose = "";
+                 $linkclose = '</a>';
+             } else {
+                 $linkopen = "";
+                 $linkclose = "";
+             }
+         }
+         if (((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) ||
+               (&Apache::lonnet::allowed('cev',$env{'request.course.id'}))) &&
+             ($resource->symb=~/\_\_\_[^\_]+\_\_\_uploaded/)) {
+             if (!$params->{'map_no_edit_link'}) {
+                 my $icon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png';
+                 $editmapLink='&nbsp;'.
+                          '<a href="/adm/coursedocs?command=directnav&amp;symb='.&escape($resource->symb()).'">'.
+                          '<img src="'.$icon.'" alt="'.&mt('Edit Content').'" title="'.&mt('Edit Content').'" />'.
+                          '</a>';
+             }
+         }
+         if ($params->{'mapHidden'} || $resource->randomout()) {
+             $nonLinkedText .= ' <span class="LC_warning">('.&mt('hidden').')</span> ';
+         } elsif ($params->{'mapUnlisted'}) {
+             $nonLinkedText .= ' <span class="LC_warning">('.&mt('unlisted').')</span> ';
+         }
+     } else {
+         if ($resource->randomout()) {
+             $nonLinkedText .= ' <span class="LC_warning">('.&mt('hidden').')</span> ';
+         } elsif (($resource->deeplink($params->{caller}) eq 'absent') ||
+                  ($resource->deeplink($params->{caller}) eq 'grades')) {
+             $nonLinkedText .= ' <span class="LC_warning">('.&mt('unlisted').')</span> ';
          }
-     }
-     if ($resource->randomout()) {
-         $nonLinkedText .= ' <i>('.&mt('hidden').')</i> ';
      }
      if (!$resource->condval()) {
-         $nonLinkedText .= ' <i>('.&mt('conditionally hidden').')</i> ';
+         $nonLinkedText .= ' <span class="LC_info">('.&mt('conditionally hidden').')</span> ';
      }
      if (($resource->is_practice()) && ($resource->is_raw_problem())) {
-         $nonLinkedText .=' <font color="green"><b>'.&mt('not graded').'</b></font>';
+         $nonLinkedText .=' <span class="LC_info"><b>'.&mt('not graded').'</b></span>';
      }
      # We're done preparing and finally ready to start the rendering
- Line 994  sub render_resource {
+ Line 1101  sub render_resource {
      # Is this the current resource?
      if (!$params->{'displayedHereMarker'} &&
          $resource->symb() eq $params->{'here'} ) {
-         $curMarkerBegin = '<em>';
+         unless ($resource->is_map()) {
-         $curMarkerEnd = '</em>';
+             $curMarkerBegin = '<span class="LC_current_nav_location">';
+             $curMarkerEnd = '</span>';
+         }
  	$params->{'displayedHereMarker'} = 1;
      }
- Line 1011  sub render_resource {
+ Line 1120  sub render_resource {
          $nonLinkedText .= ' ('.&mt('[_1] parts', $resource->countParts()).')';
      }
-     my $target;
-     if ($env{'environment.remotenavmap'} eq 'on') {
- 	$target=' target="loncapaclient" ';
-     }
      if (!$params->{'resource_nolink'} && !$resource->is_sequence() && !$resource->is_empty_sequence) {
-         $result .= "$curMarkerBegin<a $target href=\"$link\">$title$partLabel</a>$curMarkerEnd$nonLinkedText</td>";
+         $linkclose = '</a>';
-     } else {
+         if ($params->{'modalLink'}) {
-         $result .= "$curMarkerBegin$linkopen$title$partLabel</a>$curMarkerEnd$nonLinkedText</td>";
+             my $esclink = &js_escape($link);
+             if ($nomodal) {
+                 $linkopen = "<a href=\"#\" onclick=\"javascript:window.open('$esclink','resourcepreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1'); return false;\" />";
+             } else {
+                 $linkopen = "<a href=\"$link\" onclick=\"javascript:openMyModal('$esclink',600,500,'yes','true'); return false;\">";
+             }
+         } else {
+             $linkopen = "<a href=\"$link\">";
+         }
      }
+     $result .= "$curMarkerBegin$linkopen$title$partLabel$linkclose$curMarkerEnd$editmapLink$nonLinkedText</td>";
      return $result;
  }
- Line 1029  sub render_communication_status {
+ Line 1143  sub render_communication_status {
      my $discussionHTML = ""; my $feedbackHTML = ""; my $errorHTML = "";
      my $link = $params->{"resourceLink"};
-     my $target;
+     my $linkopen = "<a href=\"$link\">";
-     if ($env{'environment.remotenavmap'} eq 'on') {
- 	$target=' target="loncapaclient" ';
-     }
-     my $linkopen = "<a $target href=\"$link\">";
      my $linkclose = "</a>";
      my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
      if ($resource->hasDiscussion()) {
          $discussionHTML = $linkopen .
              '<img alt="'.&mt('New Discussion').'" src="'.$location.'/chat.gif" title="'.&mt('New Discussion').'"/>' .
- Line 1046  sub render_communication_status {
+ Line 1157  sub render_communication_status {
          my $feedback = $resource->getFeedback();
          foreach my $msgid (split(/\,/, $feedback)) {
              if ($msgid) {
-                 $feedbackHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
+                 $feedbackHTML .= '&nbsp;<a href="/adm/email?display='
                      . &escape($msgid) . '">'
                      . '<img alt="'.&mt('New E-mail').'" src="'.$location.'/feedback.gif" title="'.&mt('New E-mail').'"/></a>';
              }
- Line 1060  sub render_communication_status {
+ Line 1171  sub render_communication_status {
              last if ($errorcount>=10); # Only output 10 bombs maximum
              if ($msgid) {
                  $errorcount++;
-                 $errorHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
+                 $errorHTML .= '&nbsp;<a href="/adm/email?display='
                      . &escape($msgid) . '">'
                      . '<img alt="'.&mt('New Error').'" src="'.$location.'/bomb.gif" title="'.&mt('New Error').'"/></a>';
              }
- Line 1080  sub render_quick_status {
+ Line 1191  sub render_quick_status {
          $params->{'multipart'} && $part eq "0";
      my $link = $params->{"resourceLink"};
-     my $target;
+     my $linkopen = "<a href=\"$link\">";
-     if ($env{'environment.remotenavmap'} eq 'on') {
- 	$target=' target="loncapaclient" ';
-     }
-     my $linkopen = "<a $target href=\"$link\">";
      my $linkclose = "</a>";
  	$result .= '<td class="LC_middle">';
-     if ($resource->is_problem() &&
+     if ($resource->is_gradable() &&
          !$firstDisplayed) {
          my $icon = $statusIconMap{$resource->simpleStatus($part)};
          my $alt = $iconAltTags{$icon};
- Line 1112  sub render_long_status {
+ Line 1219  sub render_long_status {
          $params->{'multipart'} && $part eq "0";
      my $color;
-     if ($resource->is_problem() || $resource->is_practice()) {
+     my $info = '';
+     if ($resource->is_gradable() || $resource->is_practice()) {
          $color = $colormap{$resource->status};
-         if (dueInLessThan24Hours($resource, $part) ||
+         if (dueInLessThan24Hours($resource, $part)) {
-             lastTry($resource, $part)) {
              $color = $hurryUpColor;
-         }
+             $info = ' title="'.&mt('Due in less than 24 hours!').'"';
+         } elsif (lastTry($resource, $part)) {
+             unless (($resource->problemstatus($part) eq 'no') ||
+                     ($resource->problemstatus($part) eq 'no_feedback_ever')) {
+                 $color = $hurryUpColor;
+                 $info = ' title="'.&mt('One try remaining!').'"';
+             }
+          }
      }
-     if ($resource->kind() eq "res" &&
+     if (($resource->kind() eq "res") &&
-         ($resource->is_problem() || $resource->is_practice()) &&
+         ($resource->is_raw_problem() || $resource->is_gradable()) &&
          !$firstDisplayed) {
-         if ($color) {$result .= "<font color=\"$color\"><b>"; }
+         if ($color) {$result .= '<span style="color:'.$color.'"'.$info.'><b>'; }
          $result .= getDescription($resource, $part);
-         if ($color) {$result .= "</b></font>"; }
+         if ($color) {$result .= "</b></span>"; }
      }
      if ($resource->is_map() && &advancedUser() && $resource->randompick()) {
          $result .= &mt('(randomly select [_1])', $resource->randompick());
- Line 1169  my @statuses = ($resObj->CORRECT, $resOb
+ Line 1283  my @statuses = ($resObj->CORRECT, $resOb
  sub render_parts_summary_status {
      my ($resource, $part, $params) = @_;
-     if (!$resource->is_problem() && !$resource->contains_problem) { return '<td></td>'; }
+     if (!$resource->is_gradable() && !$resource->contains_problem) { return '<td></td>'; }
      if ($params->{showParts}) {
  	return '<td></td>';
      }
- Line 1208  sub render_parts_summary_status {
+ Line 1322  sub render_parts_summary_status {
      }
      $return.= $td . $totalParts . ' parts: ';
      foreach my $status (@statuses) {
- 	if ($overallstatus{$status}) {
+         if ($overallstatus{$status}) {
- 	    $return.="<font color='" . $statusColors{$status} .
+             $return.='<span style="color:' . $statusColors{$status}
- 		"'>" . $overallstatus{$status} . ' '
+                    . '">' . $overallstatus{$status} . ' '
- 		. $statusStrings{$status} . "</font>";
+                    . $statusStrings{$status} . '</span>';
- 	}
+         }
      }
      $return.= $endtd;
      return $return;
- Line 1280  sub render {
+ Line 1394  sub render {
          # Without renaming the filterfunc, the server seems to go into
          # an infinite loop
          my $oldFilterFunc = $filterFunc;
          $filterFunc = sub { my $res = shift; return !$res->randomout() &&
+                                 ($res->deeplink($args->{'caller'}) ne 'absent') &&
+                                 ($res->deeplink($args->{'caller'}) ne 'grades') &&
                                  &$oldFilterFunc($res);};
      }
- Line 1310  sub render {
+ Line 1426  sub render {
              my $currenturl = $env{'form.postdata'};
              #$currenturl=~s/^http\:\/\///;
              #$currenturl=~s/^[^\/]+//;
+             unless ($args->{'caller'} eq 'sequence') {
-             $here = $jump = &Apache::lonnet::symbread($currenturl);
+                 $here = $jump = &Apache::lonnet::symbread($currenturl);
+             }
  	}
- 	if ($here eq '') {
+ 	if (($here eq '') && ($args->{'caller'} ne 'sequence')) {
  	    my $last;
  	    if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
                      &GDBM_READER(),0640)) {
- Line 1437  sub render {
+ Line 1554  sub render {
      if ($printCloseAll && !$args->{'resource_no_folder_link'}) {
  	my ($link,$text);
          if ($condition) {
- 	    $link='"navmaps?condition=0&amp;filter=&amp;'.$queryString.
+ 	    $link='navmaps?condition=0&amp;filter=&amp;'.$queryString.
- 		'&here='.&escape($here).'"';
+ 		'&amp;here='.&escape($here);
  	    $text='Close all folders';
          } else {
- 	    $link='"navmaps?condition=1&amp;filter=&amp;'.$queryString.
+ 	    $link='navmaps?condition=1&amp;filter=&amp;'.$queryString.
- 		'&here='.&escape($here).'"';
+ 		'&amp;here='.&escape($here);
  	    $text='Open all folders';
          }
+         if ($env{'form.register'}) {
+             $link .= '&amp;register='.$env{'form.register'};
+         }
  	if ($args->{'caller'} eq 'navmapsdisplay') {
- 	    &add_linkitem($args->{'linkitems'},'changefolder',
+             unless ($args->{'notools'}) {
- 			  'location.href='.$link,$text);
+                 &add_linkitem($args->{'linkitems'},'changefolder',
+                               "location.href='$link'",$text);
+             }
  	} else {
- 	    $result.='<a href='.$link.'>'.&mt($text).'</a>';
+ 	    $result.= '<a href="'.$link.'">'.&mt($text).'</a>';
  	}
          $result .= "\n";
      }
      # Check for any unread discussions in all resources.
-     if ($args->{'caller'} eq 'navmapsdisplay') {
+     if (($args->{'caller'} eq 'navmapsdisplay') && (!$args->{'notools'})) {
  	&add_linkitem($args->{'linkitems'},'clearbubbles',
  		      'document.clearbubbles.submit()',
  		      'Mark all posts read');
  	my $time=time;
+         my $querystr = &HTML::Entities::encode($ENV{'QUERY_STRING'},'<>&"');
  	$result .= (<<END);
      <form name="clearbubbles" method="post" action="/adm/feedback">
- 	<input type="hidden" name="navurl" value="$ENV{'QUERY_STRING'}" />
+ 	<input type="hidden" name="navurl" value="$querystr" />
  	<input type="hidden" name="navtime" value="$time" />
  END
+         if ($env{'form.register'}) {
+             $result .= '<input type="hidden" name="register" value="'.$env{'form.register'}.'" />';
+         }
          if ($args->{'sort'} eq 'discussion') {
  	    my $totdisc = 0;
  	    my $haveDisc = '';
- Line 1485  END
+ Line 1611  END
  	}
  	$result.='</form>';
      }
+     if (($args->{'caller'} eq 'navmapsdisplay') &&
+         ((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) ||
+          (&Apache::lonnet::allowed('cev',$env{'request.course.id'})))) {
+         my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+         my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+         if ($env{'course.'.$env{'request.course.id'}.'.url'} eq
+             "uploaded/$cdom/$cnum/default.sequence") {
+             &add_linkitem($args->{'linkitems'},'edittoplevel',
+                           "javascript:gocmd('/adm/coursedocs','editdocs');",
+                           'Content Editor');
+         }
+     }
      if ($args->{'caller'} eq 'navmapsdisplay') {
-         $result .= '<table><tr><td>'.
+         $result .= &show_linkitems_toolbar($args,$condition);
-                    &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').'</td>';
- 	if ($env{'environment.remotenavmap'} ne 'on') {
- 	    $result .= '<td>&nbsp;</td>';
-         } else {
- 	    $result .= '</tr><tr>';
-         }
- 	$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'};
      }
- Line 1540  END
+ Line 1659  END
      $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,
+     # If we're suppressing empty sequences, look for them here.
-     # since structure actually doesn't matter, except what map has what resources.
+     # We also do this even if $args->{'suppressEmptySequences'}
-     if ($args->{'suppressEmptySequences'}) {
+     # is not true, so we can hide empty sequences for which the
-         my $dfsit = Apache::lonnavmaps::DFSiterator->new($navmap,
+     # hiddenresource parameter is set to yes (at map level), or
-                                                          $it->{FIRST_RESOURCE},
+     # mark as hidden for users who have $userCanSeeHidden.
-                                                          $it->{FINISH_RESOURCE},
+     # Use DFS for speed, since structure actually doesn't matter,
-                                                          {}, undef, 1);
+     # except what map has what resources.
-         my $depth = 0;
-         $dfsit->next();
+     my $dfsit = Apache::lonnavmaps::DFSiterator->new($navmap,
-         my $curRes = $dfsit->next();
+                                                      $it->{FIRST_RESOURCE},
-         while ($depth > -1) {
+                                                      $it->{FINISH_RESOURCE},
-             if ($curRes == $dfsit->BEGIN_MAP()) { $depth++; }
+                                                      {}, undef, 1);
-             if ($curRes == $dfsit->END_MAP()) { $depth--; }
+     my $depth = 0;
+     $dfsit->next();
-             if (ref($curRes)) {
+     my $curRes = $dfsit->next();
-                 # Parallel pre-processing: Do sequences have non-filtered-out children?
+     while ($depth > -1) {
-                 if ($curRes->is_map()) {
+         if ($curRes == $dfsit->BEGIN_MAP()) { $depth++; }
-                     $curRes->{DATA}->{HAS_VISIBLE_CHILDREN} = 0;
+         if ($curRes == $dfsit->END_MAP()) { $depth--; }
-                     # Sequences themselves do not count as visible children,
-                     # unless those sequences also have visible children.
+         if (ref($curRes)) {
-                     # This means if a sequence appears, there's a "promise"
+             # Parallel pre-processing: Do sequences have non-filtered-out children?
-                     # that there's something under it if you open it, somewhere.
+             if ($curRes->is_map()) {
-                 } else {
+                 $curRes->{DATA}->{HAS_VISIBLE_CHILDREN} = 0;
-                     # Not a sequence: if it's filtered, ignore it, otherwise
+                 # Sequences themselves do not count as visible children,
-                     # rise up the stack and mark the sequences as having children
+                 # unless those sequences also have visible children.
-                     if (&$filterFunc($curRes)) {
+                 # This means if a sequence appears, there's a "promise"
-                         for my $sequence (@{$dfsit->getStack()}) {
+                 # that there's something under it if you open it, somewhere.
-                             $sequence->{DATA}->{HAS_VISIBLE_CHILDREN} = 1;
+             } elsif ($curRes->src()) {
-                         }
+                 # 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();
          }
+     } continue {
+         $curRes = $dfsit->next();
      }
      my $displayedJumpMarker = 0;
- Line 1632  END
+ Line 1755  END
  	undef($args->{'sort'});
      }
+     # Determine if page will be served with https in case
+     # it contains a syllabus which uses an external URL
+     # which points at an http site.
+     my ($is_ssl,$cdom,$cnum,$hostname);
+     if ($ENV{'SERVER_PORT'} == 443) {
+         $is_ssl = 1;
+         if ($r) {
+             $hostname = $r->hostname();
+         } else {
+             $hostname = $ENV{'SERVER_NAME'};
+         }
+     }
+     if ($env{'request.course.id'}) {
+         $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+         $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+     }
+     my $inhibitmenu;
+     if ($args->{'modalLink'}) {
+         $inhibitmenu = '&amp;inhibitmenu=yes';
+     }
      while (1) {
  	if ($args->{'sort'}) {
- Line 1667  END
+ Line 1812  END
          }
          # If this is an empty sequence and we're filtering them, continue on
-         if ($curRes->is_map() && $args->{'suppressEmptySequences'} &&
+         $args->{'mapHidden'} = 0;
-             !$curRes->{DATA}->{HAS_VISIBLE_CHILDREN}) {
+         $args->{'mapUnlisted'} = 0;
-             next;
+         if (($curRes->is_map()) && (!$curRes->{DATA}->{HAS_VISIBLE_CHILDREN})) {
+             if ($args->{'suppressEmptySequences'}) {
+                 next;
+             } else {
+                 my $mapname = &Apache::lonnet::declutter($curRes->src());
+                 $mapname = &Apache::lonnet::deversion($mapname);
+                 if (lc($navmap->get_mapparam(undef,$mapname,"0.hiddenresource")) eq 'yes') {
+                     if ($userCanSeeHidden) {
+                         $args->{'mapHidden'} = 1;
+                     } else {
+                         next;
+                     }
+                 } else {
+                     my $deeplink = $navmap->get_mapparam(undef,$mapname,"0.deeplink");
+                     if (($deeplink eq 'absent') || ($deeplink eq 'grades')) {
+                         if ($userCanSeeHidden) {
+                             $args->{'mapUnlisted'} = 1;
+                         } else {
+                             next;
+                         }
+                     }
+                 }
+             }
          }
          # If we're suppressing navmaps and this is a navmap, continue on
- Line 1730  END
+ Line 1897  END
  		    $args->{'condensed'} = 1;
  		}
              }
          }
+         # If deep-link parameter is set (and is not set to full) suppress link
+         # unless priviliged user, or calling context is sequence, and parameter
+         # set at map level
+         if ((!$curRes->deeplink($args->{'caller'})) ||
+             ($curRes->deeplink($args->{'caller'}) eq 'full') || &advancedUser()) {
+             $args->{'resource_nolink'} = 0;
+         } else {
+             $args->{'resource_nolink'} = 1;
+         }
          # If the multipart problem was condensed, "forget" it was multipart
          if (scalar(@parts) == 1) {
              $args->{'multipart'} = 0;
- Line 1753  END
+ Line 1929  END
  		$stack=$it->getStack();
  	    }
  	    ($src,$symb,$anchor)=getLinkForResource($stack);
+             my $srcHasQuestion = $src =~ /\?/;
+             if ($env{'request.course.id'}) {
+                 if (($is_ssl) && ($src =~ m{^\Q/public/$cdom/$cnum/syllabus\E($|\?)}) &&
+                     ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
+                     unless (&Apache::lonnet::uses_sts()) {
+                         if ($hostname ne '') {
+                             $src = 'http://'.$hostname.$src;
+                         }
+                         $src .= ($srcHasQuestion? '&amp;' : '?') . 'usehttp=1';
+                         $srcHasQuestion = 1;
+                     }
+                 } elsif (($is_ssl) && ($src =~ m{^\Q/adm/wrapper/ext/\E(?!https:)})) {
+                     unless (&Apache::lonnet::uses_sts()) {
+                         if ($hostname ne '') {
+                             $src = 'http://'.$hostname.$src;
+                         }
+                         $src .= ($srcHasQuestion? '&amp;' : '?') . 'usehttp=1';
+                         $srcHasQuestion = 1;
+                     }
+                 }
+             }
  	    if (defined($anchor)) { $anchor='#'.$anchor; }
- 	    my $srcHasQuestion = $src =~ /\?/;
+ 	    if (($args->{'caller'} eq 'sequence') && ($curRes->is_map())) {
- 	    $args->{"resourceLink"} = $src.
+ 	        $args->{"resourceLink"} = $src.($srcHasQuestion?'&amp;':'?') .'navmap=1';
- 		($srcHasQuestion?'&':'?') .
+ 	    } else {
- 		'symb=' . &escape($symb).$anchor;
+ 	        $args->{"resourceLink"} = $src.
+ 		    ($srcHasQuestion?'&amp;':'?') .
+ 		    'symb=' . &escape($symb).$inhibitmenu.$anchor;
+ 	    }
  	}
          # Now, we've decided what parts to show. Loop through them and
          # show them.
- Line 1809  END
+ Line 2009  END
  	    }
  	}
      }
+     $result.=&Apache::loncommon::end_data_table();
      # Print out the part that jumps to #curloc if it exists
      # delay needed because the browser is processing the jump before
- Line 1818  END
+ Line 2020  END
      # it's quite likely this might fix other browsers, too, and
      # certainly won't hurt anything.
      if ($displayedJumpMarker) {
-         $result .= "
+         $result .= &Apache::lonhtmlcommon::scripttag("
- <script>
  if (location.href.indexOf('#curloc')==-1) {
      setTimeout(\"location += '#curloc';\", 0)
  }
- </script>";
+ ");
      }
-     $result.=&Apache::loncommon::end_data_table();
      if ($r) {
          $r->print($result);
          $result = "";
- Line 1843  sub add_linkitem {
+ Line 2042  sub add_linkitem {
      $$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 ($args,$condition) = @_;
-     my @linkorder = ("blank","launchnav","closenav","firsthomework",
+     my $result;
- 		     "everything","uncompleted","changefolder","clearbubbles");
+     if (ref($args) eq 'HASH') {
+         if (ref($args->{'linkitems'}) eq 'HASH') {
-     my $result .='
+             my $numlinks = scalar(keys(%{$args->{'linkitems'}}));
-               <td align="left">
+             if ($numlinks > 1) {
-                        <span class="LC_nobreak">'."\n<ul id=\"LC_toolbar\">";
+                 $result = '<td>'.
- 	foreach my $link (@linkorder) {
+                           &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',
-         my $link_id = "LC_content_toolbar_".$link;
+                                                              undef,'RAT').
- 	if (defined($linkitems->{$link})) {
+                           '</td>'.
- 	    if ($linkitems->{$link}{'text'} ne '') {
+                           '<td>&nbsp;</td>'.
- 		$linkitems->{$link}{'cmd'}=~s/"/'/g;
+                           '<td class="LC_middle">'.&mt('Tools:').'</td>';
- 		if($linkitems->{$link}{'cmd'}){
+             }
-                    if($link eq 'changefolder'){
+             $result .= '<td align="left">'."\n".
-                       if($condition){$link_id='LC_content_toolbar_changefolder_toggled'}
+                        '<ul id="LC_toolbar">';
-                       else{$link_id='LC_content_toolbar_changefolder'}
+             my @linkorder = ('firsthomework','everything','uncompleted',
-                    }
+                              'changefolder','clearbubbles','edittoplevel');
-                           $result .=  ' <li><a href="#"'.
+             foreach my $link (@linkorder) {
- 			    	' onClick="'.$linkitems->{$link}{'cmd'}.'"'.
+                 if (ref($args->{'linkitems'}{$link}) eq 'HASH') {
-                                 ' id="'.$link_id.'"'.
+                     if ($args->{'linkitems'}{$link}{'text'} ne '') {
-                                 ' class="LC_toolbarItem"'.
+                         $args->{'linkitems'}{$link}{'cmd'}=~s/"/'/g;
- 			   	' title="'.$linkitems->{$link}{'text'}.'"></a></li>'."\n";
+                         if ($args->{'linkitems'}{$link}{'cmd'}) {
- 		}
+                             my $link_id = 'LC_content_toolbar_'.$link;
+                             if ($link eq 'changefolder') {
- 	    }
+                                 if ($condition) {
- 	}
+                                     $link_id='LC_content_toolbar_changefolder_toggled';
+                                 } else {
+                                     $link_id='LC_content_toolbar_changefolder';
+                                 }
+                             }
+                             $result .= '<li><a href="#" '.
+                                        'onclick="'.$args->{'linkitems'}{$link}{'cmd'}.'" '.
+                                        'id="'.$link_id.'" '.
+                                        'class="LC_toolbarItem" '.
+                                        'title="'.$args->{'linkitems'}{$link}{'text'}.'">'.
+                                        '</a></li>'."\n";
+                         }
+                     }
+                 }
+             }
+             $result .= '</ul>'.
+                        '</td>';
+             if (($numlinks==1) && (exists($args->{'linkitems'}{'edittoplevel'}))) {
+                 $result .= '<td><a href="'.$args->{'linkitems'}{'edittoplevel'}{'cmd'}.'">'.
+                            &mt('Content Editor').'</a></td>';
+             }
+         }
+         if ($args->{'sort_html'}) {
+             $result .= '<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>'.
+                        '<td align="right">'.$args->{'sort_html'}.'</td>';
+         }
+     }
+     if ($result) {
+         $result = "<table><tr>$result</tr></table>";
      }
-     $result .= '</ul>';
-     $result .= ' </span></td>'."\n";
      return $result;
  }
 ;
- Line 1998  sub new {
+ Line 2187  sub new {
      my $proto = shift;
      my $class = ref($proto) || $proto;
      my $self = {};
+     bless($self);		# So we can call change_user if necessary
+     $self->{USERNAME} = shift || $env{'user.name'};
+     $self->{DOMAIN}   = shift || $env{'user.domain'};
+     $self->{CODE}     = shift;
+     $self->{NOHIDE} = 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.
- Line 2007  sub new {
+ Line 2204  sub new {
      # failed
      $self->{NETWORK_FAILURE} = 0;
-     # tie the nav hash
+     # We can only tie the nav hash as done below if the username/domain
+     # match the env one. Otherwise change_user does everything we need...since we can't
+     # assume there are course hashes for the specific requested user:domain
+     # Note: change_user is also called if we need the nav hash when printing CODEd
+     # assignments or printing an exam, in which the enclosing folder for the items in
+     # the exam has hidden set.
+     #
-     my %navmaphash;
+     if (($self->{USERNAME} eq $env{'user.name'}) && ($self->{DOMAIN} eq $env{'user.domain'}) &&
-     my %parmhash;
+          !$self->{CODE} && !$self->{NOHIDE}) {
-     my $courseFn = $env{"request.course.fn"};
-     if (!(tie(%navmaphash, 'GDBM_File', "${courseFn}.db",
+ 	# tie the nav hash
-               &GDBM_READER(), 0640))) {
-         return undef;
+ 	my %navmaphash;
+ 	my %parmhash;
+ 	my $courseFn = $env{"request.course.fn"};
+ 	if (!(tie(%navmaphash, 'GDBM_File', "${courseFn}.db",
+ 		  &GDBM_READER(), 0640))) {
+ 	    return undef;
+ 	}
+ 	if (!(tie(%parmhash, 'GDBM_File', "${courseFn}_parms.db",
+ 		  &GDBM_READER(), 0640)))
+ 	{
+ 	    untie %{$self->{PARM_HASH}};
+ 	    return undef;
+ 	}
+ 	$self->{NAV_HASH} = \%navmaphash;
+ 	$self->{PARM_HASH} = \%parmhash;
+ 	$self->{PARM_CACHE} = {};
+     } else {
+ 	$self->change_user($self->{USERNAME}, $self->{DOMAIN},  $self->{CODE}, $self->{NOHIDE});
      }
+     return $self;
+ }
+ #
+ #  In some instances it is useful to be able to dynamically change the
+ # username/domain associated with a navmap (e.g. to navigate for someone
+ # else besides the current user...if sufficiently privileged.
+ # Parameters:
+ #    user  - New user.
+ #    domain- Domain the user belongs to.
+ #    code  - Anonymous CODE in use.
+ # Implicit inputs:
+ #
+ sub change_user {
+     my $self = shift;
+     $self->{USERNAME} = shift;
+     $self->{DOMAIN}   = shift;
+     $self->{CODE}     = shift;
+     $self->{NOHIDE}   = shift;
+     # If the hashes are already tied make sure to break that bond:
+     untie %{$self->{NAV_HASH}};
+     untie %{$self->{PARM_HASH}};
+     # The assumption is that we have to
+     # use lonmap here to re-read the hash and from it reconstruct
+     # new big and parameter hashes.  An implicit assumption at this time
+     # is that the course file is probably not created locally yet
+     # an that we will therefore just read without tying.
+     my ($cdom, $cnum) = split(/\_/, $env{'request.course.id'});
+     my %big_hash;
+     &Apache::lonmap::loadmap($cnum, $cdom, $self->{USERNAME}, $self->{DOMAIN}, $self->{CODE}, $self->{NOHIDE}, \%big_hash);
+     $self->{NAV_HASH} = \%big_hash;
+     # Now clear the parm cache and reconstruct the parm hash from the big_hash
+     # param.xxxx keys.
+     $self->{PARM_CACHE} = {};
-     if (!(tie(%parmhash, 'GDBM_File', "${courseFn}_parms.db",
+     my %parm_hash = {};
-               &GDBM_READER(), 0640)))
+     foreach my $key (keys(%big_hash)) {
-     {
+ 	if ($key =~ /^param\./) {
-         untie %{$self->{PARM_HASH}};
+ 	    my $param_key = $key;
-         return undef;
+ 	    $param_key =~ s/^param\.//;
+ 	    $parm_hash{$param_key} = $big_hash{$key};
+ 	}
      }
-     $self->{NAV_HASH} = \%navmaphash;
+     $self->{PARM_HASH} = \%parm_hash;
-     $self->{PARM_HASH} = \%parmhash;
-     $self->{PARM_CACHE} = {};
-     bless($self);
-     return $self;
  }
  sub generate_course_user_opt {
      my $self = shift;
      if ($self->{COURSE_USER_OPT_GENERATED}) { return; }
-     my $uname=$env{'user.name'};
+     my $uname=$self->{USERNAME};
-     my $udom=$env{'user.domain'};
+     my $udom=$self->{DOMAIN};
      my $cid=$env{'request.course.id'};
      my $cdom=$env{'course.'.$cid.'.domain'};
      my $cnum=$env{'course.'.$cid.'.num'};
- Line 2072  sub generate_course_user_opt {
+ Line 2336  sub generate_course_user_opt {
      return;
  }
  sub generate_email_discuss_status {
      my $self = shift;
      my $symb = shift;
- Line 2081  sub generate_email_discuss_status {
+ Line 2347  sub generate_email_discuss_status {
      my $cdom=$env{'course.'.$cid.'.domain'};
      my $cnum=$env{'course.'.$cid.'.num'};
-     my %emailstatus = &Apache::lonnet::dump('email_status');
+     my %emailstatus = &Apache::lonnet::dump('email_status',$self->{DOMAIN},$self->{USERNAME});
      my $logoutTime = $emailstatus{'logout'};
      my $courseLeaveTime = $emailstatus{'logout_'.$env{'request.course.id'}};
      $self->{LAST_CHECK} = (($courseLeaveTime > $logoutTime) ?
- Line 2089  sub generate_email_discuss_status {
+ Line 2355  sub generate_email_discuss_status {
      my %discussiontime = &Apache::lonnet::dump('discussiontimes',
  					       $cdom, $cnum);
      my %lastread = &Apache::lonnet::dump('nohist_'.$cid.'_discuss',
-                                         $env{'user.domain'},$env{'user.name'},'lastread');
+                                         $self->{DOMAIN},$self->{USERNAME},'lastread');
      my %lastreadtime = ();
-     foreach my $key (keys %lastread) {
+     foreach my $key (keys(%lastread)) {
          my $shortkey = $key;
          $shortkey =~ s/_lastread$//;
          $lastreadtime{$shortkey} = $lastread{$key};
- Line 2099  sub generate_email_discuss_status {
+ Line 2365  sub generate_email_discuss_status {
      my %feedback=();
      my %error=();
-     my @keys = &Apache::lonnet::getkeys('nohist_email',$env{'user.domain'},
+     my @keys = &Apache::lonnet::getkeys('nohist_email',$self->{DOMAIN},
- 					$env{'user.name'});
+ 					$self->{USERNAME});
      foreach my $msgid (@keys) {
  	if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
              my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,
-                 $symb,$error) = &Apache::lonmsg::unpackmsgid($msgid);
+                 $symb,$error) = &Apache::lonmsg::unpackmsgid(&LONCAPA::escape($msgid));
              &Apache::lonenc::check_decrypt(\$symb);
              if (($fromcid ne '') && ($fromcid ne $cid)) {
                  next;
- Line 2148  sub get_user_data {
+ Line 2414  sub get_user_data {
      # Retrieve performance data on problems
      my %student_data = Apache::lonnet::currentdump($env{'request.course.id'},
- 						   $env{'user.domain'},
+ 						   $self->{DOMAIN},
- 						   $env{'user.name'});
+ 						   $self->{USERNAME});
      $self->{STUDENT_DATA} = \%student_data;
      $self->{RETRIEVED_USER_DATA} = 1;
- Line 2378  resource object.
+ Line 2644  resource object.
  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):
+ =item * B<getByMapPc>(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.
- Line 2463  sub parmval {
+ Line 2729  sub parmval {
      my $self = shift;
      my ($what,$symb,$recurse)=@_;
      my $hashkey = $what."|||".$symb;
+     my $cache = $self->{PARM_CACHE};
      if (defined($self->{PARM_CACHE}->{$hashkey})) {
          if (ref($self->{PARM_CACHE}->{$hashkey}) eq 'ARRAY') {
              if (defined($self->{PARM_CACHE}->{$hashkey}->[0])) {
- Line 2477  sub parmval {
+ Line 2743  sub parmval {
              return $self->{PARM_CACHE}->{$hashkey};
          }
      }
      my $result = $self->parmval_real($what, $symb, $recurse);
      $self->{PARM_CACHE}->{$hashkey} = $result;
      if (wantarray) {
- Line 2485  sub parmval {
+ Line 2752  sub parmval {
      return $result->[0];
  }
  sub parmval_real {
      my $self = shift;
      my ($what,$symb,$recurse) = @_;
      # Make sure the {USER_OPT} and {COURSE_OPT} hashes are populated
      $self->generate_course_user_opt();
- Line 2500  sub parmval_real {
+ Line 2769  sub parmval_real {
          @cgrps = sort(@cgrps);
          $cgroup = $cgrps[0];
      }
-     my $uname=$env{'user.name'};
+     my $uname=$self->{USERNAME};
-     my $udom=$env{'user.domain'};
+     my $udom=$self->{DOMAIN};
      unless ($symb) { return ['']; }
      my $result='';
      my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb);
      $mapname = &Apache::lonnet::deversion($mapname);
+     my $toolsymb = '';
+     if ($fn =~ /ext\.tool$/) {
+         $toolsymb = $symb;
+     }
+     my ($recursed,@recurseup);
  # ----------------------------------------------------- Cascading lookup scheme
      my $rwhat=$what;
      $what=~s/^parameter\_//;
      $what=~s/\_/\./;
      my $symbparm=$symb.'.'.$what;
+     my $recurseparm=$mapname.'___(rec).'.$what;
      my $mapparm=$mapname.'___(all).'.$what;
      my $usercourseprefix=$cid;
      my $grplevel=$usercourseprefix.'.['.$cgroup.'].'.$what;
      my $grplevelr=$usercourseprefix.'.['.$cgroup.'].'.$symbparm;
+     my $grpleveli=$usercourseprefix.'.['.$cgroup.'].'.$recurseparm;
      my $grplevelm=$usercourseprefix.'.['.$cgroup.'].'.$mapparm;
      my $seclevel= $usercourseprefix.'.['.$csec.'].'.$what;
      my $seclevelr=$usercourseprefix.'.['.$csec.'].'.$symbparm;
+     my $secleveli=$usercourseprefix.'.['.$csec.'].'.$recurseparm;
      my $seclevelm=$usercourseprefix.'.['.$csec.'].'.$mapparm;
      my $courselevel= $usercourseprefix.'.'.$what;
      my $courselevelr=$usercourseprefix.'.'.$symbparm;
+     my $courseleveli=$usercourseprefix.'.'.$recurseparm;
      my $courselevelm=$usercourseprefix.'.'.$mapparm;
      my $useropt = $self->{USER_OPT};
      my $courseopt = $self->{COURSE_OPT};
      my $parmhash = $self->{PARM_HASH};
- Line 2537  sub parmval_real {
+ Line 2821  sub parmval_real {
      if ($uname and defined($useropt)) {
          if (defined($$useropt{$courselevelr})) { return [$$useropt{$courselevelr},'resource']; }
          if (defined($$useropt{$courselevelm})) { return [$$useropt{$courselevelm},'map']; }
+         if (defined($$useropt{$courseleveli})) { return [$$useropt{$courseleveli},'map']; }
+         unless ($recursed) {
+             @recurseup = $self->recurseup_maps($mapname);
+             $recursed = 1;
+         }
+         foreach my $item (@recurseup) {
+             my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what;
+             if (defined($$useropt{$norecursechk})) {
+                 if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                     return [$$useropt{$norecursechk},'map'];
+                 } else {
+                     last;
+                 }
+             }
+             my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what;
+             if (defined($$useropt{$recursechk})) { return [$$useropt{$recursechk},'map']; }
+         }
          if (defined($$useropt{$courselevel})) { return [$$useropt{$courselevel},'course']; }
      }
- Line 2544  sub parmval_real {
+ Line 2845  sub parmval_real {
      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{$grpleveli})) { return [$$courseopt{$grpleveli},'map']; }
+         unless ($recursed) {
+             @recurseup = $self->recurseup_maps($mapname);
+             $recursed = 1;
+         }
+         foreach my $item (@recurseup) {
+             my $norecursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(all).'.$what;
+             if (defined($$courseopt{$norecursechk})) {
+                 if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                     return [$$courseopt{$norecursechk},'map'];
+                 } else {
+                    last;
+                 }
+             }
+             my $recursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(rec).'.$what;
+             if (defined($$courseopt{$recursechk})) { return [$$courseopt{$recursechk},'map']; }
+         }
          if (defined($$courseopt{$grplevel})) { return [$$courseopt{$grplevel},'course']; }
      }
-     if ($csec and defined($courseopt)) {
+     if ($csec ne '' and defined($courseopt)) {
          if (defined($$courseopt{$seclevelr})) { return [$$courseopt{$seclevelr},'resource']; }
          if (defined($$courseopt{$seclevelm})) { return [$$courseopt{$seclevelm},'map']; }
+         if (defined($$courseopt{$secleveli})) { return [$$courseopt{$secleveli},'map']; }
+         unless ($recursed) {
+             @recurseup = $self->recurseup_maps($mapname);
+             $recursed = 1;
+         }
+         foreach my $item (@recurseup) {
+             my $norecursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(all).'.$what;
+             if (defined($$courseopt{$norecursechk})) {
+                 if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                     return [$$courseopt{$norecursechk},'map'];
+                 } else {
+                     last;
+                 }
+             }
+             my $recursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(rec).'.$what;
+             if (defined($$courseopt{$recursechk})) { return [$$courseopt{$recursechk},'map']; }
+         }
          if (defined($$courseopt{$seclevel})) { return [$$courseopt{$seclevel},'course']; }
      }
- Line 2566  sub parmval_real {
+ Line 2901  sub parmval_real {
      my $meta_rwhat=$rwhat;
      $meta_rwhat=~s/\./_/g;
-     my $default=&Apache::lonnet::metadata($fn,$meta_rwhat);
+     my $default=&Apache::lonnet::metadata($fn,$meta_rwhat,$toolsymb);
      if (defined($default)) { return [$default,'resource']}
-     $default=&Apache::lonnet::metadata($fn,'parameter_'.$meta_rwhat);
+     $default=&Apache::lonnet::metadata($fn,'parameter_'.$meta_rwhat,$toolsymb);
      if (defined($default)) { return [$default,'resource']}
  # --------------------------------------------------- fifth, check more course
      if (defined($courseopt)) {
          if (defined($$courseopt{$courselevelm})) { return [$$courseopt{$courselevelm},'map']; }
+         if (defined($$courseopt{$courseleveli})) { return [$$courseopt{$courseleveli},'map']; }
+         unless ($recursed) {
+             @recurseup = $self->recurseup_maps($mapname);
+             $recursed = 1;
+         }
+         foreach my $item (@recurseup) {
+             my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what;
+             if (defined($$courseopt{$norecursechk})) {
+                 if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                     return [$$courseopt{$norecursechk},'map'];
+                 } else {
+                     last;
+                 }
+             }
+             my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what;
+             if (defined($$courseopt{$recursechk})) {
+                 return [$$courseopt{$recursechk},'map'];
+             }
+         }
          if (defined($$courseopt{$courselevel})) {
             my $ret = [$$courseopt{$courselevel},'course'];
             return $ret;
- Line 2591  sub parmval_real {
+ Line 2945  sub parmval_real {
         if (defined($partgeneral[0])) { return \@partgeneral; }
      }
      if ($recurse) { return []; }
-     my $pack_def=&Apache::lonnet::packages_tab_default($fn,'resource.'.$rwhat);
+     my $pack_def=&Apache::lonnet::packages_tab_default($fn,'resource.'.$rwhat,$toolsymb);
      if (defined($pack_def)) { return [$pack_def,'resource']; }
      return [''];
  }
+ sub recurseup_maps {
+     my ($self,$mapname) = @_;
+     my @recurseup;
+     if ($mapname) {
+         my $res = $self->getResourceByUrl($mapname);
+         if (ref($res)) {
+             my @pcs = split(/,/,$res->map_hierarchy());
+             shift(@pcs);
+             if (@pcs) {
+                 @recurseup = map { &Apache::lonnet::declutter($self->getByMapPc($_)->src()); } reverse(@pcs);
+             }
+         }
+     }
+     return @recurseup;
+ }
+ sub recursed_crumbs {
+     my ($self,$mapurl,$restitle) = @_;
+     my (@revmapinfo,@revmapres);
+     my $mapres = $self->getResourceByUrl($mapurl);
+     if (ref($mapres)) {
+         @revmapres = map { $self->getByMapPc($_); } split(/,/,$mapres->map_breadcrumbs());
+         shift(@revmapres);
+     }
+     my $allowedlength = 60;
+     my $minlength = 5;
+     my $allowedtitle = 30;
+     if (($env{'environment.icons'} eq 'iconsonly') && (!$env{'browser.mobile'})) {
+         $allowedlength = 100;
+         $allowedtitle = 70;
+     }
+     if (length($restitle) > $allowedtitle) {
+         $restitle = &truncate_crumb_text($restitle,$allowedtitle);
+     }
+     my $totallength = length($restitle);
+     my @links;
+     foreach my $map (@revmapres) {
+         my $pc = $map->map_pc();
+         next if ((!$pc) || ($pc == 1));
+         push(@links,$map);
+         push(@revmapinfo,{'href' => $env{'request.use_absolute'}.$map->link().'?navmap=1','text' => $map->title(),'no_mt' => 1,});
+         $totallength += length($map->title());
+     }
+     my $numlinks = scalar(@links);
+     if ($numlinks) {
+         if ($totallength - $allowedlength > 0) {
+             my $available = $allowedlength - length($restitle);
+             my $avg = POSIX::ceil($available/$numlinks);
+             if ($avg < $minlength) {
+                 $avg = $minlength;
+             }
+             @revmapinfo = ();
+             foreach my $map (@links) {
+                 my $showntitle = &truncate_crumb_text($map->title(),$avg);
+                 if ($showntitle ne '') {
+                     push(@revmapinfo,{'href' => $env{'request.use_absolute'}.$map->link().'?navmap=1','text' => $showntitle,'no_mt' => 1,});
+                 }
+             }
+         }
+     }
+     if ($restitle ne '') {
+         push(@revmapinfo,{'text' => $restitle, 'no_mt' => 1});
+     }
+     return @revmapinfo;
+ }
+ sub truncate_crumb_text {
+     my ($title,$limit) = @_;
+     my $showntitle = '';
+     if (length($title) > $limit) {
+         my @words = split(/\b\s*/,$title);
+         if (@words == 1) {
+             $showntitle = substr($title,0,$limit).' ...';
+         } else {
+             my $linklength = 0;
+             my $num = 0;
+             foreach my $word (@words) {
+                 $linklength += 1+length($word);
+                 if ($word eq '-') {
+                     $showntitle =~ s/ $//;
+                     $showntitle .= $word;
+                 } elsif ($linklength > $limit) {
+                     if ($num < @words) {
+                         $showntitle .= $word.' ...';
+                         last;
+                     } else {
+                         $showntitle .= $word;
+                     }
+                 } else {
+                     $showntitle .= $word.' ';
+                 }
+             }
+             $showntitle =~ s/ $//;
+         }
+         return $showntitle;
+     } else {
+         return $title;
+     }
+ }
+ #
+ #  Determines the open/close dates for printing a map that
+ #  encloses a resource.
+ #
+ sub map_printdates {
+     my ($self, $res, $part) = @_;
+     my $opendate = $self->get_mapparam($res->symb(),'',"$part.printstartdate");
+     my $closedate= $self->get_mapparam($res->symb(),'',"$part.printenddate");
+     return ($opendate, $closedate);
+ }
+ sub get_mapparam {
+     my ($self, $symb, $mapname, $what) = @_;
+     # Ensure the course option hash is populated:
+     $self->generate_course_user_opt();
+     # Get the course id and section if there is one.
+     my $cid=$env{'request.course.id'};
+     my $csec=$env{'request.course.sec'};
+     my $cgroup='';
+     my @cgrps=split(/:/,$env{'request.course.groups'});
+     if (@cgrps > 0) {
+         @cgrps = sort(@cgrps);
+         $cgroup = $cgrps[0];
+     }
+     my $uname=$self->{USERNAME};
+     my $udom=$self->{DOMAIN};
+     unless ($symb || $mapname) { return; }
+     my $result='';
+     my ($recursed,@recurseup);
+     # Figure out which map we are in.
+     if ($symb && !$mapname) {
+         my ($id,$fn);
+         ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb);
+         $mapname = &Apache::lonnet::deversion($mapname);
+     }
+     my $rwhat=$what;
+     $what=~s/^parameter\_//;
+     $what=~s/\_/\./;
+     # Build the hash keys for the lookup:
+     my $mapparm=$mapname.'___(all).'.$what;
+     my $recurseparm=$mapname.'___(rec).'.$what;
+     my $usercourseprefix=$cid;
+     my $grplevelm    = "$usercourseprefix.[$cgroup].$mapparm";
+     my $seclevelm    = "$usercourseprefix.[$csec].$mapparm";
+     my $courselevelm = "$usercourseprefix.$mapparm";
+     my $grpleveli    = "$usercourseprefix.[$cgroup].$recurseparm";
+     my $secleveli    = "$usercourseprefix.[$csec].$recurseparm";
+     my $courseleveli = "$usercourseprefix.$recurseparm";
+     # Get handy references to the hashes we need in $self:
+     my $useropt = $self->{USER_OPT};
+     my $courseopt = $self->{COURSE_OPT};
+     my $parmhash = $self->{PARM_HASH};
+     # Check per user
+     if ($uname and defined($useropt)) {
+ 	if (defined($$useropt{$courselevelm})) {
+ 	    return $$useropt{$courselevelm};
+ 	}
+         if (defined($$useropt{$courseleveli})) {
+             return $$useropt{$courseleveli};
+         }
+         unless ($recursed) {
+             @recurseup = $self->recurseup_maps($mapname);
+             $recursed = 1;
+         }
+         foreach my $item (@recurseup) {
+             my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what;
+             if (defined($$useropt{$norecursechk})) {
+                 if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                     return $$useropt{$norecursechk};
+                 } else {
+                     last;
+                 }
+             }
+             my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what;
+             if (defined($$useropt{$recursechk})) {
+                 return $$useropt{$recursechk};
+             }
+         }
+     }
+     # Check course -- group
+     if ($cgroup ne '' and defined ($courseopt)) {
+ 	if (defined($$courseopt{$grplevelm})) {
+ 	    return $$courseopt{$grplevelm};
+ 	}
+         if (defined($$courseopt{$grpleveli})) {
+             return $$courseopt{$grpleveli};
+         }
+         unless ($recursed) {
+             @recurseup = $self->recurseup_maps($mapname);
+             $recursed = 1;
+         }
+         foreach my $item (@recurseup) {
+             my $norecursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(all).'.$what;
+             if (defined($$courseopt{$norecursechk})) {
+                 if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                     return $$courseopt{$norecursechk};
+                 } else {
+                     last;
+                 }
+             }
+             my $recursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(rec).'.$what;
+             if (defined($$courseopt{$recursechk})) {
+                 return $$courseopt{$recursechk};
+             }
+         }
+     }
+     # Check course -- section
+     if ($csec ne '' and defined($courseopt)) {
+ 	if (defined($$courseopt{$seclevelm})) {
+ 	    return $$courseopt{$seclevelm};
+ 	}
+         if (defined($$courseopt{$secleveli})) {
+             return $$courseopt{$secleveli};
+         }
+         unless ($recursed) {
+             @recurseup = $self->recurseup_maps($mapname);
+             $recursed = 1;
+         }
+         foreach my $item (@recurseup) {
+             my $norecursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(all).'.$what;
+             if (defined($$courseopt{$norecursechk})) {
+                 if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                     return $$courseopt{$norecursechk};
+                 } else {
+                     last;
+                 }
+             }
+             my $recursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(rec).'.$what;
+             if (defined($$courseopt{$recursechk})) {
+                 return $$courseopt{$recursechk};
+             }
+         }
+     }
+     # Check the map parameters themselves:
+     if ($symb) {
+         my $symbparm=$symb.'.'.$what;
+         my $thisparm = $$parmhash{$symbparm};
+         if (defined($thisparm)) {
+ 	    return $thisparm;
+         }
+     }
+     # Additional course parameters:
+     if (defined($courseopt)) {
+ 	if (defined($$courseopt{$courselevelm})) {
+ 	    return $$courseopt{$courselevelm};
+ 	}
+         unless ($recursed) {
+             @recurseup = $self->recurseup_maps($mapname);
+             $recursed = 1;
+         }
+         if (@recurseup) {
+             foreach my $item (@recurseup) {
+                 my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what;
+                 if (defined($$courseopt{$norecursechk})) {
+                     if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                         return $$courseopt{$norecursechk};
+                     } else {
+                         last;
+                     }
+                 }
+                 my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what;
+                 if (defined($$courseopt{$recursechk})) {
+                     return $$courseopt{$recursechk};
+                 }
+             }
+         }
+     }
+     return undef;		# Undefined if we got here.
+ }
+ sub course_printdates {
+     my ($self, $symb,  $part) = @_;
+     my $opendate  = $self->getcourseparam($symb, $part . '.printstartdate');
+     my $closedate = $self->getcourseparam($symb, $part . '.printenddate');
+     return ($opendate, $closedate);
+ }
+ sub getcourseparam {
+     my ($self, $symb, $what) = @_;
+     $self->generate_course_user_opt(); # If necessary populate the hashes.
+     my $uname = $self->{USERNAME};
+     my $udom  = $self->{DOMAIN};
+     # Course, section, group ids come from the env:
+     my $cid   = $env{'request.course.id'};
+     my $csec  = $env{'request.course.sec'};
+     my $cgroup = '';		# Assume no group
+     my @cgroups = split(/:/, $env{'request.course.groups'});
+     if(@cgroups > 0) {
+ 	@cgroups = sort(@cgroups);
+ 	$cgroup  = $cgroups[0];	# There is a course group.
+    }
+     my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb);
+     $mapname = &Apache::lonnet::deversion($mapname);
+     #
+     # Make the various lookup keys:
+     #
+     $what=~s/^parameter\_//;
+     $what=~s/\_/\./;
+     # Local refs to the hashes we're going to look at:
+     my $useropt   = $self->{USER_OPT};
+     my $courseopt = $self->{COURSE_OPT};
+     #
+     # We want the course level stuff from the way
+     # parmval_real operates
+     # TODO: Factor some of this stuff out of
+     # both parmval_real and here
+     #
+     my $courselevel = $cid . '.' .  $what;
+     my $grplevel    = $cid . '.[' . $cgroup   . ']' . $what;
+     my $seclevel    = $cid . '.[' . $csec     . ']' . $what;
+     # Try for the user's course level option:
+     if ($uname and defined($useropt)) {
+ 	if (defined($$useropt{$courselevel})) {
+ 	    return $$useropt{$courselevel};
+ 	}
+     }
+     # Try for the group's course level option:
+     if ($cgroup ne '' and defined($courseopt)) {
+ 	if (defined($$courseopt{$grplevel})) {
+ 	    return $$courseopt{$grplevel};
+ 	}
+     }
+     #  Try for section level parameters:
+     if ($csec ne '' and defined($courseopt)) {
+ 	if (defined($$courseopt{$seclevel})) {
+ 	    return $$courseopt{$seclevel};
+ 	}
+     }
+     # Try for 'additional' course parameters:
+     if (defined($courseopt)) {
+ 	if (defined($$courseopt{$courselevel})) {
+ 	    return $$courseopt{$courselevel};
+ 	}
+     }
+     return undef;
+ }
  =pod
  =item * B<getResourceByUrl>(url,multiple):
- Line 2610  resource appears multiple times in the c
+ Line 3363  resource appears multiple times in the c
  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, showall):
+ =item * B<retrieveResources>(map, filterFunc, recursive, bailout, showall, noblockcheck):
  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 2619  true if the resource should be included,
+ Line 3372  true if the resource should be included,
  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. If showall is
- true it will not hide maps that contain nothing but one other map. By
+ true it will not hide maps that contain nothing but one other map. The
- default, the map is the top-level map of the course, filterFunc is a
+ noblockcheck arg is propagated to become the sixth arg in the call to
- function that always returns 1, recursive is true, bailout is false,
+ lonnet::allowed when checking a resource's availability during collection
- showall is false. The resources will be returned in a list containing
+ of resources using the iterator. noblockcheck needs to be true if
- the resource objects for the corresponding resources, with B<no
+ retrieveResources() was called by a routine that itself was called by
- structure information> in the list; regardless of branching,
+ lonnet::allowed, in order to avoid recursion.  By default the map
- recursion, etc., it will be a flat list.
+ is the top-level map of the course, filterFunc is a function that
+ always returns 1, recursive is true, bailout is false, showall is
+ false. The resources will be returned in a list containing the
+ resource objects for the corresponding resources, with B<no 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 2648  in the filter function.
+ Line 3406  in the filter function.
  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
- Line 2692  sub retrieveResources {
+ Line 3450  sub retrieveResources {
      my $bailout = shift;
      if (!defined($bailout)) { $bailout = 0; }
      my $showall = shift;
+     my $noblockcheck = shift;
      # Create the necessary iterator.
      if (!ref($map)) { # assume it's a url of a map.
          $map = $self->getResourceByUrl($map);
- Line 2721  sub retrieveResources {
+ Line 3480  sub retrieveResources {
      # Run down the iterator and collect the resources.
      my $curRes;
-     while ($curRes = $it->next()) {
+     while ($curRes = $it->next(undef,$noblockcheck)) {
          if (ref($curRes)) {
              if (!&$filterFunc($curRes)) {
                  next;
- Line 2755  sub usedVersion {
+ Line 3514  sub usedVersion {
      return $self->navhash("version_$linkurl");
  }
+ sub isFirstResource {
+     my $self = shift;
+     my $map = shift;
+     my $symb = shift;
+     return unless (ref($map));
+     my $isfirst;
+     my $firstResource = $map->map_start();
+     if (ref($firstResource)) {
+         if ((!$firstResource->is_map()) && ($firstResource->src() ne ''))  {
+             if ($firstResource->symb() eq $symb) {
+                 $isfirst = 1;
+             } else {
+                 $isfirst = 0;
+             }
+         } else {
+             my $it = $self->getIterator($firstResource,undef,undef,1);
+             while ( my $res=$it->next()) {
+                 if ((ref($res)) && ($res->src() ne '') && (!$res->is_map())) {
+                     if ($res->symb() eq $symb) {
+                         $isfirst = 1;
+                     } else {
+                         $isfirst = 0;
+                     }
+                     last;
+                 }
+             }
+         }
+     }
+     return $isfirst;
+ }
+ sub isLastResource {
+     my $self = shift;
+     my $map = shift;
+     my $symb = shift;
+     return unless (ref($map));
+     my $islast;
+     my $lastResource = $map->map_finish();
+     if (ref($lastResource)) {
+         if ((!$lastResource->is_map()) && ($lastResource->src() ne ''))  {
+             if ($lastResource->symb() eq $symb) {
+                 $islast = 1;
+             } else {
+                 $islast = 0;
+             }
+         } else {
+             my $currRes = $self->getBySymb($symb);
+             if (ref($currRes)) {
+                 my $it = $self->getIterator($currRes,undef,undef,1);
+                 while ( my $res=$it->next()) {
+                     if ((ref($res)) && ($res->src() ne '') && (!$res->is_map())) {
+                         if ($res->symb() eq $symb) {
+                             $islast = 1;
+                         } else {
+                             $islast = 0;
+                         }
+                         last;
+                     }
+                 }
+             }
+         }
+     }
+     return $islast;
+ }
 ;
  package Apache::lonnavmaps::iterator;
- Line 2872  Note that inside of the loop, it's frequ
+ Line 3696  Note that inside of the loop, it's frequ
  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 next() routine can take two (optional) arguments:
+ closeAllPages - if true will not recurse down a .page
+ noblockcheck - passed to browsePriv() for passing as sixth arg to
+ call to lonnet::allowed. This needs to be set if retrieveResources
+ was already called from another routine called within lonnet::allowed,
+ so as to prevent recursion.
+ Also note there is some old code floating around that tries 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.
- Line 2903  sub new {
+ Line 3734  sub new {
      weaken($self->{NAV_MAP} = shift);
      return undef unless ($self->{NAV_MAP});
+     $self->{USERNAME} = $self->{NAV_MAP}->{USERNAME};
+     $self->{DOMAIN}   = $self->{NAV_MAP}->{DOMAIN};
      # Handle the parameters
      $self->{FIRST_RESOURCE} = shift || $self->{NAV_MAP}->firstResource();
      $self->{FINISH_RESOURCE} = shift || $self->{NAV_MAP}->finishResource();
- Line 3016  sub new {
+ Line 3850  sub new {
      if ($resourceCount == 1 && $resource->is_sequence() && !$self->{FORCE_TOP}) {
          my $firstResource = $resource->map_start();
          my $finishResource = $resource->map_finish();
-         return
+ 	return Apache::lonnavmaps::iterator->new($self->{NAV_MAP}, $firstResource,
-             Apache::lonnavmaps::iterator->new($self->{NAV_MAP}, $firstResource,
+ 						 $finishResource, $self->{FILTER},
-                                               $finishResource, $self->{FILTER},
+ 						 $self->{ALREADY_SEEN},
-                                               $self->{ALREADY_SEEN},
+ 						 $self->{CONDITION},
-                                               $self->{CONDITION},
+ 						 $self->{FORCE_TOP});
- 					      $self->{FORCE_TOP});
      }
      # Set up some bookkeeping information.
- Line 3041  sub new {
+ Line 3873  sub new {
      $self->{ALREADY_SEEN}->{$self->{FIRST_RESOURCE}->{ID}} = 1;
      bless ($self);
      return $self;
  }
  sub next {
      my $self = shift;
      my $closeAllPages=shift;
+     my $noblockcheck = shift;
      if ($self->{FINISHED}) {
  	return END_ITERATOR();
      }
- Line 3056  sub next {
+ Line 3888  sub next {
      # do so.
      if ($self->{RETURN_0} && !$self->{HAVE_RETURNED_0}) {
          $self->{HAVE_RETURNED_0} = 1;
+ 	my $nextTopLevel = $self->{NAV_MAP}->getById('0.0');
          return $self->{NAV_MAP}->getById('0.0');
      }
      if ($self->{RETURN_0} && !$self->{HAVE_RETURNED_0_BEGIN_MAP}) {
- Line 3075  sub next {
+ Line 3908  sub next {
          if ($self->{RECURSIVE_DEPTH} == 0) {
              $self->{RECURSIVE_ITERATOR_FLAG} = 0;
          }
          return $next;
      }
- Line 3151  sub next {
+ Line 3983  sub next {
      # So we need to look at all the resources we can get to from here,
      # categorize them if we haven't seen them, remember if we have a new
      my $nextUnfiltered = $here->getNext();
      my $maxDepthAdded = -1;
      for (@$nextUnfiltered) {
- Line 3184  sub next {
+ Line 4018  sub next {
          $self->{RECURSIVE_ITERATOR_FLAG} = 1;
          my $firstResource = $self->{HERE}->map_start();
          my $finishResource = $self->{HERE}->map_finish();
          $self->{RECURSIVE_ITERATOR} =
              Apache::lonnavmaps::iterator->new($self->{NAV_MAP}, $firstResource,
                                                $finishResource, $self->{FILTER},
- Line 3196  sub next {
+ Line 4029  sub next {
      # If this is a blank resource, don't actually return it.
      # Should you ever find you need it, make sure to add an option to the code
      #  that you can use; other things depend on this behavior.
-     my $browsePriv = $self->{HERE}->browsePriv();
+     my $browsePriv = $self->{HERE}->browsePriv($noblockcheck);
      if (!$self->{HERE}->src() ||
          (!($browsePriv eq 'F') && !($browsePriv eq '2')) ) {
          return $self->next($closeAllPages);
- Line 3276  sub new {
+ Line 4109  sub new {
      weaken($self->{NAV_MAP} = shift);
      return undef unless ($self->{NAV_MAP});
+     $self->{USERNAME} = $self->{NAV_MAP}->{USERNAME};
+     $self->{DOMAIN}   = $self->{NAV_MAP}->{DOMAIN};
      $self->{FIRST_RESOURCE} = shift || $self->{NAV_MAP}->firstResource();
      $self->{FINISH_RESOURCE} = shift || $self->{NAV_MAP}->finishResource();
- Line 3512  sub new {
+ Line 4348  sub new {
      weaken($self->{NAV_MAP} = shift);
      $self->{ID} = shift;
+     $self->{USERNAME} = $self->{NAV_MAP}->{USERNAME};
+     $self->{DOMAIN}   = $self->{NAV_MAP}->{DOMAIN};
      # Store this new resource in the parent nav map's cache.
      $self->{NAV_MAP}->{RESOURCE_CACHE}->{$self->{ID}} = $self;
      $self->{RESOURCE_ERROR} = 0;
+     $self->{DUEDATE_CACHE} = undef;
      # A hash that can be used by two-pass algorithms to store data
      # about this resource in. Not used by the resource object
      # directly.
      $self->{DATA} = {};
      bless($self);
+     # This is a speed optimization, to avoid calling symb() too often.
+     $self->{SYMB} = $self->symb();
      return $self;
  }
- Line 3534  sub navHash {
+ Line 4378  sub navHash {
      my $param = shift;
      my $id = shift;
      my $arg = $param . ($id?$self->{ID}:"");
-     if (defined($arg)) {
+     if (ref($self) && ref($self->{NAV_MAP}) && defined($arg)) {
          return $self->{NAV_MAP}->navhash($arg);
      }
      return;
- Line 3634  sub src {
+ Line 4478  sub src {
  }
  sub shown_symb {
      my $self=shift;
-     if ($self->encrypted()) {return &Apache::lonenc::encrypted($self->symb());}
+     if ($self->encrypted()) {return &Apache::lonenc::encrypted($self->{SYMB});}
-     return $self->symb();
+     return $self->{SYMB};
  }
  sub id {
      my $self=shift;
- Line 3648  sub enclosing_map_src {
+ Line 4492  sub enclosing_map_src {
  }
  sub symb {
      my $self=shift;
+     if (defined $self->{SYMB}) { return $self->{SYMB}; }
      (my $first, my $second) = $self->{ID} =~ /(\d+).(\d+)/;
      my $symbSrc = &Apache::lonnet::declutter($self->src());
      my $symb = &Apache::lonnet::declutter($self->navHash('map_id_'.$first))
- Line 3656  sub symb {
+ Line 4501  sub symb {
  }
  sub wrap_symb {
      my $self = shift;
-     return $self->{NAV_MAP}->wrap_symb($self->symb());
+     return $self->{NAV_MAP}->wrap_symb($self->{SYMB});
  }
  sub title {
      my $self=shift;
- Line 3775  sub is_practice {
+ Line 4620  sub is_practice {
  sub is_problem {
      my $self=shift;
      my $src = $self->src();
-     if ($src =~ /\.(problem|exam|quiz|assess|survey|form|library|task)$/) {
+     if ($src =~ /$LONCAPA::assess_re/) {
  	return !($self->is_practice());
      }
      return 0;
  }
+ sub is_tool {
+     my $self=shift;
+     my $src = $self->src();
+     return ($src =~ /ext\.tool$/);
+ }
+ sub is_gradable {
+     my $self=shift;
+     my $src = $self->src();
+     if (($src =~ /$LONCAPA::assess_re/) ||
+         (($self->is_tool()) && ($self->parmval('gradable',0) =~ /^yes$/i))) {
+         return !($self->is_practice());
+     }
+ }
  #
  #  The has below is the set of status that are considered 'incomplete'
  #
- Line 3798  my %incomplete_hash =
+ Line 4656  my %incomplete_hash =
  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;
  	    }
- Line 3812  sub is_incomplete {
+ Line 4668  sub is_incomplete {
  sub is_raw_problem {
      my $self=shift;
      my $src = $self->src();
-     if ($src =~ /\.(problem|exam|quiz|assess|survey|form|library|task)$/) {
+     if ($src =~ /$LONCAPA::assess_re/) {
          return 1;
      }
      return 0;
- Line 3844  sub is_survey {
+ Line 4700  sub is_survey {
      my $self = shift();
      my $part = shift();
      my $type = $self->parmval('type',$part);
-     if ($type eq 'survey') {
+     if (($type eq 'survey') || ($type eq 'surveycred')) {
          return 1;
      }
      if ($self->src() =~ /\.(survey)$/) {
- Line 3852  sub is_survey {
+ Line 4708  sub is_survey {
      }
      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();
- Line 3860  sub is_task {
+ Line 4725  sub is_task {
  sub is_empty_sequence {
      my $self=shift;
-     my $src = $self->src();
      return !$self->is_page() && $self->navHash("is_map_", 1) && !$self->navHash("map_type_" . $self->map_pc());
  }
- Line 3872  sub parmval {
+ Line 4736  sub parmval {
      if (!defined($part)) {
          $part = '0';
      }
-     return $self->{NAV_MAP}->parmval($part.'.'.$what, $self->symb());
+     return $self->{NAV_MAP}->parmval($part.'.'.$what, $self->{SYMB});
  }
  =pod
- Line 3905  resource of the map.
+ Line 4769  resource of the map.
  Returns a string with the type of the map in it.
+ =item * B<map_hierarchy>:
+ Returns a string with a comma-separated ordered list of map_pc IDs
+ for the hierarchy of maps containing a map, with the top level
+ map first, then descending to deeper levels, with the enclosing map last.
+ =item * B<map_breadcrumbs>:
+ Same as map_hierarchy, except maps containing only a single itemm if
+ it's a map, or containing no items are omitted, unless it's the top
+ level map (map_pc = 1), which is always included.
  =back
  =cut
- Line 3935  sub map_type {
+ Line 4811  sub map_type {
      my $pc = $self->map_pc();
      return $self->navHash("map_type_$pc", 0);
  }
+ sub map_hierarchy {
+     my $self = shift;
+     my $pc = $self->map_pc();
+     return $self->navHash("map_hierarchy_$pc", 0);
+ }
+ sub map_breadcrumbs {
+     my $self = shift;
+     my $pc = $self->map_pc();
+     return $self->navHash("map_breadcrumbs_$pc", 0);
+ }
  #####
  # Property queries
- Line 3965  their code.)
+ Line 4851  their code.)
  =over 4
- =item * B<acc>:
+ =item * B<printable>
+ returns true if the current date is such that the
+ specified resource part is printable.
+ =item * B<resprintable>
+ Returns true if all parts in the resource are printable making the
+ entire resource printable.
+ =item * B<acc>
  Get the Client IP/Name Access Control information.
- Line 4018  Get the weight for the problem.
+ Line 4916  Get the weight for the problem.
  =cut
+ sub printable {
+     my ($self, $part) = @_;
+     #  The following cases apply:
+     #  - If a start date is not set, it is replaced by the open date.
+     #  - Ditto for start/open replaced by content open.
+     #  - If neither start nor printdates are set the part is printable.
+     #  - Start date set but no end date: Printable if now >= start date.
+     #  - End date set but no start date: Printable if now <= end date.
+     #  - both defined: printable if start <= now <= end
+     #
+     # Get the print open/close dates for the resource.
+     my $start = $self->parmval("printstartdate", $part);
+     my $end   = $self->parmval("printenddate", $part);
+     if (!$start) {
+ 	$start = $self->parmval("opendate", $part);
+     }
+     if (!$start) {
+ 	$start = $self->parmval("contentopen", $part);
+     }
+     my $now  = time();
+     my $startok = 1;
+     my $endok   = 1;
+     if ((defined $start) && ($start ne '')) {
+ 	$startok = $start <= $now;
+     }
+     if ((defined $end) && ($end != '')) {
+ 	$endok = $end >= $now;
+     }
+     return $startok && $endok;
+ }
+ sub resprintable {
+     my $self = shift;
+     # get parts...or realize there are no parts.
+     my $partsref = $self->parts();
+     my @parts    = @$partsref;
+     if (!@parts) {
+ 	return $self->printable(0);
+     } else {
+ 	foreach my $part  (@parts) {
+ 	    if (!$self->printable($part)) {
+ 		return 0;
+ 	    }
+ 	}
+ 	return 1;
+     }
+ }
  sub acc {
      (my $self, my $part) = @_;
      my $acc = $self->parmval("acc", $part);
- Line 4038  sub awarded {
+ Line 5000  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'};
+     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'};
+     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'};
+     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'};
+     return $self->{NAV_MAP}->{STUDENT_DATA}->{$self->{SYMB}}->{'resource.'.$part.'.solved'};
  }
  sub checkedin {
      my $self = shift; my $part = shift;
- Line 4064  sub checkedin {
+ Line 5026  sub checkedin {
      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'});
+         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->{NAV_MAP}->{STUDENT_DATA}->{$self->{SYMB}}->{'resource.'.$part.'.checkedin'},$self->{NAV_MAP}->{STUDENT_DATA}->{$self->{SYMB}}->{'resource.'.$part.'.checkedin.slot'});
      }
  }
  # this should work exactly like the copy in lonhomework.pm
+ # Why is there a copy in lonhomework?  Why not centralized?
+ #
+ #  TODO: Centralize duedate.
+ #
  sub duedate {
      (my $self, my $part) = @_;
+     if (defined ($self->{DUEDATE_CACHE}->{$part})) {
+         return $self->{DUEDATE_CACHE}->{$part};
+     }
      my $date;
      my @interval=$self->parmval("interval", $part);
      my $due_date=$self->parmval("duedate", $part);
-     if ($interval[0] =~ /\d+/) {
+     if ($interval[0] =~ /^(\d+)/) {
-        my $first_access=&Apache::lonnet::get_first_access($interval[1],
+         my $timelimit = $1;
-                                                           $self->symb);
+         my $first_access=&Apache::lonnet::get_first_access($interval[1],
+                                                            $self->{SYMB});
  	if (defined($first_access)) {
-            my $interval = $first_access+$interval[0];
+             my $interval = $first_access+$timelimit;
  	    $date = (!$due_date || $interval < $due_date) ? $interval
                                                            : $due_date;
  	} else {
- Line 4088  sub duedate {
+ Line 5059  sub duedate {
      } else {
  	$date = $due_date;
      }
+     $self->{DUEDATE_CACHE}->{$part} = $date;
      return $date;
  }
  sub handgrade {
- Line 4149  sub weight {
+ Line 5121  sub weight {
      my $self = shift; my $part = shift;
      if (!defined($part)) { $part = '0'; }
      my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',
-                                 $self->symb(), $env{'user.domain'},
+                                 $self->{SYMB}, $self->{DOMAIN},
-                                 $env{'user.name'},
+                                 $self->{USERNAME},
                                  $env{'request.course.sec'});
      return $weight;
  }
- Line 4158  sub part_display {
+ Line 5130  sub part_display {
      my $self= shift(); my $partID = shift();
      if (! defined($partID)) { $partID = '0'; }
      my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',
-                                      $self->symb);
+                                      $self->{SYMB});
      if (! defined($display) || $display eq '') {
          $display = $partID;
      }
- Line 4172  sub slot_control {
+ Line 5144  sub slot_control {
      my $available = $self->parmval("available", $part);
      return ($useslots,$availablestudent,$available);
  }
+ sub deeplink {
+     my ($self,$caller) = @_;
+     if ($caller eq 'sequence') {
+         my @deeplink = $self->parmval("deeplink");
+         if ($deeplink[1] eq 'resource') {
+             return $deeplink[0];
+         }
+     } else {
+         return $self->parmval("deeplink");
+     }
+ }
  # Multiple things need this
  sub getReturnHash {
      my $self = shift;
      if (!defined($self->{RETURN_HASH})) {
-         my %tmpHash  = &Apache::lonnet::restore($self->symb());
+         #my %tmpHash  = &Apache::lonnet::restore($self->{SYMB},undef,$self->{DOMAIN},$self->{USERNAME});
-         $self->{RETURN_HASH} = \%tmpHash;
+         #$self->{RETURN_HASH} = \%tmpHash;
+         # When info is retrieved for several resources (as when rendering a directory),
+         # it is much faster to use the user profile dump and avoid repeated lonnet requests
+         # (especially since lonnet::currentdump is using Lond directly whenever possible,
+         # and lonnet::restore is not at this point).
+         $self->{NAV_MAP}->get_user_data();
+         $self->{RETURN_HASH} = $self->{NAV_MAP}->{STUDENT_DATA}->{$self->{SYMB}};
      }
  }
- Line 4243  and use the link as appropriate.
+ Line 5232  and use the link as appropriate.
  sub hasDiscussion {
      my $self = shift;
-     return $self->{NAV_MAP}->hasDiscussion($self->symb());
+     return $self->{NAV_MAP}->hasDiscussion($self->{SYMB});
  }
  sub last_post_time {
      my $self = shift;
-     return $self->{NAV_MAP}->last_post_time($self->symb());
+     return $self->{NAV_MAP}->last_post_time($self->{SYMB});
  }
  sub discussion_info {
      my ($self,$filter) = @_;
-     return $self->{NAV_MAP}->discussion_info($self->symb(),$filter);
+     return $self->{NAV_MAP}->discussion_info($self->{SYMB},$filter);
  }
  sub getFeedback {
      my $self = shift;
      my $source = $self->src();
-     my $symb = $self->symb();
+     my $symb = $self->{SYMB};
      if ($source =~ /^\/res\//) { $source = substr $source, 5; }
      return $self->{NAV_MAP}->getFeedback($symb,$source);
  }
- Line 4267  sub getFeedback {
+ Line 5256  sub getFeedback {
  sub getErrors {
      my $self = shift;
      my $source = $self->src();
-     my $symb = $self->symb();
+     my $symb = $self->{SYMB};
      if ($source =~ /^\/res\//) { $source = substr $source, 5; }
      return $self->{NAV_MAP}->getErrors($symb,$source);
  }
- Line 4320  sub parts {
+ Line 5309  sub parts {
      my $self = shift;
      if ($self->ext) { return []; }
+     if (($self->is_tool()) &&
+         ($self->is_gradable())) { return ['0']; }
      $self->extractParts();
      return $self->{PARTS};
- Line 4410  sub extractParts {
+ Line 5401  sub extractParts {
      my %parts;
      # Retrieve part count, if this is a problem
-     if ($self->is_problem()) {
+     if ($self->is_raw_problem()) {
  	my $partorder = &Apache::lonnet::metadata($self->src(), 'partorder');
          my $metadata = &Apache::lonnet::metadata($self->src(), 'packages');
  	if ($partorder) {
  	    my @parts;
  	    for my $part (split (/,/,$partorder)) {
- 		if (!Apache::loncommon::check_if_partid_hidden($part, $self->symb())) {
+ 		if (!Apache::loncommon::check_if_partid_hidden($part, $self->{SYMB})) {
  		    push @parts, $part;
  		    $parts{$part} = 1;
  		}
- Line 4435  sub extractParts {
+ Line 5426  sub extractParts {
  		    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());
+ 			&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())) {
+ 		    if (!Apache::loncommon::check_if_partid_hidden($part, $self->{SYMB})) {
  			$parts{$part} = 1;
  		    }
  		}
  	    }
- 	    my @sortedParts = sort keys %parts;
+ 	    my @sortedParts = sort(keys(%parts));
  	    $self->{PARTS} = \@sortedParts;
          }
- Line 4466  sub extractParts {
+ Line 5457  sub extractParts {
          # 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) {
+         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 @partChunks = split(/_/, $partStuff);
                  my $i = 0;
                  for ($i = 0; $i < scalar(@partChunks); $i++) {
                      if ($partIdSoFar) { $partIdSoFar .= '_'; }
- Line 4690  Information not available due to network
+ Line 5681  Information not available due to network
  Attempted, and not yet graded.
+ =item * B<CREDIT_ATTEMPTED>:
+ Attempted, and credit received for attempt (survey and anonymous survey only).
+ =item * B<INCORRECT_BY_PASSBACK>:
+ Attempted, but wrong for LTI Tool Provider by passback of grade
+ =item * B<CORRECT_BY_PASSBACK>:
+ Correct for LTI Tool Provider by passback of grade
  =back
  =cut
- Line 4701  sub CORRECT               { return 13; }
+ Line 5704  sub CORRECT               { return 13; }
  sub CORRECT_BY_OVERRIDE   { return 14; }
  sub EXCUSED               { return 15; }
  sub ATTEMPTED             { return 16; }
+ sub CREDIT_ATTEMPTED      { return 17; }
+ sub INCORRECT_BY_PASSBACK { return 18; }
+ sub CORRECT_BY_PASSBACK   { return 19; }
  sub getCompletionStatus {
      my $self = shift;
- Line 4715  sub getCompletionStatus {
+ Line 5721  sub getCompletionStatus {
      if ($status eq 'correct_by_override') {
  	return $self->CORRECT_BY_OVERRIDE;
      }
+     if ($status eq 'correct_by_passback') {
+         return $self->CORRECT_BY_PASSBACK;
+     }
      if ($status eq 'incorrect_attempted') {return $self->INCORRECT; }
      if ($status eq 'incorrect_by_override') {return $self->INCORRECT_BY_OVERRIDE; }
+     if ($status eq 'incorrect_by_passback') {return $self->INCORRECT_BY_PASSBACK; }
      if ($status eq 'excused') {return $self->EXCUSED; }
      if ($status eq 'ungraded_attempted') {return $self->ATTEMPTED; }
+     if ($status eq 'credit_attempted') {
+         if ($self->is_anonsurvey($part) || $self->is_survey($part)) {
+             return $self->CREDIT_ATTEMPTED;
+         } else {
+             return $self->ATTEMPTED;
+         }
+     }
      return $self->NOT_ATTEMPTED;
  }
- Line 4808  The item is open and not yet tried.
+ Line 5825  The item is open and not yet tried.
  The problem has been attempted.
+ =item * B<CREDIT_ATTEMPTED>:
+ The problem has been attempted, and credit given for the attempt (survey and anonymous survey only).
  =item * B<ANSWER_SUBMITTED>:
  An answer has been submitted, but the student should not see it.
- Line 4859  sub status {
+ Line 5880  sub status {
      # There are a few whole rows we can dispose of:
      if ($completionStatus == CORRECT ||
-         $completionStatus == CORRECT_BY_OVERRIDE ) {
+         $completionStatus == CORRECT_BY_OVERRIDE ||
+         $completionStatus == CORRECT_BY_PASSBACK ) {
  	if ( $suppressFeedback ) { return ANSWER_SUBMITTED }
  	my $awarded=$self->awarded($part);
  	if ($awarded < 1 && $awarded > 0) {
- Line 4872  sub status {
+ Line 5894  sub status {
      # If it's WRONG... and not open
      if ( ($completionStatus == INCORRECT ||
- 	  $completionStatus == INCORRECT_BY_OVERRIDE)
+ 	  $completionStatus == INCORRECT_BY_OVERRIDE ||
+ 	  $completionStatus == INCORRECT_BY_PASSBACK)
  	 && (!$self->opendate($part) ||  $self->opendate($part) > time()) ) {
  	return INCORRECT;
      }
- Line 4881  sub status {
+ Line 5904  sub status {
          return ATTEMPTED;
      }
+     if ($completionStatus == CREDIT_ATTEMPTED) {
+         return CREDIT_ATTEMPTED;
+     }
      # If it's EXCUSED, then return that no matter what
      if ($completionStatus == EXCUSED) {
          return EXCUSED;
- Line 4910  sub status {
+ Line 5937  sub status {
      }
      # If it's WRONG...
-     if ($completionStatus == INCORRECT || $completionStatus == INCORRECT_BY_OVERRIDE) {
+     if ($completionStatus == INCORRECT || $completionStatus == INCORRECT_BY_OVERRIDE ||
+         $completionStatus == INCORRECT_BY_PASSBACK) {
          # and there are TRIES LEFT:
          if ($self->tries($part) < $self->maxtries($part) || !$self->maxtries($part)) {
              return $suppressFeedback ? ANSWER_SUBMITTED : TRIES_LEFT;
- Line 4919  sub status {
+ Line 5947  sub status {
      }
      # Otherwise, it's untried and open
      return OPEN;
  }
  sub check_for_slot {
      my $self = shift;
      my $part = shift;
+     my $symb = $self->{SYMB};
      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));
- Line 4932  sub check_for_slot {
+ Line 5961  sub check_for_slot {
          my $cdom=$env{'course.'.$cid.'.domain'};
          my $cnum=$env{'course.'.$cid.'.num'};
          my $now = time;
+         my $num_usable_slots = 0;
+         my ($checkedin,$checkedinslot,%consumed_uniq,%slots);
          if (@slots > 0) {
-             my %slots=&Apache::lonnet::get('slots',[@slots],$cdom,$cnum);
+             %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 @sorted_slots = &Apache::loncommon::sorted_slots(\@slots,\%slots,'starttime');
-             my ($checkedin,$checkedinslot);
              foreach my $slot_name (@sorted_slots) {
-                 next if (!defined($slots{$slot_name}) ||
+                 next if (!defined($slots{$slot_name}) || !ref($slots{$slot_name}));
-                          !ref($slots{$slot_name}));
                  my $end = $slots{$slot_name}->{'endtime'};
                  my $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 ($start > $now) {
-                         if ($startreserve < $now) {
+                             return (RESERVED_LATER,$start,$slot_name);
-                             if ($start > $now) {
+                         } else {
-                                 return (RESERVED_LATER,$start,$slot_name);
+                             if ($ip ne '') {
-                             } else {
+                                 if (!&Apache::loncommon::check_ip_acc($ip)) {
-                                 if ($ip ne '') {
+                                     return (RESERVED_LOCATION,$end,$slot_name);
-                                     if (!&Apache::loncommon::check_ip_acc($ip)) {
-                                         return (RESERVED_LOCATION,$ip,$slot_name);
-                                     }
-                                 }
-                                 if (@proctors > 0) {
-                                     unless ((grep(/^\Q$checkedin\E/,@proctors)) &&
-                                         ($checkedinslot eq $slot_name)) {
-                                         return (NEEDS_CHECKIN,undef,$slot_name);
-                                     }
                                  }
-                                 return (RESERVED,$end,$slot_name);
                              }
-                         } else {
+                             my @proctors;
-                             if ($start > $now) {
+                             if ($slots{$slot_name}->{'proctor'} ne '') {
-                                 return (RESERVABLE,$startreserve,$slot_name);
+                                 @proctors = split(',',$slots{$slot_name}->{'proctor'});
                              }
+                             if (@proctors > 0) {
+                                 ($checkedin,$checkedinslot) = $self->checkedin();
+                                 unless ((grep(/^\Q$checkedin\E/,@proctors)) &&
+                                         ($checkedinslot eq $slot_name)) {
+                                     return (NEEDS_CHECKIN,$end,$slot_name);
+                                 }
+                             }
+                             return (RESERVED,$end,$slot_name);
                          }
                      }
+                 } elsif ($end > $now) {
+                     $num_usable_slots ++;
                  }
              }
-             my ($is_correct,$got_grade);
+             my ($is_correct,$wait_for_grade);
              if ($self->is_task()) {
                  my $taskstatus = $self->taskstatus();
                  $is_correct = (($taskstatus eq 'pass') ||
                                 ($self->solved() =~ /^correct_/));
-                 $got_grade = ($self->solved() =~ /^(?:pass|fail)$/);
+                 unless ($taskstatus =~ /^(?:pass|fail)$/) {
+                     $wait_for_grade = 1;
+                 }
              } else {
-                 $got_grade = 1;
+                 unless ($self->completable()) {
-                 $is_correct = ($self->solved() =~ /^correct_/);
+                     $wait_for_grade = 1;
+                 }
+                 unless (($self->problemstatus($part) eq 'no') ||
+                         ($self->problemstatus($part) eq 'no_feedback_ever')) {
+                     $is_correct = ($self->solved($part) =~ /^correct_/);
+                     $wait_for_grade = 0;
+                 }
              }
              ($checkedin,$checkedinslot) = $self->checkedin();
              if ($checkedin) {
-                 if (!$got_grade) {
+                 if (ref($slots{$checkedinslot}) eq 'HASH') {
+                     $consumed_uniq{$checkedinslot} = $slots{$checkedinslot}{'uniqueperiod'};
+                 }
+                 if ($wait_for_grade) {
                      return (WAITING_FOR_GRADE);
                  } elsif ($is_correct) {
                      return (CORRECT);
                  }
              }
-             return(NOT_IN_A_SLOT);
+             if ($num_usable_slots) {
-         } else {
-             if (!$future_slots_checked) {
-                 $future_slots = &get_future_slots($cdom,$cnum,$now);
-                 $future_slots_checked = 1;
-             }
-             if ($future_slots) {
                  return(NOT_IN_A_SLOT);
              }
-             return(NOTRESERVABLE);
          }
-     }
+         my $reservable = &Apache::lonnet::get_reservable_slots($cnum,$cdom,$env{'user.name'},
-     return;
+                                                                $env{'user.domain'});
- }
+         if (ref($reservable) eq 'HASH') {
+             my ($map) = &Apache::lonnet::decode_symb($symb);
- sub get_future_slots {
+             if ((ref($reservable->{'now_order'}) eq 'ARRAY') && (ref($reservable->{'now'}) eq 'HASH')) {
-     my ($cdom,$cnum,$now) = @_;
+                 foreach my $slot (reverse (@{$reservable->{'now_order'}})) {
-     my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum);
+                     my $canuse;
-     my $future_slots = 0;
+                     if ($reservable->{'now'}{$slot}{'symb'} eq '') {
-     foreach my $slot (keys(%slots)) {
+                         $canuse = 1;
-         if (($slots{$slot}->{'starttime'} > $now) &&
+                     } else {
-             ($slots{$slot}->{'endtime'} > $now)) {
+                         my %oksymbs;
-             $future_slots ++;
+                         my @slotsymbs = split(/\s*,\s*/,$reservable->{'now'}{$slot}{'symb'});
+                         map { $oksymbs{$_} = 1; } @slotsymbs;
+                         if ($oksymbs{$symb}) {
+                             $canuse = 1;
+                         } else {
+                             foreach my $item (@slotsymbs) {
+                                 if ($item =~ /\.(page|sequence)$/) {
+                                     (undef,undef, my $sloturl) = &Apache::lonnet::decode_symb($item);
+                                     if (($map ne '') && ($map eq $sloturl)) {
+                                         $canuse = 1;
+                                         last;
+                                     }
+                                 }
+                             }
+                         }
+                     }
+                     if ($canuse) {
+                         if ($checkedin) {
+                             if (ref($consumed_uniq{$checkedinslot}) eq 'ARRAY') {
+                                 my ($uniqstart,$uniqend)=@{$consumed_uniq{$checkedinslot}};
+                                 if ($reservable->{'now'}{$slot}{'uniqueperiod'} =~ /^(\d+),(\d+)$/) {
+                                     my ($new_uniq_start,$new_uniq_end) = ($1,$2);
+                                     next if (!
+                                         ($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) ||
+                                         ($uniqstart > $new_uniq_end   &&  $uniqend > $new_uniq_end  ));
+                                 }
+                             }
+                         }
+                         return(RESERVABLE,$reservable->{'now'}{$slot}{'endreserve'});
+                     }
+                 }
+             }
+             if ((ref($reservable->{'future_order'}) eq 'ARRAY') && (ref($reservable->{'future'}) eq 'HASH')) {
+                 foreach my $slot (@{$reservable->{'future_order'}}) {
+                     my $canuse;
+                     if ($reservable->{'future'}{$slot}{'symb'} eq '') {
+                         $canuse = 1;
+                     } elsif ($reservable->{'future'}{$slot}{'symb'} =~ /,/) {
+                         my %oksymbs;
+                         my @slotsymbs = split(/\s*,\s*/,$reservable->{'future'}{$slot}{'symb'});
+                         map { $oksymbs{$_} = 1; } @slotsymbs;
+                         if ($oksymbs{$symb}) {
+                             $canuse = 1;
+                         } else {
+                             foreach my $item (@slotsymbs) {
+                                 if ($item =~ /\.(page|sequence)$/) {
+                                     (undef,undef, my $sloturl) = &Apache::lonnet::decode_symb($item);
+                                     if (($map ne '') && ($map eq $sloturl)) {
+                                         $canuse = 1;
+                                         last;
+                                     }
+                                 }
+                             }
+                         }
+                     } elsif ($reservable->{'future'}{$slot}{'symb'} eq $symb) {
+                         $canuse = 1;
+                     }
+                     if ($canuse) {
+                         if ($checkedin) {
+                             if (ref($consumed_uniq{$checkedinslot}) eq 'ARRAY') {
+                                 my ($uniqstart,$uniqend)=@{$consumed_uniq{$checkedinslot}};
+                                 if ($reservable->{'future'}{$slot}{'uniqueperiod'} =~ /^(\d+),(\d+)$/) {
+                                     my ($new_uniq_start,$new_uniq_end) = ($1,$2);
+                                     next if (!
+                                         ($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) ||
+                                         ($uniqstart > $new_uniq_end   &&  $uniqend > $new_uniq_end  ));
+                                 }
+                             }
+                         }
+                         return(RESERVABLE_LATER,$reservable->{'future'}{$slot}{'startreserve'});
+                     }
+                 }
+             }
          }
+         return(NOTRESERVABLE);
      }
-     return $future_slots;
+     return;
  }
  sub CLOSED { return 23; }
- Line 5073  my %compositeToSimple =
+ Line 6174  my %compositeToSimple =
        INCORRECT()             => INCORRECT,
        OPEN()                  => OPEN,
        ATTEMPTED()             => ATTEMPTED,
+       CREDIT_ATTEMPTED()      => CORRECT,
        ANSWER_SUBMITTED()      => ATTEMPTED
       );
- Line 5147  sub completable {
+ Line 6249  sub completable {
          # and it is not "attempted" (manually graded problem), it is
          # not "complete"
  	if ($self->getCompletionStatus($part) == ATTEMPTED() ||
+             $self->getCompletionStatus($part) == CREDIT_ATTEMPTED() ||
  	    $status == ANSWER_SUBMITTED() ) {
  	    # did this part already, as well as we can
  	    next;
- Line 5162  sub completable {
+ Line 6265  sub completable {
  =pod
+ B<Answerable>
+ The answerable method differs from the completable method in its handling of problem parts
+ for which feedback on correctness is suppressed, but the student still has tries left, and
+ the problem part is not past due, (i.e., the student could submit a different answer if
+ he/she so chose). For that case completable will return 0, whereas answerable will return 1.
+ =cut
+ sub answerable {
+     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 ($self->getCompletionStatus($part) == ATTEMPTED() ||
+             $self->getCompletionStatus($part) == CREDIT_ATTEMPTED() ||
+             $status == ANSWER_SUBMITTED() ) {
+             if ($self->tries($part) < $self->maxtries($part) || !$self->maxtries($part)) {
+                 return 1;
+             }
+         }
+         if ($status == OPEN() || $status == TRIES_LEFT() || $status == NETWORK_FAILURE()) {
+             return 1;
+         }
+     }
+     # None of the parts were answerable, so neither is this problem.
+     return 0;
+ }
+ =pod
  =head2 Resource/Nav Map Navigation
  =over 4
- Line 5197  sub getPrevious {
+ Line 6333  sub getPrevious {
      my $self = shift;
      my @branches;
      my $from = $self->from();
-     foreach my $branch ( split /,/, $from) {
+     foreach my $branch ( split(/,/, $from)) {
          my $choice = $self->{NAV_MAP}->getById($branch);
          my $prev = $choice->comesfrom();
          $prev = $self->{NAV_MAP}->getById($prev);
- Line 5209  sub getPrevious {
+ Line 6345  sub getPrevious {
  sub browsePriv {
      my $self = shift;
+     my $noblockcheck = shift;
      if (defined($self->{BROWSE_PRIV})) {
          return $self->{BROWSE_PRIV};
      }
      $self->{BROWSE_PRIV} = &Apache::lonnet::allowed('bre',$self->src(),
- 						    $self->symb());
+ 						    $self->{SYMB},undef,
+                                                     undef,$noblockcheck);
  }
  =pod

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

Removed from v.1.443
changed lines
	Added in v.1.545