--- loncom/interface/lonnavmaps.pm	2003/03/08 20:12:32	1.153
+++ loncom/interface/lonnavmaps.pm	2006/05/15 19:29:03	1.382
@@ -1,8 +1,7 @@
-
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.153 2003/03/08 20:12:32 bowersj2 Exp $
+# $Id: lonnavmaps.pm,v 1.382 2006/05/15 19:29:03 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,31 +25,21 @@
 #
 # http://www.lon-capa.org/
 #
-# (Page Handler
-#
-# (TeX Content Handler
-#
-# 05/29/00,05/30 Gerd Kortemeyer)
-# 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23,
-# 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16 Gerd Kortemeyer)
-#
-# 3/1/1,6/1,17/1,29/1,30/1,2/8,9/21,9/24,9/25 Gerd Kortemeyer
-# YEAR=2002
-# 1/1 Gerd Kortemeyer
-# Oct-Nov Jeremy Bowers
-# YEAR=2003
-# Jeremy Bowers ... lots of days
+###
 
 package Apache::lonnavmaps;
 
 use strict;
+use GDBM_File;
 use Apache::Constants qw(:common :http);
 use Apache::loncommon();
 use Apache::lonmenu();
+use Apache::lonenc();
+use Apache::lonlocal;
+use Apache::lonnet;
 use POSIX qw (floor strftime);
-
-my %navmaphash;
-my %parmhash;
+use Data::Dumper; # for debugging, not always 
+use Time::HiRes qw( gettimeofday tv_interval );
 
 # symbolic constants
 sub SYMB { return 1; }
@@ -64,18 +53,15 @@ my $resObj = "Apache::lonnavmaps::resour
 # Keep these mappings in sync with lonquickgrades, which uses the colors
 # instead of the icons.
 my %statusIconMap = 
-    ( $resObj->NETWORK_FAILURE    => '',
-      $resObj->NOTHING_SET        => '',
-      $resObj->CORRECT            => 'navmap.correct.gif',
-      $resObj->EXCUSED            => 'navmap.correct.gif',
-      $resObj->PAST_DUE_NO_ANSWER => 'navmap.wrong.gif',
-      $resObj->PAST_DUE_ANSWER_LATER => 'navmap.wrong.gif',
-      $resObj->ANSWER_OPEN        => 'navmap.wrong.gif',
-      $resObj->OPEN_LATER         => '',
-      $resObj->TRIES_LEFT         => 'navmap.open.gif',
-      $resObj->INCORRECT          => 'navmap.wrong.gif',
-      $resObj->OPEN               => 'navmap.open.gif',
-      $resObj->ATTEMPTED          => 'navmap.open.gif' );
+    (
+     $resObj->CLOSED       => '',
+     $resObj->OPEN         => 'navmap.open.gif',
+     $resObj->CORRECT      => 'navmap.correct.gif',
+     $resObj->PARTIALLY_CORRECT      => 'navmap.partial.gif',
+     $resObj->INCORRECT    => 'navmap.wrong.gif',
+     $resObj->ATTEMPTED    => 'navmap.ellipsis.gif',
+     $resObj->ERROR        => ''
+     );
 
 my %iconAltTags = 
     ( 'navmap.correct.gif' => 'Correct',
@@ -94,24 +80,69 @@ my %colormap =
       $resObj->TRIES_LEFT             => '',
       $resObj->INCORRECT              => '',
       $resObj->OPEN                   => '',
-      $resObj->NOTHING_SET            => '' );
+      $resObj->NOTHING_SET            => '',
+      $resObj->ATTEMPTED              => '',
+      $resObj->ANSWER_SUBMITTED       => '',
+      $resObj->PARTIALLY_CORRECT      => '#006600'
+      );
 # And a special case in the nav map; what to do when the assignment
 # is not yet done and due in less then 24 hours
 my $hurryUpColor = "#FF0000";
 
-sub cleanup {
-    if (tied(%navmaphash)){
-	&Apache::lonnet::logthis('Cleanup navmaps: navmaphash');
-        unless (untie(%navmaphash)) {
-	    &Apache::lonnet::logthis('Failed cleanup navmaps: navmaphash');
-        }
-    }
-    if (tied(%parmhash)){
-	&Apache::lonnet::logthis('Cleanup navmaps: parmhash');
-        unless (untie(%parmhash)) {
-	    &Apache::lonnet::logthis('Failed cleanup navmaps: parmhash');
-        }
+sub launch_win {
+    my ($mode,$script,$toplinkitems,$firsttime)=@_;
+    my $result;
+    if ($script ne 'no') {
+	$result.='<script type="text/javascript">';
+    }
+    if ($firsttime) {
+	$result.='function launch_navmapwin() {
+                 newWindow=open(\'/adm/navmaps?launchExternalRoles\',\'loncapanav\',\'width=400,height=600,scrollbars=1\');
+               }';
+    } else {
+	$result.='function launch_navmapwin() {
+                 newWindow=open(\'/adm/navmaps?launchExternal\',\'loncapanav\',\'width=400,height=600,scrollbars=1\');
+               }';
+    }
+    if ($mode eq 'now') {
+	$result.="\nlaunch_navmapwin();\n";
+    }
+    if ($script ne 'no') {
+	$result.='</script>';
+    }
+    if ($mode eq 'link') {
+	&add_linkitem($toplinkitems,'launchnav','launch_navmapwin()',
+		      "Launch navigation window");
     }
+    return $result;
+}
+
+sub close {
+    if ($env{'environment.remotenavmap'} ne 'on') { return ''; }
+    return(<<ENDCLOSE);
+<script type="text/javascript">
+window.status='Accessing Nav Control';
+menu=window.open("/adm/rat/empty.html","loncapanav",
+                 "height=600,width=400,scrollbars=1");
+window.status='Closing Nav Control';
+menu.close();
+window.status='Done.';
+</script>
+ENDCLOSE
+}
+
+sub update {
+    if ($env{'environment.remotenavmap'} ne 'on') { return ''; }
+    if (!$env{'request.course.id'}) { return ''; }
+    if ($ENV{'REQUEST_URI'}=~m|^/adm/navmaps|) { return ''; }
+    return(<<ENDUPDATE);
+<form name="navform"></form>
+<script type="text/javascript">
+this.document.navform.action='/adm/navmaps#curloc';
+this.document.navform.target='loncapanav';
+this.document.navform.submit();
+</script>
+ENDUPDATE
 }
 
 sub handler {
@@ -121,82 +152,285 @@ sub handler {
 
 sub real_handler {
     my $r = shift;
-
+    #my $t0=[&gettimeofday()];
     # Handle header-only request
     if ($r->header_only) {
-        if ($ENV{'browser.mathml'}) {
-            $r->content_type('text/xml');
+        if ($env{'browser.mathml'}) {
+            &Apache::loncommon::content_type($r,'text/xml');
         } else {
-            $r->content_type('text/html');
+            &Apache::loncommon::content_type($r,'text/html');
         }
         $r->send_http_header;
         return OK;
     }
 
     # Send header, don't cache this page
-    if ($ENV{'browser.mathml'}) {
-        $r->content_type('text/xml');
+    if ($env{'browser.mathml'}) {
+        &Apache::loncommon::content_type($r,'text/xml');
     } else {
-        $r->content_type('text/html');
+        &Apache::loncommon::content_type($r,'text/html');
     }
     &Apache::loncommon::no_cache($r);
-    $r->send_http_header;
 
-    # Create the nav map
-    my $navmap = Apache::lonnavmaps::navmap->new(
-                        $ENV{"request.course.fn"}.".db",
-                        $ENV{"request.course.fn"}."_parms.db", 1, 1);
+    my %toplinkitems=();
+    &add_linkitem(\%toplinkitems,'blank','',"Select Action");
+    if ($ENV{QUERY_STRING} eq 'collapseExternal') {
+	&Apache::lonnet::put('environment',{'remotenavmap' => 'off'});
+	&Apache::lonnet::appenv('environment.remotenavmap' => 'off');
+	my $menu=&Apache::lonmenu::reopenmenu();
+	my $navstatus=&Apache::lonmenu::get_nav_status();
+	if ($menu) {
+	    $menu=(<<MENU)
+             swmenu=$menu
+             swmenu.clearTimeout(swmenu.menucltim);
+	     $navstatus
+MENU
+        } else {
+	    my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
+	    my $mainwindow='window.open('.$nothing.',"loncapaclient","",false);';
+	    $menu=(<<MENU)
+             swmenu=$mainwindow
+	     $navstatus
+MENU
+	}
+        $r->send_http_header;
+	my $js =<<"ENDSUBM";
+	  <script type="text/javascript">
+ 	    function submitthis() {
+		    $menu
+		    self.close();
+	    }
+	
+  	  </script>
+ENDSUBM
+        $r->print(&Apache::loncommon::start_page(undef,$js,
+						 {'only_body' => 1,
+						  'bgcolor'   => '#FFFFFF',
+						  'add_entries' => 
+						      {'onload' =>
+							   "submitthis()"}}).
+		  &Apache::loncommon::end_page());
 
+        return OK;
+    }
+    if ($ENV{QUERY_STRING} =~ /^launchExternal/) {
+	&Apache::lonnet::put('environment',{'remotenavmap' => 'on'});
+	&Apache::lonnet::appenv('environment.remotenavmap' => 'on');
+ 	my $menu=&Apache::lonmenu::reopenmenu();
+	my $navstatus=&Apache::lonmenu::get_nav_status();
+	if ($menu) {
+	    $r->print(<<MENU);
+             <script type="text/javascript">
+             swmenu=$menu
+             swmenu.clearTimeout(swmenu.menucltim);
+	     $navstatus
+             </script>
+MENU
+        }
+   }
+    if ($ENV{QUERY_STRING} eq 'turningOffExternal') {
+	$env{'environment.remotenavmap'}='off';
+    }
+
+    # Create the nav map
+    my $navmap = Apache::lonnavmaps::navmap->new();
 
     if (!defined($navmap)) {
         my $requrl = $r->uri;
-        $ENV{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";
+        $env{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";
         return HTTP_NOT_ACCEPTABLE;
     }
+    $r->send_http_header;
 
-    $r->print("<html><head>\n");
-    $r->print("<title>Navigate Course Contents</title>");
 # ------------------------------------------------------------ Get query string
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register']);
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework','postsymb']);
+    
 # ----------------------------------------------------- Force menu registration
-    my $addentries='';
-    if ($ENV{'form.register'}) {
-       $addentries=' onLoad="'.&Apache::lonmenu::loadevents().
-	   '" onUnload="'.&Apache::lonmenu::unloadevents().'"';
-       $r->print(&Apache::lonmenu::registerurl(1));
+    my $body_only='';
+    my $js;
+    if ($env{'environment.remotenavmap'} eq 'on') {
+	$js='<script type="text/javascript">
+                function collapse() {
+                   this.document.location="/adm/navmaps?collapseExternal";
+                }
+             </script>';
+	$body_only=1;
     }
 
     # Header
-    $r->print('</head>'.
-              &Apache::loncommon::bodytag('Navigate Course Contents','',
-                                    $addentries,'','',$ENV{'form.register'}));
-    $r->print('<script>window.focus();</script>');
-
-    $r->rflush();
-
-    # Now that we've displayed some stuff to the user, init the navmap
-    $navmap->init();
-
-
-    $r->print('<br>&nbsp;');
+    $r->print(&Apache::loncommon::start_page('Navigate Course Contents',$js,
+					     {'only_body'       => $body_only,
+					      'force_register'  =>
+						  $env{'form.register'},}));
+    $r->print('<script type="text/javascript">window.focus();</script>');
+     
     $r->rflush();
 
     # Check that it's defined
     if (!($navmap->courseMapDefined())) {
-        $r->print('<font size="+2" color="red">Coursemap undefined.</font>' .
-                  '</body></html>');
+	$r->print(&Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT'));
+        $r->print('<font size="+2" color="red">'.&mt('Coursemap undefined.').
+		  '</font>' .
+                  &Apache::loncommon::end_page());
         return OK;
     }
 
-    # renderer call
-    my $render = render({ 'cols' => [0,1,2,3],
-                          'url' => '/adm/navmaps',
-                          'suppressNavmap' => 1,
-                          'r' => $r});
+    # See if there's only one map in the top-level, if we don't
+    # already have a filter... if so, automatically display it
+    # (older code; should use retrieveResources)
+    if ($ENV{QUERY_STRING} !~ /filter/) {
+        my $iterator = $navmap->getIterator(undef, undef, undef, 0);
+        my $curRes;
+        my $sequenceCount = 0;
+        my $sequenceId;
+        while ($curRes = $iterator->next()) {
+            if (ref($curRes) && $curRes->is_sequence()) {
+                $sequenceCount++;
+                $sequenceId = $curRes->map_pc();
+            }
+        }
+        
+        if ($sequenceCount == 1) {
+            # The automatic iterator creation in the render call 
+            # will pick this up. We know the condition because
+            # the defined($env{'form.filter'}) also ensures this
+            # is a fresh call.
+            $env{'form.filter'} = "$sequenceId";
+        }
+    }
+
+    if ($ENV{QUERY_STRING} eq 'launchExternal') {
+	$r->print('
+          <form name="returnwin" action="/adm/flip?postdata=navlaunch%3a" 
+                method="post" target="loncapaclient">
+          </form>');
+	$r->print('
+          <script type="text/javascript">
+              this.document.returnwin.submit();
+          </script>');
+    }
+
+    if ($env{'environment.remotenavmap'} ne 'on') {
+	$r->print(&launch_win('link','yes',\%toplinkitems));
+    } 
+    if ($env{'environment.remotenavmap'} eq 'on') {
+	&add_linkitem(\%toplinkitems,'closenav','collapse()',
+		      "Close navigation window");
+    } 
 
-    $navmap->untieHashes();
 
-    $r->print("</body></html>");
+    # Check to see if the student is jumping to next open, do-able problem
+    if ($ENV{QUERY_STRING} =~ /^jumpToFirstHomework/) {
+        # Find the next homework problem that they can do.
+        my $iterator = $navmap->getIterator(undef, undef, undef, 1);
+        my $curRes;
+        my $foundDoableProblem = 0;
+        my $minimumduedate;
+        
+        while ($curRes = $iterator->next()) {
+            if (ref($curRes) && $curRes->is_problem()) {
+                my $status = $curRes->status();
+                if ($curRes->completable()) {
+                    my $thisduedate=$curRes->duedate();
+                    unless ($foundDoableProblem) {
+                        $minimumduedate=$thisduedate;
+		    }
+                        
+                    $foundDoableProblem = 1;
+
+                    if ($thisduedate<=$minimumduedate) {
+			# Pop open all previous maps
+			my $stack = $iterator->getStack();
+			pop @$stack; # last resource in the stack is the problem
+			# itself, which we don't need in the map stack
+			my @mapPcs = map {$_->map_pc()} @$stack;
+			$env{'form.filter'} = join(',', @mapPcs);
+			
+			# Mark as both "here" and "jump"
+			$env{'form.postsymb'} = $curRes->symb();
+                        $minimumduedate=$thisduedate;
+		    }
+                }
+            }
+        }
+
+        # If we found no problems, print a note to that effect.
+        if (!$foundDoableProblem) {
+            $r->print("<font size='+2'>All homework assignments have been completed.</font><br /><br />");
+        }
+    } else {
+	&add_linkitem(\%toplinkitems,'firsthomework',
+		      'location.href="navmaps?jumpToFirstHomework"',
+		      "Show my first due problem");
+    }
+
+    my $suppressEmptySequences = 0;
+    my $filterFunc = undef;
+    my $resource_no_folder_link = 0;
+
+    # Display only due homework.
+    my $showOnlyHomework = 0;
+    if ($env{'form.showOnlyHomework'} eq "1") {
+        $showOnlyHomework = 1;
+        $suppressEmptySequences = 1;
+        $filterFunc = sub { my $res = shift; 
+                            return $res->completable() || $res->is_map();
+                        };
+	&add_linkitem(\%toplinkitems,'everything',
+		     'location.href="navmaps?sort='.$env{'form.sort'}.'"',
+		      "Show everything");
+        $r->print("<p><font size='+2'>".&mt("Uncompleted Problems")."</font></p>");
+        $env{'form.filter'} = '';
+        $env{'form.condition'} = 1;
+	$resource_no_folder_link = 1;
+    } else {
+	&add_linkitem(\%toplinkitems,'uncompleted',
+		      'location.href="navmaps?sort='.$env{'form.sort'}.
+		          '&showOnlyHomework=1"',
+		      "Show only uncompleted problems");
+    }
+
+    my %selected=($env{'form.sort'} => 'selected=on');
+    my $sort_html=("<form>
+                 <nobr>
+                    <input type=\"hidden\" name=\"showOnlyHomework\" value=\"".$env{'form.showOnlyHomework'}."\" />
+                    <input type=\"submit\" value=\"".&mt('Sort by:')."\" />
+                    <select name=\"sort\">
+                       <option value=\"default\" $selected{'default'}>".&mt('Default')."</option>
+                       <option value=\"title\"   $selected{'title'}  >".&mt('Title')."</option>
+                       <option value=\"duedate\" $selected{'duedate'}>".&mt('Duedate')."</option>
+                       <option value=\"discussion\" $selected{'discussion'}>".&mt('Has New Discussion')."</option>
+                    </select>
+                 </nobr>
+               </form>");
+    # renderer call
+    my $renderArgs = { 'cols' => [0,1,2,3],
+		       'sort' => $env{'form.sort'},
+                       'url' => '/adm/navmaps',
+                       'navmap' => $navmap,
+                       'suppressNavmap' => 1,
+                       'suppressEmptySequences' => $suppressEmptySequences,
+                       'filterFunc' => $filterFunc,
+		       'resource_no_folder_link' => $resource_no_folder_link,
+		       'sort_html'=> $sort_html,
+                       'r' => $r,
+                       'caller' => 'navmapsdisplay',
+                       'linkitems' => \%toplinkitems};
+    my $render = render($renderArgs);
+
+    # If no resources were printed, print a reassuring message so the
+    # user knows there was no error.
+    if ($renderArgs->{'counter'} == 0) {
+        if ($showOnlyHomework) {
+            $r->print("<p><font size='+1'>".&mt("All homework is currently completed").".</font></p>");
+        } else { # both jumpToFirstHomework and normal use the same: course must be empty
+            $r->print("<p><font size='+1'>This course is empty.</font></p>");
+        }
+    }
+    #my $td=&tv_interval($t0);
+    #$r->print("<br />$td");
+
+    $r->print(&Apache::loncommon::end_page());
     $r->rflush();
 
     return OK;
@@ -225,15 +459,26 @@ sub removeFromFilter {
 
 # Convenience function: Given a stack returned from getStack on the iterator,
 # return the correct src() value.
-# Later, this should add an anchor when we start putting anchors in pages.
 sub getLinkForResource {
     my $stack = shift;
     my $res;
 
     # Check to see if there are any pages in the stack
     foreach $res (@$stack) {
-        if (defined($res) && $res->is_page()) {
-            return $res->src();
+        if (defined($res)) {
+	    my $anchor;
+	    if ($res->is_page()) {
+		foreach (@$stack) { if (defined($_)) { $anchor = $_; }  }
+		$anchor=&Apache::lonnet::escape($anchor->shown_symb());
+		return ($res->link(),$res->shown_symb(),$anchor);
+	    }
+            # in case folder was skipped over as "only sequence"
+	    my ($map,$id,$src)=&Apache::lonnet::decode_symb($res->symb());
+	    if ($map=~/\.page$/) {
+		my $url=&Apache::lonnet::clutter($map);
+		$anchor=&Apache::lonnet::escape($src->shown_symb());
+		return ($url,$res->shown_symb(),$anchor);
+	    }
         }
     }
 
@@ -245,12 +490,12 @@ sub getLinkForResource {
         if (defined($_)) { $res = $_; }
     }
 
-    return $res->src();
+    return ($res->link(),$res->shown_symb());
 }
 
-# Convenience function: This seperates the logic of how to create
+# Convenience function: This separates the logic of how to create
 # the problem text strings ("Due: DATE", "Open: DATE", "Not yet assigned",
-# etc.) into a seperate function. It takes a resource object as the
+# etc.) into a separate function. It takes a resource object as the
 # first parameter, and the part number of the resource as the second.
 # It's basically a big switch statement on the status of the resource.
 
@@ -259,34 +504,37 @@ sub getDescription {
     my $part = shift;
     my $status = $res->status($part);
 
-    if ($status == $res->NETWORK_FAILURE) { return ""; }
+    if ($status == $res->NETWORK_FAILURE) { 
+        return &mt("Having technical difficulties; please check status later"); 
+    }
     if ($status == $res->NOTHING_SET) {
-        return "Not currently assigned.";
+        return &mt("Not currently assigned.");
     }
     if ($status == $res->OPEN_LATER) {
-        return "Open " . timeToHumanString($res->opendate($part));
+        return "Open " . timeToHumanString($res->opendate($part),'start');
     }
     if ($status == $res->OPEN) {
         if ($res->duedate($part)) {
-            return "Due " . timeToHumanString($res->duedate($part));
+            return &mt("Due")."  " .timeToHumanString($res->duedate($part),'end');
         } else {
-            return "Open, no due date";
+            return &mt("Open, no due date");
         }
     }
     if ($status == $res->PAST_DUE_ANSWER_LATER) {
-        return "Answer open " . timeToHumanString($res->answerdate($part));
+        return &mt("Answer open")." " . timeToHumanString($res->answerdate($part),'start');
     }
     if ($status == $res->PAST_DUE_NO_ANSWER) {
-        return "Was due " . timeToHumanString($res->duedate($part));
+        return &mt("Was due")." " . timeToHumanString($res->duedate($part),'end');
     }
-    if ($status == $res->ANSWER_OPEN) {
-        return "Answer available";
+    if (($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT)
+	&& $res->handgrade($part) ne 'yes') {
+        return &mt("Answer available");
     }
     if ($status == $res->EXCUSED) {
-        return "Excused by instructor";
+        return &mt("Excused by instructor");
     }
     if ($status == $res->ATTEMPTED) {
-        return "Not yet graded.";
+        return &mt("Answer submitted, not yet graded");
     }
     if ($status == $res->TRIES_LEFT) {
         my $tries = $res->tries($part);
@@ -298,27 +546,30 @@ sub getDescription {
                 $triesString = "<b>$triesString</b>";
             }
         }
-        if ($res->duedate()) {
-            return "Due " . timeToHumanString($res->duedate($part)) .
+        if ($res->duedate($part)) {
+            return &mt("Due")." " . timeToHumanString($res->duedate($part),'end') .
                 " $triesString";
         } else {
-            return "No due date $triesString";
+            return &mt("No due date")." $triesString";
         }
     }
+    if ($status == $res->ANSWER_SUBMITTED) {
+        return &mt('Answer submitted');
+    }
 }
 
 # Convenience function, so others can use it: Is the problem due in less then
 # 24 hours, and still can be done?
 
-sub dueInLessThen24Hours {
+sub dueInLessThan24Hours {
     my $res = shift;
     my $part = shift;
     my $status = $res->status($part);
 
-    return ($status == $res->OPEN() || $status == $res->ATTEMPTED() ||
+    return ($status == $res->OPEN() ||
             $status == $res->TRIES_LEFT()) &&
-           $res->duedate() && $res->duedate() < time()+(24*60*60) &&
-           $res->duedate() > time();
+	    $res->duedate($part) && $res->duedate($part) < time()+(24*60*60) &&
+	    $res->duedate($part) > time();
 }
 
 # Convenience function, so others can use it: Is there only one try remaining for the
@@ -330,13 +581,14 @@ sub lastTry {
     my $tries = $res->tries($part);
     my $maxtries = $res->maxtries($part);
     return $tries && $maxtries && $maxtries > 1 &&
-        $maxtries - $tries == 1 && $res->duedate() &&
-        $res->duedate() > time();
+        $maxtries - $tries == 1 && $res->duedate($part) &&
+        $res->duedate($part) > time();
 }
 
-# This puts a human-readable name on the ENV variable.
+# This puts a human-readable name on the env variable.
+
 sub advancedUser {
-    return $ENV{'user.adv'};
+    return $env{'request.role.adv'};
 }
 
 
@@ -348,13 +600,18 @@ sub advancedUser {
 # print "Answer available $timestring"
 # Very, very, very, VERY English-only... goodness help a localizer on
 # this func...
+
+
 sub timeToHumanString {
-    my ($time) = @_;
+    my ($time,$type,$format) = @_;
+
     # zero, '0' and blank are bad times
     if (!$time) {
-        return 'never';
+        return &mt('never');
     }
-
+    unless (&Apache::lonlocal::current_language()=~/^en/) {
+	return &Apache::lonlocal::locallocaltime($time);
+    } 
     my $now = time();
 
     my @time = localtime($time);
@@ -418,79 +675,218 @@ sub timeToHumanString {
             return "$prefix$hourString$minuteString$tense";
         }
 
+	# If there's a caller supplied format, use it.
+
+	if($format ne '') {
+	    my $timeStr = strftime($format, localtime($time));
+	    return $timeStr.&Apache::lonlocal::gettimezone($time);
+	}
+
         # Less then 5 days away, display day of the week and
         # HH:MM
+
         if ( $delta < $day * 5 ) {
             my $timeStr = strftime("%A, %b %e at %I:%M %P", localtime($time));
-            $timeStr =~ s/12:00 am/midnight/;
+            $timeStr =~ s/12:00 am/00:00/;
             $timeStr =~ s/12:00 pm/noon/;
-            return ($inPast ? "last " : "next ") .
-                $timeStr;
+            return ($inPast ? "last " : "this ") .
+                $timeStr.&Apache::lonlocal::gettimezone($time);
         }
         
+	my $conjunction='on';
+	if ($type eq 'start') {
+	    $conjunction='at';
+	} elsif ($type eq 'end') {
+	    $conjunction='by';
+	}
         # Is it this year?
         if ( $time[5] == $now[5]) {
             # Return on Month Day, HH:MM meridian
-            my $timeStr = strftime("on %A, %b %e at %I:%M %P", localtime($time));
-            $timeStr =~ s/12:00 am/midnight/;
+            my $timeStr = strftime("$conjunction %A, %b %e at %I:%M %P", localtime($time));
+            $timeStr =~ s/12:00 am/00:00/;
             $timeStr =~ s/12:00 pm/noon/;
-            return $timeStr;
+            return $timeStr.&Apache::lonlocal::gettimezone($time);
         }
 
         # Not this year, so show the year
-        my $timeStr = strftime("on %A, %b %e %G at %I:%M %P", localtime($time));
-        $timeStr =~ s/12:00 am/midnight/;
+        my $timeStr = strftime("$conjunction %A, %b %e %Y at %I:%M %P", localtime($time));
+        $timeStr =~ s/12:00 am/00:00/;
         $timeStr =~ s/12:00 pm/noon/;
-        return $timeStr;
+        return $timeStr.&Apache::lonlocal::gettimezone($time);
     }
 }
 
 
 =pod
 
-=head1 navmap renderer
+=head1 NAME
 
-The navmaprenderer package provides a sophisticated rendering of the standard navigation maps interface into HTML. The provided nav map handler is actually just a glorified call to this. 
+Apache::lonnavmap - Subroutines to handle and render the navigation
+    maps
 
-Because of the large number of parameters this function presents, instead of passing it arguments as is normal, pass it in an anonymous hash with the given options. This is because there is no obvious order you may wish to override these in and a hash is easier to read and understand then "undef, undef, undef, 1, undef, undef, renderButton, undef, 0" when you mostly want default behaviors.
+=head1 SYNOPSIS
 
-The package provides a function called 'render', called as Apache::lonnavmaps::renderer->render({}).
+The main handler generates the navigational listing for the course,
+the other objects export this information in a usable fashion for
+other modules.
+
+=head1 OVERVIEW
+
+X<lonnavmaps, overview> When a user enters a course, LON-CAPA examines the
+course structure and caches it in what is often referred to as the
+"big hash" X<big hash>. You can see it if you are logged into
+LON-CAPA, in a course, by going to /adm/test. (You may need to
+tweak the /home/httpd/lonTabs/htpasswd file to view it.) The
+content of the hash will be under the heading "Big Hash".
+
+Big Hash contains, among other things, how resources are related
+to each other (next/previous), what resources are maps, which 
+resources are being chosen to not show to the student (for random
+selection), and a lot of other things that can take a lot of time
+to compute due to the amount of data that needs to be collected and
+processed.
+
+Apache::lonnavmaps provides an object model for manipulating this
+information in a higher-level fashion then directly manipulating 
+the hash. It also provides access to several auxilary functions 
+that aren't necessarily stored in the Big Hash, but are a per-
+resource sort of value, like whether there is any feedback on 
+a given resource.
+
+Apache::lonnavmaps also abstracts away branching, and someday, 
+conditions, for the times where you don't really care about those
+things.
+
+Apache::lonnavmaps also provides fairly powerful routines for
+rendering navmaps, and last but not least, provides the navmaps
+view for when the user clicks the NAV button.
+
+B<Note>: Apache::lonnavmaps I<only> works for the "currently
+logged in user"; if you want things like "due dates for another
+student" lonnavmaps can not directly retrieve information like
+that. You need the EXT function. This module can still help,
+because many things, such as the course structure, are constant
+between users, and Apache::lonnavmaps can help by providing
+symbs for the EXT call.
+
+The rest of this file will cover the provided rendering routines, 
+which can often be used without fiddling with the navmap object at
+all, then documents the Apache::lonnavmaps::navmap object, which
+is the key to accessing the Big Hash information, covers the use
+of the Iterator (which provides the logic for traversing the 
+somewhat-complicated Big Hash data structure), documents the
+Apache::lonnavmaps::Resource objects that are returned by 
+
+=head1 Subroutine: render
+
+The navmap renderer package provides a sophisticated rendering of the
+standard navigation maps interface into HTML. The provided nav map
+handler is actually just a glorified call to this.
+
+Because of the large number of parameters this function accepts,
+instead of passing it arguments as is normal, pass it in an anonymous
+hash with the desired options.
 
-=head2 Overview of Columns
+The package provides a function called 'render', called as
+Apache::lonnavmaps::render({}).
 
-The renderer will build an HTML table for the navmap and return it. The table is consists of several columns, and a row for each resource (or possibly each part). You tell the renderer how many columns to create and what to place in each column, optionally using one or more of the preparent columns, and the renderer will assemble the table.
+=head2 Overview of Columns
 
-Any additional generally useful column types should be placed in the renderer code here, so anybody can use it anywhere else. Any code specific to the current application (such as the addition of <input> elements in a column) should be placed in the code of the thing using the renderer.
+The renderer will build an HTML table for the navmap and return
+it. The table is consists of several columns, and a row for each
+resource (or possibly each part). You tell the renderer how many
+columns to create and what to place in each column, optionally using
+one or more of the prepared columns, and the renderer will assemble
+the table.
+
+Any additional generally useful column types should be placed in the
+renderer code here, so anybody can use it anywhere else. Any code
+specific to the current application (such as the addition of <input>
+elements in a column) should be placed in the code of the thing using
+the renderer.
+
+At the core of the renderer is the array reference COLS (see Example
+section below for how to pass this correctly). The COLS array will
+consist of entries of one of two types of things: Either an integer
+representing one of the pre-packaged column types, or a sub reference
+that takes a resource reference, a part number, and a reference to the
+argument hash passed to the renderer, and returns a string that will
+be inserted into the HTML representation as it.
 
-At the core of the renderer is the array reference COLS (see Example section below for how to pass this correctly). The COLS array will consist of entries of one of two types of things: Either an integer representing one of the pre-packaged column types, or a sub reference that takes a resource reference, a part number, and a reference to the argument hash passed to the renderer, and returns a string that will be inserted into the HTML representation as it.
+All other parameters are ways of either changing how the columns
+are printing, or which rows are shown.
 
-The pre-packaged column names are refered to by constants in the Apache::lonnavmaps::renderer namespace. The following currently exist:
+The pre-packaged column names are refered to by constants in the
+Apache::lonnavmaps namespace. The following currently exist:
 
 =over 4
 
-=item * B<resource>: The general info about the resource: Link, icon for the type, etc. The first column in the standard nav map display. This column also accepts the following parameter in the renderer hash:
+=item * B<Apache::lonnavmaps::resource>:
+
+The general info about the resource: Link, icon for the type, etc. The
+first column in the standard nav map display. This column provides the
+indentation effect seen in the B<NAV> screen. This column also accepts
+the following parameters in the renderer hash:
 
 =over 4
 
-=item * B<resource_nolink>: If true, the resource will not be linked. Default: false, resource will have links.
+=item * B<resource_nolink>: default false
 
-=item * B<resource_part_count>: If true (default), the resource will show a part count if the full part list is not displayed. If false, the resource will never show a part count.
+If true, the resource will not be linked. By default, all non-folder
+resources are linked.
 
-=item * B<resource_no_folder_link>: If true, the resource's folder will not be clickable to open or close it. Default is false.
+=item * B<resource_part_count>: default true
+
+If true, the resource will show a part count B<if> the full
+part list is not displayed. (See "condense_parts" later.) If false,
+the resource will never show a part count.
+
+=item * B<resource_no_folder_link>:
+
+If true, the resource's folder will not be clickable to open or close
+it. Default is false. True implies printCloseAll is false, since you
+can't close or open folders when this is on anyhow.
 
 =back
 
-=item B<communication_status>: Whether there is discussion on the resource, email for the user, or (lumped in here) perl errors in the execution of the problem. This is the second column in the main nav map.
+=item * B<Apache::lonnavmaps::communication_status>:
+
+Whether there is discussion on the resource, email for the user, or
+(lumped in here) perl errors in the execution of the problem. This is
+the second column in the main nav map.
+
+=item * B<Apache::lonnavmaps::quick_status>:
 
-=item B<quick_status>: An icon for the status of a problem, with four possible states: Correct, incorrect, open, or none (not open yet, not a problem). The third column of the standard navmap.
+An icon for the status of a problem, with five possible states:
+Correct, incorrect, open, awaiting grading (for a problem where the
+computer's grade is suppressed, or the computer can't grade, like
+essay problem), or none (not open yet, not a problem). The
+third column of the standard navmap.
 
-=item B<long_status>: A text readout of the details of the current status of the problem, such as "Due in 22 hours". The fourth column of the standard navmap.
+=item * B<Apache::lonnavmaps::long_status>:
+
+A text readout of the details of the current status of the problem,
+such as "Due in 22 hours". The fourth column of the standard navmap.
+
+=item * B<Apache::lonnavmaps::part_status_summary>:
+
+A text readout summarizing the status of the problem. If it is a
+single part problem, will display "Correct", "Incorrect", 
+"Not yet open", "Open", "Attempted", or "Error". If there are
+multiple parts, this will output a string that in HTML will show a
+status of how many parts are in each status, in color coding, trying
+to match the colors of the icons within reason.
+
+Note this only makes sense if you are I<not> showing parts. If 
+C<showParts> is true (see below), this column will not output
+anything. 
 
 =back
 
 If you add any others please be sure to document them here.
 
-An example of a column renderer that will show the ID number of a resource, along with the part name if any:
+An example of a column renderer that will show the ID number of a
+resource, along with the part name if any:
 
  sub { 
   my ($resource, $part, $params) = @_;   
@@ -498,60 +894,152 @@ An example of a column renderer that wil
   return '<td>' . $resource->{ID} . '</td>';
  }
 
-Note these functions are responsible for the TD tags, which allow them to override vertical and horizontal alignment, etc.
+Note these functions are responsible for the TD tags, which allow them
+to override vertical and horizontal alignment, etc.
 
 =head2 Parameters
 
-Most of these parameters are only useful if you are *not* using the folder interface (i.e., the default first column), which is probably the common case. If you are using this interface, then you should be able to get away with just using 'cols' (to specify the columns shown), 'url' (necessary for the folders to link to the current screen correctly), and possibly 'queryString' if your app calls for it. In that case, maintaining the state of the folders will be done automatically.
+Minimally, you should be
+able to get away with just using 'cols' (to specify the columns
+shown), 'url' (necessary for the folders to link to the current screen
+correctly), and possibly 'queryString' if your app calls for it. In
+that case, maintaining the state of the folders will be done
+automatically.
 
 =over 4
 
-=item * B<iterator>: A reference to a fresh ::iterator to use from the navmaps. The rendering will reflect the options passed to the iterator, so you can use that to just render a certain part of the course, if you like. If one is not passed, the renderer will attempt to construct one from ENV{'form.filter'} and ENV{'form.condition'} information, plus the 'iterator_map' parameter if any.
+=item * B<iterator>: default: constructs one from %env
+
+A reference to a fresh ::iterator to use from the navmaps. The
+rendering will reflect the options passed to the iterator, so you can
+use that to just render a certain part of the course, if you like. If
+one is not passed, the renderer will attempt to construct one from
+env{'form.filter'} and env{'form.condition'} information, plus the
+'iterator_map' parameter if any.
+
+=item * B<iterator_map>: default: not used
+
+If you are letting the renderer do the iterator handling, you can
+instruct the renderer to render only a particular map by passing it
+the source of the map you want to process, like
+'/res/103/jerf/navmap.course.sequence'.
+
+=item * B<navmap>: default: constructs one from %env
+
+A reference to a navmap, used only if an iterator is not passed in. If
+this is necessary to make an iterator but it is not passed in, a new
+one will be constructed based on env info. This is useful to do basic
+error checking before passing it off to render.
+
+=item * B<r>: default: must be passed in
 
-=item * B<iterator_map>: If you are letting the renderer do the iterator handling, you can instruct the renderer to render only a particular map by passing it the source of the map you want to process, like '/res/103/jerf/navmap.course.sequence'.
+The standard Apache response object. This must be passed to the
+renderer or the course hash will be locked.
 
-=item * B<navmap>: A reference to a navmap, used only if an iterator is not passed in. If this is necessary to make an iterator but it is not passed in, a new one will be constructed based on ENV info. This is useful to do basic error checking before passing it off to render.
+=item * B<cols>: default: empty (useless)
 
-=item * B<cols>: An array reference
+An array reference
 
-=item * B<showParts>: A flag. If yes (default), a line for the resource itself, and a line for each part will be displayed. If not, only one line for each resource will be displayed.
+=item * B<showParts>:default true
 
-=item * B<condenseParts>: A flag. If yes (default), if all parts of the problem have the same status and that status is Nothing Set, Correct, or Network Failure, then only one line will be displayed for that resource anyhow. If no, all parts will always be displayed. If showParts is 0, this is ignored.
+A flag. If true, a line for the resource itself, and a line
+for each part will be displayed. If not, only one line for each
+resource will be displayed.
 
-=item * B<jumpCount>: A string identifying the URL to place the anchor 'curloc' at. Default to no anchor at all. It is the responsibility of the renderer user to ensure that the #curloc is in the URL. By default, determined through the use of the ENV{} 'jump' and 'jumpType' information.
+=item * B<condenseParts>: default true
 
-=item * B<hereURL>: A URL identifying where to place the 'here' marker. By default, will pull this from the ENV{'form.here*'} info.
+A flag. If true, if all parts of the problem have the same
+status and that status is Nothing Set, Correct, or Network Failure,
+then only one line will be displayed for that resource anyhow. If no,
+all parts will always be displayed. If showParts is 0, this is
+ignored.
 
-=item * B<hereSymb>: A Symb identifying where to place the 'here' marker. Default same as hereURL.
+=item * B<jumpCount>: default: determined from %env
 
-=item * B<indentString>: A string identifying the indentation string to use. By default, this is a 25 pixel whitespace image with no alt text.
+A string identifying the URL to place the anchor 'curloc' at.
+It is the responsibility of the renderer user to
+ensure that the #curloc is in the URL. By default, determined through
+the use of the env{} 'jump' information, and should normally "just
+work" correctly.
 
-=item * B<queryString>: A string which will be prepended to the query string used when the folders are opened or closed.
+=item * B<here>: default: empty string
 
-=item * B<url>: The url the folders will link to, which should be the current page. Required if the resource info column is shown.
+A Symb identifying where to place the 'here' marker. The empty
+string means no marker.
 
-=item * B<currentJumpIndex>: Describes the currently-open row number to cause the browser to jump to, because the user just opened that folder. By default, pulled from the Jump information in the ENV{'form.*'}.
+=item * B<indentString>: default: 25 pixel whitespace image
 
-=item * B<r>: The standard Apache response object. If you pass this to the render, it will use it to flush the table every 20 rows and handle the rendering itself.
+A string identifying the indentation string to use. 
 
-=item * B<printKey>: If true, print the key that appears on the top of the standard navmaps. Default is false.
+=item * B<queryString>: default: empty
 
-=item * B<printCloseAll>: If true, print the "Close all folders" or "open all folders" links. Default is true.
+A string which will be prepended to the query string used when the
+folders are opened or closed. You can use this to pass
+application-specific values.
 
-=item * B<filterFunc>: A function that takes the resource object as its only parameter and returns a true or false value. If true, the resource is displayed. If false, it is simply skipped in the display. By default, all resources are shown.
+=item * B<url>: default: none
 
-=item * B<suppressNavmaps>: If true, will not display Navigate Content resources. Default to false.
+The url the folders will link to, which should be the current
+page. Required if the resource info column is shown, and you 
+are allowing the user to open and close folders.
+
+=item * B<currentJumpIndex>: default: no jumping
+
+Describes the currently-open row number to cause the browser to jump
+to, because the user just opened that folder. By default, pulled from
+the Jump information in the env{'form.*'}.
+
+=item * B<printKey>: default: false
+
+If true, print the key that appears on the top of the standard
+navmaps.
+
+=item * B<printCloseAll>: default: true
+
+If true, print the "Close all folders" or "open all folders"
+links.
+
+=item * B<filterFunc>: default: sub {return 1;} (accept everything)
+
+A function that takes the resource object as its only parameter and
+returns a true or false value. If true, the resource is displayed. If
+false, it is simply skipped in the display.
+
+=item * B<suppressEmptySequences>: default: false
+
+If you're using a filter function, and displaying sequences to orient
+the user, then frequently some sequences will be empty. Setting this to
+true will cause those sequences not to display, so as not to confuse the
+user into thinking that if the sequence is there there should be things
+under it; for example, see the "Show Uncompleted Homework" view on the
+B<NAV> screen.
+
+=item * B<suppressNavmaps>: default: false
+
+If true, will not display Navigate Content resources. 
 
 =back
 
 =head2 Additional Info
 
-In addition to the parameters you can pass to the renderer, which will be passed through unchange to the column renderers, the renderer will generate the following information which your renderer may find useful:
-
-If you want to know how many rows were printed, the 'counter' element of the hash passed into the render function will contain the count. You may want to check whether any resources were printed at all.
+In addition to the parameters you can pass to the renderer, which will
+be passed through unchange to the column renderers, the renderer will
+generate the following information which your renderer may find
+useful:
 
 =over 4
 
+=item * B<counter>: 
+
+Contains the number of rows printed. Useful after calling the render 
+function, as you can detect whether anything was printed at all.
+
+=item * B<isNewBranch>:
+
+Useful for renderers: If this resource is currently the first resource
+of a new branch, this will be true. The Resource column (leftmost in the
+navmaps screen) uses this to display the "new branch" icon 
+
 =back
 
 =cut
@@ -560,8 +1048,7 @@ sub resource { return 0; }
 sub communication_status { return 1; }
 sub quick_status { return 2; }
 sub long_status { return 3; }
-
-# Data for render_resource
+sub part_status_summary { return 4; }
 
 sub render_resource {
     my ($resource, $part, $params) = @_;
@@ -569,36 +1056,47 @@ sub render_resource {
     my $nonLinkedText = ''; # stuff after resource title not in link
 
     my $link = $params->{"resourceLink"};
+
+    #  The URL part is not escaped at this point, but the symb is... 
+    #  The stuff to the left of the ? must have ' replaced by \' since
+    #  it will be quoted with ' in the href.
+
+    my ($left,$right) = split(/\?/, $link);
+    $link = $left.'?'.$right;
+
     my $src = $resource->src();
     my $it = $params->{"iterator"};
     my $filter = $it->{FILTER};
 
     my $title = $resource->compTitle();
-    if ($src =~ /^\/uploaded\//) {
-        $nonLinkedText=$title;
-        $title = '';
-    }
+
     my $partLabel = "";
     my $newBranchText = "";
-    
+    my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
     # If this is a new branch, label it so
     if ($params->{'isNewBranch'}) {
-        $newBranchText = "<img src='/adm/lonIcons/branch.gif' border='0' />";
+        $newBranchText = "<img src='$location/branch.gif' border='0' alt='Branch' />";
     }
 
     # links to open and close the folder
-    my $linkopen = "<a href='$link'>";
+
+    
+    my $linkopen = "<a href=\"$link\">";
+
+
     my $linkclose = "</a>";
 
-    # Default icon: HTML page
-    my $icon = "<img src='/adm/lonIcons/html.gif' alt='' border='0' />";
+    # Default icon: unknown page
+    my $icon = "<img src='$location/unknown.gif' alt='' border='0' alt='&nbsp;&nbsp;' ' />";
     
     if ($resource->is_problem()) {
-        if ($part eq "0" || $params->{'condensed'}) {
-            $icon = '<img src="/adm/lonIcons/problem.gif" alt="" border="0" />';
+        if ($part eq '0' || $params->{'condensed'}) {
+            $icon ='<img src="'.$location.'/problem.gif" alt="'.&mt('Problem').'" border="0" />';
         } else {
             $icon = $params->{'indentString'};
         }
+    } else {
+	$icon = "<img src='".&Apache::loncommon::icon($resource->src)."' alt='&nbsp;&nbsp;' border='0' />";
     }
 
     # Display the correct map icon to open or shut map
@@ -609,11 +1107,15 @@ sub render_resource {
             $nowOpen = !$nowOpen;
         }
 
+	my $folderType = $resource->is_sequence() ? 'folder' : 'page';
+        my $title=$resource->title;
+        $title=~s/\"/\&quot;/g;
         if (!$params->{'resource_no_folder_link'}) {
-            $icon = 'navmap.folder.' . ($nowOpen ? 'closed' : 'open') . '.gif';
-            $icon = "<img src='/adm/lonIcons/$icon' alt='' border='0' />";
+            $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') . '.gif';
+	    $icon = "<img src='$location/$icon' alt=\"".
+		($nowOpen ? &mt('Open Folder') : &mt('Close Folder')).' '.$title."\" border='0' />";
 
-            $linkopen = "<a href='" . $params->{'url'} . '?' . 
+            $linkopen = "<a href=\"" . $params->{'url'} . '?' . 
                 $params->{'queryString'} . '&filter=';
             $linkopen .= ($nowOpen xor $it->{CONDITION}) ?
                 addToFilter($filter, $mapId) :
@@ -621,14 +1123,16 @@ sub render_resource {
             $linkopen .= "&condition=" . $it->{CONDITION} . '&hereType='
                 . $params->{'hereType'} . '&here=' .
                 &Apache::lonnet::escape($params->{'here'}) . 
-                '&jumpType=' . SYMB() . '&jump=' .
+                '&jump=' .
                 &Apache::lonnet::escape($resource->symb()) . 
-                "&folderManip=1'>";
+                "&folderManip=1\">";
+
         } else {
             # Don't allow users to manipulate folder
-            $icon = 'navmap.folder.' . ($nowOpen ? 'closed' : 'open') .
+            $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') .
                 '.nomanip.gif';
-            $icon = "<img src='/adm/lonIcons/$icon' alt='' border='0' />";
+            $icon = "<img src='$location/$icon' alt=\"".
+		($nowOpen ? &mt('Open Folder') : &mt('Close Folder')).' '.$title."\" border='0' />";
 
             $linkopen = "";
             $linkclose = "";
@@ -636,7 +1140,10 @@ sub render_resource {
     }
 
     if ($resource->randomout()) {
-        $nonLinkedText .= ' <i>(hidden)</i> ';
+        $nonLinkedText .= ' <i>('.&mt('hidden').')</i> ';
+    }
+    if (!$resource->condval()) {
+        $nonLinkedText .= ' <i>('.&mt('conditionally hidden').')</i> ';
     }
     
     # We're done preparing and finally ready to start the rendering
@@ -651,33 +1158,38 @@ sub render_resource {
     }
 
     # Decide what to display
+
     $result .= "$newBranchText$linkopen$icon$linkclose";
     
     my $curMarkerBegin = '';
     my $curMarkerEnd = '';
 
     # Is this the current resource?
-    if (!$params->{'displayedHereMarker'} &&
-        (($params->{'hereType'} == SYMB() && 
-          $resource->symb() eq $params->{'here'}) ||
-         ($params->{'hereType'} == URL() &&
-          $resource->src() eq $params->{'here'}))) {
-        $curMarkerBegin = '<font color="red" size="+2">&gt; </font>';
+    if (!$params->{'displayedHereMarker'} && 
+        $resource->symb() eq $params->{'here'} ) {
+        $curMarkerBegin = '<font color="red" size="+2">&gt;</font>';
         $curMarkerEnd = '<font color="red" size="+2">&lt;</font>';
+        $params->{'displayedHereMarker'} = 1;
     }
 
-    if ($resource->is_problem() && $part ne "0" && 
+    if ($resource->is_problem() && $part ne '0' && 
         !$params->{'condensed'}) {
-        $partLabel = " (Part $part)";
+	my $displaypart=$resource->part_display($part);
+        $partLabel = " (".&mt('Part: [_1]', $displaypart).")";
+	if ($link!~/\#/) { $link.='#'.&Apache::lonnet::escape($part); }
         $title = "";
     }
 
-    if ($params->{'multipart'} && $params->{'condensed'}) {
-        $nonLinkedText .= ' (' . $resource->countParts() . ' parts)';
+    if ($params->{'condensed'} && $resource->countParts() > 1) {
+        $nonLinkedText .= ' ('.&mt('[_1] parts', $resource->countParts()).')';
     }
 
-    if (!$params->{'resource_nolink'}) {
-        $result .= "  $curMarkerBegin<a href='$link'>$title$partLabel</a>$curMarkerEnd $nonLinkedText</td>";
+    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>";
     } else {
         $result .= "  $curMarkerBegin$title$partLabel$curMarkerEnd $nonLinkedText</td>";
     }
@@ -690,12 +1202,16 @@ sub render_communication_status {
     my $discussionHTML = ""; my $feedbackHTML = ""; my $errorHTML = "";
 
     my $link = $params->{"resourceLink"};
-    my $linkopen = "<a href='$link'>";
+    my $target;
+    if ($env{'environment.remotenavmap'} eq 'on') {
+	$target=' target="loncapaclient" ';
+    }
+    my $linkopen = "<a $target href=\"$link\">";
     my $linkclose = "</a>";
-
+    my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
     if ($resource->hasDiscussion()) {
         $discussionHTML = $linkopen .
-            '<img border="0" src="/adm/lonMisc/chat.gif" />' .
+            '<img border="0" src="'.$location.'/chat.gif" />' .
             $linkclose;
     }
     
@@ -703,9 +1219,9 @@ sub render_communication_status {
         my $feedback = $resource->getFeedback();
         foreach (split(/\,/, $feedback)) {
             if ($_) {
-                $feedbackHTML .= '&nbsp;<a href="/adm/email?display='
+                $feedbackHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
                     . &Apache::lonnet::escape($_) . '">'
-                    . '<img src="/adm/lonMisc/feedback.gif" '
+                    . '<img src="'.$location.'/feedback.gif" '
                     . 'border="0" /></a>';
             }
         }
@@ -713,16 +1229,23 @@ sub render_communication_status {
     
     if ($resource->getErrors()) {
         my $errors = $resource->getErrors();
+        my $errorcount = 0;
         foreach (split(/,/, $errors)) {
+            last if ($errorcount>=10); # Only output 10 bombs maximum
             if ($_) {
-                $errorHTML .= '&nbsp;<a href="/adm/email?display='
+                $errorcount++;
+                $errorHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
                     . &Apache::lonnet::escape($_) . '">'
-                    . '<img src="/adm/lonMisc/bomb.gif" '
+                    . '<img src="'.$location.'/bomb.gif" '
                     . 'border="0" /></a>';
             }
         }
     }
 
+    if ($params->{'multipart'} && $part != '0') {
+	$discussionHTML = $feedbackHTML = $errorHTML = '';
+    }
+
     return "<td width=\"75\" align=\"left\" valign=\"center\">$discussionHTML$feedbackHTML$errorHTML&nbsp;</td>";
 
 }
@@ -733,15 +1256,22 @@ sub render_quick_status {
         $params->{'multipart'} && $part eq "0";
 
     my $link = $params->{"resourceLink"};
-    my $linkopen = "<a href='$link'>";
+    my $target;
+    if ($env{'environment.remotenavmap'} eq 'on') {
+	$target=' target="loncapaclient" ';
+    }
+    my $linkopen = "<a $target href=\"$link\">";
     my $linkclose = "</a>";
 
     if ($resource->is_problem() &&
         !$firstDisplayed) {
-        my $icon = $statusIconMap{$resource->status($part)};
+	
+        my $icon = $statusIconMap{$resource->simpleStatus($part)};
         my $alt = $iconAltTags{$icon};
         if ($icon) {
-            $result .= "<td width='30' valign='center' width='50' align='right'>$linkopen<img width='25' height='25' src='/adm/lonIcons/$icon' border='0' alt='$alt' />$linkclose</td>\n";
+	    my $location=
+		&Apache::loncommon::lonhttpdurl("/adm/lonIcons/$icon");
+            $result .= "<td width='30' valign='center' width='50' align='right'>$linkopen<img width='25' height='25' src='$location' border='0' alt='$alt' />$linkclose</td>\n";
         } else {
             $result .= "<td width='30'>&nbsp;</td>\n";
         }
@@ -761,7 +1291,7 @@ sub render_long_status {
     if ($resource->is_problem()) {
         $color = $colormap{$resource->status};
         
-        if (dueInLessThen24Hours($resource, $part) ||
+        if (dueInLessThan24Hours($resource, $part) ||
             lastTry($resource, $part)) {
             $color = $hurryUpColor;
         }
@@ -777,14 +1307,94 @@ sub render_long_status {
     if ($resource->is_map() && advancedUser() && $resource->randompick()) {
         $result .= '(randomly select ' . $resource->randompick() .')';
     }
-    
-    $result .= "&nbsp;</td>\n";
+
+    # Debugging code
+    #$result .= " " . $resource->awarded($part) . '/' . $resource->weight($part) .
+    #	' - Part: ' . $part;
+
+    $result .= "</td>\n";
     
     return $result;
 }
 
+# Colors obtained by taking the icons, matching the colors, and
+# possibly reducing the Value (HSV) of the color, if it's too bright
+# for text, generally by one third or so.
+my %statusColors = 
+    (
+     $resObj->CLOSED => '#000000',
+     $resObj->OPEN   => '#998b13',
+     $resObj->CORRECT => '#26933f',
+     $resObj->INCORRECT => '#c48207',
+     $resObj->ATTEMPTED => '#a87510',
+     $resObj->ERROR => '#000000'
+     );
+my %statusStrings = 
+    (
+     $resObj->CLOSED => 'Not yet open',
+     $resObj->OPEN   => 'Open',
+     $resObj->CORRECT => 'Correct',
+     $resObj->INCORRECT => 'Incorrect',
+     $resObj->ATTEMPTED => 'Attempted',
+     $resObj->ERROR => 'Network Error'
+     );
+my @statuses = ($resObj->CORRECT, $resObj->ATTEMPTED, $resObj->INCORRECT, $resObj->OPEN, $resObj->CLOSED, $resObj->ERROR);
+
+use Data::Dumper;
+sub render_parts_summary_status {
+    my ($resource, $part, $params) = @_;
+    if (!$resource->is_problem() && !$resource->contains_problem) { return '<td></td>'; }
+    if ($params->{showParts}) { 
+	return '<td></td>';
+    }
+
+    my $td = "<td align='right'>\n";
+    my $endtd = "</td>\n";
+    my @probs;
+
+    if ($resource->contains_problem) {
+	@probs=$resource->retrieveResources($resource,sub { $_[0]->is_problem() },1,0);
+    } else {
+	@probs=($resource);
+    }
+    my $return;
+    my %overallstatus;
+    my $totalParts;
+    foreach my $resource (@probs) {
+	# If there is a single part, just show the simple status
+	if ($resource->singlepart()) {
+	    my $status = $resource->simpleStatus(${$resource->parts}[0]);
+	    $overallstatus{$status}++;
+	    $totalParts++;
+	    next;
+	}
+	# Now we can be sure the $part doesn't really matter.
+	my $statusCount = $resource->simpleStatusCount();
+	my @counts;
+	foreach my $status (@statuses) {
+	    # decouple display order from the simpleStatusCount order
+	    my $slot = Apache::lonnavmaps::resource::statusToSlot($status);
+	    if ($statusCount->[$slot]) {
+		$overallstatus{$status}+=$statusCount->[$slot];
+		$totalParts+=$statusCount->[$slot];
+	    }
+	}
+    }
+    $return.= $td . $totalParts . ' parts: ';
+    foreach my $status (@statuses) {
+	if ($overallstatus{$status}) {
+	    $return.="<font color='" . $statusColors{$status} .
+		"'>" . $overallstatus{$status} . ' '
+		. $statusStrings{$status} . "</font>";
+	}
+    }
+    $return.= $endtd;
+    return $return;
+}
+
 my @preparedColumns = (\&render_resource, \&render_communication_status,
-                       \&render_quick_status, \&render_long_status);
+                       \&render_quick_status, \&render_long_status,
+		       \&render_parts_summary_status);
 
 sub setDefault {
     my ($val, $default) = @_;
@@ -792,34 +1402,34 @@ sub setDefault {
     return $val;
 }
 
+sub cmp_title {
+    my ($atitle,$btitle) = (lc($_[0]->compTitle),lc($_[1]->compTitle));
+    $atitle=~s/^\s*//;
+    $btitle=~s/^\s*//;
+    return $atitle cmp $btitle;
+}
+
 sub render {
     my $args = shift;
     &Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
     my $result = '';
-
     # Configure the renderer.
     my $cols = $args->{'cols'};
     if (!defined($cols)) {
         # no columns, no nav maps.
         return '';
     }
-    my $mustCloseNavMap = 0;
     my $navmap;
     if (defined($args->{'navmap'})) {
         $navmap = $args->{'navmap'};
     }
 
+    my $r = $args->{'r'};
     my $queryString = $args->{'queryString'};
-    my $jumpToURL = $args->{'jumpToURL'};
-    my $jumpToSymb = $args->{'jumpToSymb'};
-    my $jumpType;
-    my $hereURL = $args->{'hereURL'};
-    my $hereSymb = $args->{'hereSymb'};
-    my $hereType;
-    my $here;
-    my $jump;
-    my $currentJumpIndex = setDefault($args->{'currentJumpIndex'}, 0);    
+    my $jump = $args->{'jump'};
+    my $here = $args->{'here'};
     my $suppressNavmap = setDefault($args->{'suppressNavmap'}, 0);
+    my $closeAllPages = setDefault($args->{'closeAllPages'}, 0);
     my $currentJumpDelta = 2; # change this to change how many resources are displayed
                              # before the current resource when using #current
 
@@ -829,67 +1439,74 @@ sub render {
     # marker
     my $filterHash = {};
     # Figure out what we're not displaying
-    foreach (split(/\,/, $ENV{"form.filter"})) {
+    foreach (split(/\,/, $env{"form.filter"})) {
         if ($_) {
             $filterHash->{$_} = "1";
         }
     }
 
+    # Filter: Remember filter function and add our own filter: Refuse
+    # to show hidden resources unless the user can see them.
+    my $userCanSeeHidden = advancedUser();
+    my $filterFunc = setDefault($args->{'filterFunc'},
+                                sub {return 1;});
+    if (!$userCanSeeHidden) {
+        # Without renaming the filterfunc, the server seems to go into
+        # an infinite loop
+        my $oldFilterFunc = $filterFunc;
+        $filterFunc = sub { my $res = shift; return !$res->randomout() && 
+                                &$oldFilterFunc($res);};
+    }
+
     my $condition = 0;
-    if ($ENV{'form.condition'}) {
+    if ($env{'form.condition'}) {
         $condition = 1;
     }
 
-    if (!$ENV{'form.folderManip'} && !defined($args->{'iterator'})) {
+    if (!$env{'form.folderManip'} && !defined($args->{'iterator'})) {
         # Step 1: Check to see if we have a navmap
         if (!defined($navmap)) {
-            $navmap = Apache::lonnavmaps::navmap->new(
-                        $ENV{"request.course.fn"}.".db",
-                        $ENV{"request.course.fn"}."_parms.db", 1, 1);
-            $mustCloseNavMap = 1;
-        }
-        $navmap->init();
+            $navmap = Apache::lonnavmaps::navmap->new();
+	    if (!defined($navmap)) {
+		# no londer in course
+		return '<font color="red">'.&mt('No course selected').'</font><br />
+                        <a href="/adm/roles">'.&mt('Select a course').'</a><br />';
+	    }
+	}
 
         # Step two: Locate what kind of here marker is necessary
         # Determine where the "here" marker is and where the screen jumps to.
 
-        # We're coming from the remote. We have either a url, a symb, or nothing,
-        # and we need to figure out what.
-        # Preference: Symb
-        
-        if ($ENV{'form.symb'}) {
-            $hereType = $jumpType = SYMB();
-            $here = $jump = $ENV{'form.symb'};
-        } elsif ($ENV{'form.postdata'}) {
+        if ($env{'form.postsymb'} ne '') {
+            $here = $jump = &Apache::lonnet::symbclean($env{'form.postsymb'});
+        } elsif ($env{'form.postdata'} ne '') {
             # couldn't find a symb, is there a URL?
-            my $currenturl = $ENV{'form.postdata'};
-            $currenturl=~s/^http\:\/\///;
-            $currenturl=~s/^[^\/]+//;
+            my $currenturl = $env{'form.postdata'};
+            #$currenturl=~s/^http\:\/\///;
+            #$currenturl=~s/^[^\/]+//;
             
-            $hereType = $jumpType = URL;
-            $here = $jump = $currenturl;
-        } else {
-            # Nothing
-            $hereType = $jumpType = NOTHING();
-        }
+            $here = $jump = &Apache::lonnet::symbread($currenturl);
+	}
+	if ($here eq '') {
+	    my $last;
+	    if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
+                    &GDBM_READER(),0640)) {
+		$last=$hash{'last_known'};
+		untie(%hash);
+	    }
+	    if ($last) { $here = $jump = $last; }
+	}
+
         # Step three: Ensure the folders are open
         my $mapIterator = $navmap->getIterator(undef, undef, undef, 1);
-        my $depth = 1;
-        $mapIterator->next(); # discard the first BEGIN_MAP
-        my $curRes = $mapIterator->next();
-        my $counter = 0;
+        my $curRes;
         my $found = 0;
         
         # We only need to do this if we need to open the maps to show the
         # current position. This will change the counter so we can't count
         # for the jump marker with this loop.
-        while ($depth > 0 && !$found) {
-            if ($curRes == $mapIterator->BEGIN_MAP()) { $depth++; }
-            if ($curRes == $mapIterator->END_MAP()) { $depth--; }
-            
-            if (ref($curRes) && 
-                ($hereType == SYMB() && $curRes->symb() eq $here) ||
-                (ref($curRes) && $hereType == URL() && $curRes->src() eq $here)) {
+        while ($here && ($curRes = $mapIterator->next()) && !$found) {
+            if (ref($curRes) && $curRes->symb() eq $here) {
                 my $mapStack = $mapIterator->getStack();
                 
                 # Ensure the parent maps are open
@@ -902,59 +1519,24 @@ sub render {
                 }
                 $found = 1;
             }
-            
-            $curRes = $mapIterator->next();
         }            
-
-        # Since we changed the folders, (re-)locate the jump point, if any
-        $mapIterator = $navmap->getIterator(undef, undef, $filterHash, 0);
-        $depth = 1;
-        $mapIterator->next();
-        $curRes = $mapIterator->next();
-        my $foundJump = 0;
-        
-        while ($depth > 0 && !$foundJump) {
-            if ($curRes == $mapIterator->BEGIN_MAP()) { $depth++; }
-            if ($curRes == $mapIterator->END_MAP()) { $depth--; }
-            if (ref($curRes)) { $counter++; }
-            
-            if (ref($curRes) && 
-                (($jumpType == SYMB() && $curRes->symb() eq $jump) ||
-                 ($jumpType == URL() && $curRes->src() eq $jump))) {
-                
-                # This is why we have to use the main iterator instead of the
-                # potentially faster DFS: The count has to be the same, so
-                # the order has to be the same, which DFS won't give us.
-                $currentJumpIndex = $counter;
-                $foundJump = 1;
-            }
-            
-            $curRes = $mapIterator->next();
-        }
-    
     }        
-    if ( !defined($args->{'iterator'}) && $ENV{'form.folderManip'} ) { # we came from a user's manipulation of the nav page
+
+    if ( !defined($args->{'iterator'}) && $env{'form.folderManip'} ) { # we came from a user's manipulation of the nav page
         # If this is a click on a folder or something, we want to preserve the "here"
         # from the querystring, and get the new "jump" marker
-        $hereType = $ENV{'form.hereType'};
-        $here = $ENV{'form.here'};
-        $jumpType = $ENV{'form.jumpType'} || NOTHING();
-        $jump = $ENV{'form.jump'};
+        $here = $env{'form.here'};
+        $jump = $env{'form.jump'};
     } 
     
     my $it = $args->{'iterator'};
     if (!defined($it)) {
-        # Construct a default iterator based on $ENV{'form.'} information
+        # Construct a default iterator based on $env{'form.'} information
         
         # Step 1: Check to see if we have a navmap
         if (!defined($navmap)) {
-            $navmap = Apache::lonnavmaps::navmap->new(
-                        $ENV{"request.course.fn"}.".db",
-                        $ENV{"request.course.fn"}."_parms.db", 1, 1);
-            $mustCloseNavMap = 1;
+            $navmap = Apache::lonnavmaps::navmap->new();
         }
-        # Paranoia: Make sure it's ready
-        $navmap->init();
 
         # See if we're being passed a specific map
         if ($args->{'iterator_map'}) {
@@ -968,54 +1550,136 @@ sub render {
             $args->{'iterator'} = $it = $navmap->getIterator(undef, undef, $filterHash, $condition);
         }
     }
+
+    # (re-)Locate the jump point, if any
+    # Note this does not take filtering or hidden into account... need
+    # to be fixed?
+    my $mapIterator = $navmap->getIterator(undef, undef, $filterHash, 0);
+    my $curRes;
+    my $foundJump = 0;
+    my $counter = 0;
     
+    while (($curRes = $mapIterator->next()) && !$foundJump) {
+        if (ref($curRes)) { $counter++; }
+        
+        if (ref($curRes) && $jump eq $curRes->symb()) {
+            
+            # This is why we have to use the main iterator instead of the
+            # potentially faster DFS: The count has to be the same, so
+            # the order has to be the same, which DFS won't give us.
+            $args->{'currentJumpIndex'} = $counter;
+            $foundJump = 1;
+        }
+    }
+
     my $showParts = setDefault($args->{'showParts'}, 1);
     my $condenseParts = setDefault($args->{'condenseParts'}, 1);
     # keeps track of when the current resource is found,
     # so we can back up a few and put the anchor above the
     # current resource
-    my $r = $args->{'r'};
     my $printKey = $args->{'printKey'};
     my $printCloseAll = $args->{'printCloseAll'};
     if (!defined($printCloseAll)) { $printCloseAll = 1; }
-    my $filterFunc = setDefault($args->{'filterFunc'},
-                                sub {return 1;});
-    
+
     # Print key?
     if ($printKey) {
         $result .= '<table border="0" cellpadding="2" cellspacing="0">';
         my $date=localtime;
         $result.='<tr><td align="right" valign="bottom">Key:&nbsp;&nbsp;</td>';
+	my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
         if ($navmap->{LAST_CHECK}) {
             $result .= 
-                '<img src="/adm/lonMisc/chat.gif"> New discussion since '.
+                '<img src="'.$location.'/chat.gif"> '.&mt('New discussion since').' '.
                 strftime("%A, %b %e at %I:%M %P", localtime($navmap->{LAST_CHECK})).
                 '</td><td align="center" valign="bottom">&nbsp;&nbsp;'.
-                '<img src="/adm/lonMisc/feedback.gif"> New message (click to open)<p>'.
+                '<img src="'.$location.'/feedback.gif"> '.&mt('New message (click to open)').'<p>'.
                 '</td>'; 
         } else {
             $result .= '<td align="center" valign="bottom">&nbsp;&nbsp;'.
-                '<img src="/adm/lonMisc/chat.gif"> Discussions</td><td align="center" valign="bottom">'.
-                '&nbsp;&nbsp;<img src="/adm/lonMisc/feedback.gif"> New message (click to open)'.
+                '<img src="'.$location.'/chat.gif"> '.&mt('Discussions').'</td><td align="center" valign="bottom">'.
+                '&nbsp;&nbsp;<img src="'.$location.'/feedback.gif"> '.&mt('New message (click to open)').
                 '</td>'; 
         }
 
         $result .= '</tr></table>';
     }
 
-    if ($printCloseAll) {
+    if ($printCloseAll && !$args->{'resource_no_folder_link'}) {
+	my ($link,$text);
         if ($condition) {
-            $result.="<a href=\"navmaps?condition=0&filter=&$queryString" .
-                "&hereType=$hereType&here=" . Apache::lonnet::escape($here) .
-                "\">Close All Folders</a>";
+	    $link='"navmaps?condition=0&filter=&'.$queryString.
+		'&here='.&Apache::lonnet::escape($here).'"';
+	    $text='Close all folders';
         } else {
-            $result.="<a href=\"navmaps?condition=1&filter=&$queryString" .
-                "&hereType=$hereType&here=" . Apache::lonnet::escape($here) . 
-                "\">Open All Folders</a>";
+	    $link='"navmaps?condition=1&filter=&'.$queryString.
+		'&here='.&Apache::lonnet::escape($here).'"';
+	    $text='Open all folders';
+        }
+	if ($args->{'caller'} eq 'navmapsdisplay') {
+	    &add_linkitem($args->{'linkitems'},'changefolder',
+			  'location.href='.$link,$text);
+	} else {
+	    $result.='<a href='.$link.'>'.&mt($text).'</a>';
+	}
+        $result .= "\n";
+    }
+
+    # Check for any unread discussions in all resources.
+    if ($args->{'caller'} eq 'navmapsdisplay') {
+	&add_linkitem($args->{'linkitems'},'clearbubbles',
+		      'document.clearbubbles.submit()',
+		      'Mark all posts read');
+	my $time=time;
+	$result .= (<<END);
+    <form name="clearbubbles" method="post" action="/adm/feedback">
+	<input type="hidden" name="navurl" value="$ENV{'QUERY_STRING'}" />
+	<input type="hidden" name="navtime" value="$time" />
+END
+        if ($args->{'sort'} eq 'discussion') { 
+	    my $totdisc = 0;
+	    my $haveDisc = '';
+	    my @allres=$navmap->retrieveResources();
+	    foreach my $resource (@allres) {
+		if ($resource->hasDiscussion()) {
+		    $haveDisc .= $resource->wrap_symb().':';
+		    $totdisc ++;
+		}
+	    }
+	    if ($totdisc > 0) {
+		$haveDisc =~ s/:$//;
+		$result .= (<<END);
+	<input type="hidden" name="navmaps" value="$haveDisc" />
+    </form>
+END
+            }
+	}
+	$result.='</form>';
+    }
+
+    if ($args->{'caller'} eq 'navmapsdisplay') {
+        $result .= '<table><tr><td>'.
+                   &Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT').'</td>';
+	if ($env{'environment.remotenavmap'} ne 'on') {
+	    $result .= '<td>&nbsp;</td>'; 
+        } else {
+	    $result .= '</tr><tr>'; 
         }
-        $result .= "<br /><br />\n";
-    }    
+	$result.=&show_linkitems($args->{'linkitems'});
+        if ($args->{'sort_html'}) {
+	    if ($env{'environment.remotenavmap'} ne 'on') {
+		$result.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>'.
+		    '<td align="right">'.$args->{'sort_html'}.'</td></tr>';
+	    } else {
+		$result.='</tr><tr><td align="left"><br />'.
+		    $args->{'sort_html'}.'</td></tr>';
+	    }
+	}
+        $result .= '</table>';
+    } elsif ($args->{'sort_html'}) { 
+        $result.=$args->{'sort_html'}; 
+    }
 
+    $result .= "<br />\n";
     if ($r) {
         $r->print($result);
         $r->rflush();
@@ -1037,25 +1701,111 @@ sub render {
     $args->{'indentLevel'} = 0;
     $args->{'isNewBranch'} = 0;
     $args->{'condensed'} = 0;    
-    $args->{'indentString'} = setDefault($args->{'indentString'}, "<img src='/adm/lonIcons/whitespace1.gif' width='25' height='1' alt='' border='0' />");
+    my $location=
+	&Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace1.gif");
+    $args->{'indentString'} = setDefault($args->{'indentString'}, "<img src='$location' width='25' height='1' alt='&nbsp;&nbsp;' border='0' />");
     $args->{'displayedHereMarker'} = 0;
 
+    # If we're suppressing empty sequences, look for them here. Use DFS for speed,
+    # since structure actually doesn't matter, except what map has what resources.
+    if ($args->{'suppressEmptySequences'}) {
+        my $dfsit = Apache::lonnavmaps::DFSiterator->new($navmap,
+                                                         $it->{FIRST_RESOURCE},
+                                                         $it->{FINISH_RESOURCE},
+                                                         {}, undef, 1);
+        my $depth = 0;
+        $dfsit->next();
+        my $curRes = $dfsit->next();
+        while ($depth > -1) {
+            if ($curRes == $dfsit->BEGIN_MAP()) { $depth++; }
+            if ($curRes == $dfsit->END_MAP()) { $depth--; }
+
+            if (ref($curRes)) { 
+                # Parallel pre-processing: Do sequences have non-filtered-out children?
+                if ($curRes->is_map()) {
+                    $curRes->{DATA}->{HAS_VISIBLE_CHILDREN} = 0;
+                    # Sequences themselves do not count as visible children,
+                    # unless those sequences also have visible children.
+                    # This means if a sequence appears, there's a "promise"
+                    # that there's something under it if you open it, somewhere.
+                } else {
+                    # Not a sequence: if it's filtered, ignore it, otherwise
+                    # rise up the stack and mark the sequences as having children
+                    if (&$filterFunc($curRes)) {
+                        for my $sequence (@{$dfsit->getStack()}) {
+                            $sequence->{DATA}->{HAS_VISIBLE_CHILDREN} = 1;
+                        }
+                    }
+                }
+            }
+        } continue {
+            $curRes = $dfsit->next();
+        }
+    }
+
     my $displayedJumpMarker = 0;
     # Set up iteration.
-    my $depth = 1;
-    $it->next(); # discard initial BEGIN_MAP
-    my $curRes = $it->next();
     my $now = time();
     my $in24Hours = $now + 24 * 60 * 60;
     my $rownum = 0;
 
     # export "here" marker information
     $args->{'here'} = $here;
-    $args->{'hereType'} = $hereType;
 
-    while ($depth > 0) {
-        if ($curRes == $it->BEGIN_MAP()) { $depth++; }
-        if ($curRes == $it->END_MAP()) { $depth--; }
+    $args->{'indentLevel'} = -1; # first BEGIN_MAP takes this to 0
+    my @resources;
+    my $code='';# sub { !(shift->is_map();) };
+    if ($args->{'sort'} eq 'title') {
+        my $oldFilterFunc = $filterFunc;
+	my $filterFunc= 
+	    sub {
+		my ($res)=@_;
+		if ($res->is_map()) { return 0;}
+		return &$oldFilterFunc($res);
+	    };
+	@resources=$navmap->retrieveResources(undef,$filterFunc);
+	@resources= sort { &cmp_title($a,$b) } @resources;
+    } elsif ($args->{'sort'} eq 'duedate') {
+	my $oldFilterFunc = $filterFunc;
+	my $filterFunc= 
+	    sub {
+		my ($res)=@_;
+		if (!$res->is_problem()) { return 0;}
+		return &$oldFilterFunc($res);
+	    };
+	@resources=$navmap->retrieveResources(undef,$filterFunc);
+	@resources= sort {
+	    if ($a->duedate ne $b->duedate) {
+	        return $a->duedate cmp $b->duedate;
+	    }
+	    my $value=&cmp_title($a,$b);
+	    return $value;
+	} @resources;
+    } elsif ($args->{'sort'} eq 'discussion') {
+	my $oldFilterFunc = $filterFunc;
+	my $filterFunc= 
+	    sub {
+		my ($res)=@_;
+		if (!$res->hasDiscussion() &&
+		    !$res->getFeedback() &&
+		    !$res->getErrors()) { return 0;}
+		return &$oldFilterFunc($res);
+	    };
+	@resources=$navmap->retrieveResources(undef,$filterFunc);
+	@resources= sort { &cmp_title($a,$b) } @resources;
+    } else {
+	#unknow sort mechanism or default
+	undef($args->{'sort'});
+    }
+
+
+    while (1) {
+	if ($args->{'sort'}) {
+	    $curRes = shift(@resources);
+	} else {
+	    $curRes = $it->next($closeAllPages);
+	}
+	if (!$curRes) { last; }
 
         # Maintain indentation level.
         if ($curRes == $it->BEGIN_MAP() ||
@@ -1073,25 +1823,28 @@ sub render {
 
         # If this isn't an actual resource, continue on
         if (!ref($curRes)) {
-            $curRes = $it->next();
             next;
         }
 
-        $args->{'counter'}++;
-
         # If this has been filtered out, continue on
         if (!(&$filterFunc($curRes))) {
-            $curRes = $it->next();
             $args->{'isNewBranch'} = 0; # Don't falsely remember this
             next;
         } 
 
+        # If this is an empty sequence and we're filtering them, continue on
+        if ($curRes->is_map() && $args->{'suppressEmptySequences'} &&
+            !$curRes->{DATA}->{HAS_VISIBLE_CHILDREN}) {
+            next;
+        }
+
         # If we're suppressing navmaps and this is a navmap, continue on
         if ($suppressNavmap && $curRes->src() =~ /^\/adm\/navmaps/) {
-            $curRes = $it->next();
             next;
         }
 
+        $args->{'counter'}++;
+
         # Does it have multiple parts?
         $args->{'multipart'} = 0;
         $args->{'condensed'} = 0;
@@ -1100,22 +1853,18 @@ sub render {
         # Decide what parts to show.
         if ($curRes->is_problem() && $showParts) {
             @parts = @{$curRes->parts()};
-            $args->{'multipart'} = scalar(@parts) > 1;
+            $args->{'multipart'} = $curRes->multipart();
             
             if ($condenseParts) { # do the condensation
-                if (!$curRes->opendate("0")) {
-                    @parts = ("0");
-                    $args->{'condensed'} = 1;
-                }
                 if (!$args->{'condensed'}) {
                     # Decide whether to condense based on similarity
-                    my $status = $curRes->status($parts[1]);
-                    my $due = $curRes->duedate($parts[1]);
-                    my $open = $curRes->opendate($parts[1]);
+                    my $status = $curRes->status($parts[0]);
+                    my $due = $curRes->duedate($parts[0]);
+                    my $open = $curRes->opendate($parts[0]);
                     my $statusAllSame = 1;
                     my $dueAllSame = 1;
                     my $openAllSame = 1;
-                    for (my $i = 2; $i < scalar(@parts); $i++) {
+                    for (my $i = 1; $i < scalar(@parts); $i++) {
                         if ($curRes->status($parts[$i]) != $status){
                             $statusAllSame = 0;
                         }
@@ -1136,31 +1885,46 @@ sub render {
                     if (($statusAllSame && defined($condenseStatuses{$status})) ||
                         ($dueAllSame && $status == $curRes->OPEN && $statusAllSame)||
                         ($openAllSame && $status == $curRes->OPEN_LATER && $statusAllSame) ){
-                        @parts = ($parts[1]);
+                        @parts = ($parts[0]);
                         $args->{'condensed'} = 1;
                     }
-                    
                 }
+		# Multipart problem with one part: always "condense" (happens
+		#  to match the desirable behavior)
+		if ($curRes->countParts() == 1) {
+		    @parts = ($parts[0]);
+		    $args->{'condensed'} = 1;
+		}
             }
+        } 
             
-        } else {
-            # Not showing parts
-            @parts = ("0"); # show main part only
-        }
-
         # If the multipart problem was condensed, "forget" it was multipart
         if (scalar(@parts) == 1) {
             $args->{'multipart'} = 0;
+        } else {
+            # Add part 0 so we display it correctly.
+            unshift @parts, '0';
         }
-
-        # In the event of a network error, display one part.
-        # If this is a single part, we can at least show the correct
-        # status, but if it's multipart, we're lost, since we can't
-        # retreive the metadata to count the parts
-        if ($curRes->{RESOURCE_ERROR}) {
-            @parts = ("0");
-        }
-
+	
+	{
+	    my ($src,$symb,$anchor,$stack);
+	    if ($args->{'sort'}) {
+		my $it = $navmap->getIterator(undef, undef, undef, 1);
+		while ( my $res=$it->next()) {
+		    if (ref($res) &&
+			$res->symb() eq  $curRes->symb()) { last; }
+		}
+		$stack=$it->getStack();
+	    } else {
+		$stack=$it->getStack();
+	    }
+	    ($src,$symb,$anchor)=getLinkForResource($stack);
+	    if (defined($anchor)) { $anchor='#'.$anchor; }
+	    my $srcHasQuestion = $src =~ /\?/;
+	    $args->{"resourceLink"} = $src.
+		($srcHasQuestion?'&':'?') .
+		'symb=' . &Apache::lonnet::escape($symb).$anchor;
+	}
         # Now, we've decided what parts to show. Loop through them and
         # show them.
         foreach my $part (@parts) {
@@ -1171,14 +1935,7 @@ sub render {
 
             # Set up some data about the parts that the cols might want
             my $filter = $it->{FILTER};
-            my $stack = $it->getStack();
-            my $src = getLinkForResource($stack);
-            
-            my $srcHasQuestion = $src =~ /\?/;
-            $args->{"resourceLink"} = $src.
-                ($srcHasQuestion?'&':'?') .
-                'symb=' . &Apache::lonnet::escape($curRes->symb());
-            
+
             # Now, display each column.
             foreach my $col (@$cols) {
                 my $colHTML = '';
@@ -1209,13 +1966,31 @@ sub render {
             $result = "";
             $r->rflush();
         }
-        
-        $curRes = $it->next();
+    } continue {
+	if ($r) {
+	    # If we have the connection, make sure the user is still connected
+	    my $c = $r->connection;
+	    if ($c->aborted()) {
+		# Who cares what we do, nobody will see it anyhow.
+		return '';
+	    }
+	}
     }
     
     # Print out the part that jumps to #curloc if it exists
+    # delay needed because the browser is processing the jump before
+    # it finishes rendering, so it goes to the wrong place!
+    # onload might be better, but this routine has no access to that.
+    # On mozilla, the 0-millisecond timeout seems to prevent this;
+    # it's quite likely this might fix other browsers, too, and 
+    # certainly won't hurt anything.
     if ($displayedJumpMarker) {
-        $result .= "<script>location += \"#curloc\";</script>\n";
+        $result .= "
+<script>
+if (location.href.indexOf('#curloc')==-1) {
+    setTimeout(\"location += '#curloc';\", 0)
+}
+</script>";
     }
 
     $result .= "</table>";
@@ -1226,8 +2001,46 @@ sub render {
         $r->rflush();
     }
         
-    if ($mustCloseNavMap) { $navmap->untieHashes(); } 
+    return $result;
+}
+
+sub add_linkitem {
+    my ($linkitems,$name,$cmd,$text)=@_;
+    $$linkitems{$name}{'cmd'}=$cmd;
+    $$linkitems{$name}{'text'}=&mt($text);
+}
 
+sub show_linkitems {
+    my ($linkitems)=@_;
+    my @linkorder = ("blank","launchnav","closenav","firsthomework",
+		     "everything","uncompleted","changefolder","clearbubbles");
+    
+    my $result .= (<<ENDBLOCK);
+              <td align="left">
+<script type="text/javascript">
+    function changeNavDisplay () {
+	var navchoice = document.linkitems.toplink[document.linkitems.toplink.selectedIndex].value;
+ENDBLOCK
+    foreach my $link (@linkorder) {
+	$result.= "if (navchoice == '$link') {".
+	    $linkitems->{$link}{'cmd'}."}\n";
+    }
+    $result.='}
+              </script>
+                   <form name="linkitems" method="post">
+                       <nobr><select name="toplink">'."\n";
+    foreach my $link (@linkorder) {
+	if (defined($linkitems->{$link})) {
+	    if ($linkitems->{$link}{'text'} ne '') {
+		$result .= ' <option value="'.$link.'">'.
+		    $linkitems->{$link}{'text'}."</option>\n";
+	    }
+	}
+    }
+    $result .= '</select>&nbsp;<input type="button" name="chgnav"
+                   value="Go" onClick="javascript:changeNavDisplay()" />
+                </nobr></form></td>'."\n";
+	
     return $result;
 }
 
@@ -1237,28 +2050,71 @@ package Apache::lonnavmaps::navmap;
 
 =pod
 
-lonnavmaps provides functions and objects for dealing with the compiled course hashes generated when a user enters the course, the Apache handler for the "Navigation Map" button, and a flexible prepared renderer for navigation maps that are easy to use anywhere.
+=head1 Object: Apache::lonnavmaps::navmap
+
+=head2 Overview
 
-=head1 navmap object: Encapsulating the compiled nav map
+The navmap object's job is to provide access to the resources
+in the course as Apache::lonnavmaps::resource objects, and to
+query and manage the relationship between those resource objects.
 
-navmap is an object that encapsulates a compiled course map and provides a reasonable interface to it.
+Generally, you'll use the navmap object in one of three basic ways.
+In order of increasing complexity and power:
 
-Most notably it provides a way to navigate the map sensibly and a flexible iterator that makes it easy to write various renderers based on nav maps.
+=over 4
 
-You must obtain resource objects through the navmap object.
+=item * C<$navmap-E<gt>getByX>, where X is B<Id>, B<Symb> or B<MapPc> and getResourceByUrl. This provides
+    various ways to obtain resource objects, based on various identifiers.
+    Use this when you want to request information about one object or 
+    a handful of resources you already know the identities of, from some
+    other source. For more about Ids, Symbs, and MapPcs, see the
+    Resource documentation. Note that Url should be a B<last resort>,
+    not your first choice; it only really works when there is only one
+    instance of the resource in the course, which only applies to
+    maps, and even that may change in the future (see the B<getResourceByUrl>
+    documentation for more details.)
+
+=item * C<my @resources = $navmap-E<gt>retrieveResources(args)>. This
+    retrieves resources matching some criterion and returns them
+    in a flat array, with no structure information. Use this when
+    you are manipulating a series of resources, based on what map
+    the are in, but do not care about branching, or exactly how
+    the maps and resources are related. This is the most common case.
+
+=item * C<$it = $navmap-E<gt>getIterator(args)>. This allows you traverse
+    the course's navmap in various ways without writing the traversal
+    code yourself. See iterator documentation below. Use this when
+    you need to know absolutely everything about the course, including
+    branches and the precise relationship between maps and resources.
+
+=back
+
+=head2 Creation And Destruction
+
+To create a navmap object, use the following function:
+
+=over 4
+
+=item * B<Apache::lonnavmaps::navmap-E<gt>new>():
+
+Creates a new navmap object. Returns the navmap object if this is
+successful, or B<undef> if not.
+
+=back
 
 =head2 Methods
 
 =over 4
 
-=item * B<new>(navHashFile, parmHashFile, genCourseAndUserOptions, genMailDiscussStatus): Binds a new navmap object to the compiled nav map hash and parm hash given as filenames. genCourseAndUserOptions is a flag saying whether the course options and user options hash should be generated. This is for when you are using the parameters of the resources that require them; see documentation in resource object documentation. genMailDiscussStatus causes the nav map to retreive information about the email and discussion status of resources. Returns the navmap object if this is successful, or B<undef> if not. You must check for undef; errors will occur when you try to use the other methods otherwise.
+=item * B<getIterator>(first, finish, filter, condition):
 
-=item * B<getIterator>(first, finish, filter, condition): See iterator documentation below.
+See iterator documentation below.
 
 =cut
 
 use strict;
 use GDBM_File;
+use Apache::lonnet;
 
 sub new {
     # magic invocation to create a class instance
@@ -1266,11 +2122,6 @@ sub new {
     my $class = ref($proto) || $proto;
     my $self = {};
 
-    $self->{NAV_HASH_FILE} = shift;
-    $self->{PARM_HASH_FILE} = shift;
-    $self->{GENERATE_COURSE_USER_OPT} = shift;
-    $self->{GENERATE_EMAIL_DISCUSS_STATUS} = shift;
-
     # Resource cache stores navmap resources as we reference them. We generate
     # them on-demand so we don't pay for creating resources unless we use them.
     $self->{RESOURCE_CACHE} = {};
@@ -1281,139 +2132,159 @@ sub new {
 
     # tie the nav hash
 
-    if (!(tie(%navmaphash, 'GDBM_File', $self->{NAV_HASH_FILE},
+    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', $self->{PARM_HASH_FILE},
+    if (!(tie(%parmhash, 'GDBM_File', "${courseFn}_parms.db",
               &GDBM_READER(), 0640)))
     {
-        untie $self->{PARM_HASH};
+        untie %{$self->{PARM_HASH}};
         return undef;
     }
 
-    $self->{HASH_TIED} = 1;
     $self->{NAV_HASH} = \%navmaphash;
     $self->{PARM_HASH} = \%parmhash;
-    $self->{INITED} = 0;
+    $self->{PARM_CACHE} = {};
 
     bless($self);
         
     return $self;
 }
 
-sub init {
+sub generate_course_user_opt {
     my $self = shift;
-    if ($self->{INITED}) { return; }
+    if ($self->{COURSE_USER_OPT_GENERATED}) { return; }
 
-    # If the course opt hash and the user opt hash should be generated,
-    # generate them
-    if ($self->{GENERATE_COURSE_USER_OPT}) {
-        my $uname=$ENV{'user.name'};
-        my $udom=$ENV{'user.domain'};
-        my $uhome=$ENV{'user.home'};
-        my $cid=$ENV{'request.course.id'};
-        my $chome=$ENV{'course.'.$cid.'.home'};
-        my ($cdom,$cnum)=split(/\_/,$cid);
-        
-        my $userprefix=$uname.'_'.$udom.'_';
-        
-        my %courserdatas; my %useropt; my %courseopt; my %userrdatas;
-        unless ($uhome eq 'no_host') { 
+    my $uname=$env{'user.name'};
+    my $udom=$env{'user.domain'};
+    my $cid=$env{'request.course.id'};
+    my $cdom=$env{'course.'.$cid.'.domain'};
+    my $cnum=$env{'course.'.$cid.'.num'};
+    
 # ------------------------------------------------- Get coursedata (if present)
-            unless ((time-$courserdatas{$cid.'.last_cache'})<240) {
-                my $reply=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.
-                                                 ':resourcedata',$chome);
-                if ($reply!~/^error\:/) {
-                    $courserdatas{$cid}=$reply;
-                    $courserdatas{$cid.'.last_cache'}=time;
-                }
-                # check to see if network failed
-                elsif ( $reply=~/no.such.host/i || $reply=~/con.*lost/i )
-                {
-                    $self->{NETWORK_FAILURE} = 1;
-                }
-            }
-            foreach (split(/\&/,$courserdatas{$cid})) {
-                my ($name,$value)=split(/\=/,$_);
-                $courseopt{$userprefix.&Apache::lonnet::unescape($name)}=
-                    &Apache::lonnet::unescape($value);
-            }
+    my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
+    # Check for network failure
+    if (!ref($courseopt)) {
+	if ( $courseopt =~ /no.such.host/i || $courseopt =~ /con_lost/i) {
+	    $self->{NETWORK_FAILURE} = 1;
+	}
+	undef($courseopt);
+    }
+
 # --------------------------------------------------- Get userdata (if present)
-            unless ((time-$userrdatas{$uname.'___'.$udom.'.last_cache'})<240) {
-                my $reply=&Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome);
-                if ($reply!~/^error\:/) {
-                    $userrdatas{$uname.'___'.$udom}=$reply;
-                    $userrdatas{$uname.'___'.$udom.'.last_cache'}=time;
-                }
-                # check to see if network failed
-                elsif ( $reply=~/no.such.host/i || $reply=~/con.*lost/i )
-                {
-                    $self->{NETWORK_FAILURE} = 1;
-                }
-            }
-            foreach (split(/\&/,$userrdatas{$uname.'___'.$udom})) {
-                my ($name,$value)=split(/\=/,$_);
-                $useropt{$userprefix.&Apache::lonnet::unescape($name)}=
-                    &Apache::lonnet::unescape($value);
-            }
-            $self->{COURSE_OPT} = \%courseopt;
-            $self->{USER_OPT} = \%useropt;
-        }
-    }   
+	
+    my $useropt=&Apache::lonnet::get_userresdata($uname,$udom);
+    # Check for network failure
+    if (!ref($useropt)) {
+	if ( $useropt =~ /no.such.host/i || $useropt =~ /con_lost/i) {
+	    $self->{NETWORK_FAILURE} = 1;
+	}
+	undef($useropt);
+    }
 
-    if ($self->{GENERATE_EMAIL_DISCUSS_STATUS}) {
-        my $cid=$ENV{'request.course.id'};
-        my ($cdom,$cnum)=split(/\_/,$cid);
-        
-        my %emailstatus = &Apache::lonnet::dump('email_status');
-        my $logoutTime = $emailstatus{'logout'};
-        my $courseLeaveTime = $emailstatus{'logout_'.$ENV{'request.course.id'}};
-        $self->{LAST_CHECK} = ($courseLeaveTime < $logoutTime ?
-                               $courseLeaveTime : $logoutTime);
-        my %discussiontime = &Apache::lonnet::dump('discussiontimes', 
-                                                   $cdom, $cnum);
-        my %feedback=();
-        my %error=();
-        my $keys = &Apache::lonnet::reply('keys:'.
-                                          $ENV{'user.domain'}.':'.
-                                          $ENV{'user.name'}.':nohist_email',
-                                          $ENV{'user.home'});
-
-        foreach my $msgid (split(/\&/, $keys)) {
-            $msgid=&Apache::lonnet::unescape($msgid);
-            my $plain=&Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid));
-            if ($plain=~/(Error|Feedback) \[([^\]]+)\]/) {
-                my ($what,$url)=($1,$2);
-                my %status=
-                    &Apache::lonnet::get('email_status',[$msgid]);
-                if ($status{$msgid}=~/^error\:/) { 
-                    $status{$msgid}=''; 
-                }
-                
-                if (($status{$msgid} eq 'new') || 
-                    (!$status{$msgid})) { 
-                    if ($what eq 'Error') {
-                        $error{$url}.=','.$msgid; 
-                    } else {
-                        $feedback{$url}.=','.$msgid;
-                    }
-                }
-            }
-        }
-        
-        $self->{FEEDBACK} = \%feedback;
-        $self->{ERROR_MSG} = \%error; # what is this? JB
-        $self->{DISCUSSION_TIME} = \%discussiontime;
-        $self->{EMAIL_STATUS} = \%emailstatus;
-        
-    }    
+    $self->{COURSE_OPT} = $courseopt;
+    $self->{USER_OPT} = $useropt;
 
-    $self->{PARM_CACHE} = {};
-    $self->{INITED} = 1;
+    $self->{COURSE_USER_OPT_GENERATED} = 1;
+    
+    return;
+}
+
+sub generate_email_discuss_status {
+    my $self = shift;
+    my $symb = shift;
+    if ($self->{EMAIL_DISCUSS_GENERATED}) { return; }
+
+    my $cid=$env{'request.course.id'};
+    my $cdom=$env{'course.'.$cid.'.domain'};
+    my $cnum=$env{'course.'.$cid.'.num'};
+    
+    my %emailstatus = &Apache::lonnet::dump('email_status');
+    my $logoutTime = $emailstatus{'logout'};
+    my $courseLeaveTime = $emailstatus{'logout_'.$env{'request.course.id'}};
+    $self->{LAST_CHECK} = (($courseLeaveTime > $logoutTime) ?
+			   $courseLeaveTime : $logoutTime);
+    my %discussiontime = &Apache::lonnet::dump('discussiontimes', 
+					       $cdom, $cnum);
+    my %lastread = &Apache::lonnet::dump('nohist_'.$cid.'_discuss',
+                                        $env{'user.domain'},$env{'user.name'},'lastread');
+    my %lastreadtime = ();
+    foreach (keys %lastread) {
+        my $key = $_;
+        $key =~ s/_lastread$//;
+        $lastreadtime{$key} = $lastread{$_};
+    }
+
+    my %feedback=();
+    my %error=();
+    my @keys = &Apache::lonnet::getkeys('nohist_email',$env{'user.domain'},
+					$env{'user.name'});
+    
+    foreach my $msgid (@keys) {
+	if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
+	    my $plain=
+		&Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid));
+	    if ($plain=~/ \[([^\]]+)\]\:/) {
+		my $url=$1;
+		if ($plain=~/\:Error \[/) {
+		    $error{$url}.=','.$msgid; 
+		} else {
+		    $feedback{$url}.=','.$msgid;
+		}
+	    }
+	}
+    }
+    
+    #url's of resources that have feedbacks
+    $self->{FEEDBACK} = \%feedback;
+    #or errors
+    $self->{ERROR_MSG} = \%error;
+    $self->{DISCUSSION_TIME} = \%discussiontime;
+    $self->{EMAIL_STATUS} = \%emailstatus;
+    $self->{LAST_READ} = \%lastreadtime;
+    
+    $self->{EMAIL_DISCUSS_GENERATED} = 1;
+}
+
+sub get_user_data {
+    my $self = shift;
+    if ($self->{RETRIEVED_USER_DATA}) { return; }
+
+    # Retrieve performance data on problems
+    my %student_data = Apache::lonnet::currentdump($env{'request.course.id'},
+						   $env{'user.domain'},
+						   $env{'user.name'});
+    $self->{STUDENT_DATA} = \%student_data;
+
+    $self->{RETRIEVED_USER_DATA} = 1;
 }
 
+sub get_discussion_data {
+    my $self = shift;
+    if ($self->{RETRIEVED_DISCUSSION_DATA}) {
+	return $self->{DISCUSSION_DATA};
+    }
+
+    $self->generate_email_discuss_status();    
+
+    my $cid=$env{'request.course.id'};
+    my $cdom=$env{'course.'.$cid.'.domain'};
+    my $cnum=$env{'course.'.$cid.'.num'};
+    # Retrieve discussion data for resources in course
+    my %discussion_data = &Apache::lonnet::dumpstore($cid,$cdom,$cnum);
+
+
+    $self->{DISCUSSION_DATA} = \%discussion_data;
+    $self->{RETRIEVED_DISCUSSION_DATA} = 1;
+    return $self->{DISCUSSION_DATA};
+}
+
+
 # Internal function: Takes a key to look up in the nav hash and implements internal
 # memory caching of that key.
 sub navhash {
@@ -1421,10 +2292,19 @@ sub navhash {
     return $self->{NAV_HASH}->{$key};
 }
 
+=pod
+
+=item * B<courseMapDefined>(): Returns true if the course map is defined, 
+    false otherwise. Undefined course maps indicate an error somewhere in
+    LON-CAPA, and you will not be able to proceed with using the navmap.
+    See the B<NAV> screen for an example of using this.
+
+=cut
+
 # Checks to see if coursemap is defined, matching test in old lonnavmaps
 sub courseMapDefined {
     my $self = shift;
-    my $uri = &Apache::lonnet::clutter($ENV{'request.course.uri'});
+    my $uri = &Apache::lonnet::clutter($env{'request.course.uri'});
 
     my $firstres = $self->navhash("map_start_$uri");
     my $lastres = $self->navhash("map_finish_$uri");
@@ -1434,43 +2314,119 @@ sub courseMapDefined {
 sub getIterator {
     my $self = shift;
     my $iterator = Apache::lonnavmaps::iterator->new($self, shift, shift,
-                                                     shift, undef, shift);
+                                                     shift, undef, shift,
+						     shift, shift);
     return $iterator;
 }
 
-# unties the hash when done
-sub untieHashes {
+# Private method: Does the given resource (as a symb string) have
+# current discussion? Returns 0 if chat/mail data not extracted.
+sub hasDiscussion {
+    my $self = shift;
+    my $symb = shift;
+    $self->generate_email_discuss_status();
+
+    if (!defined($self->{DISCUSSION_TIME})) { return 0; }
+
+    #return defined($self->{DISCUSSION_TIME}->{$symb});
+
+    # backward compatibility (bulletin boards used to be 'wrapped')
+    my $ressymb = $self->wrap_symb($symb);
+    if ( defined ( $self->{LAST_READ}->{$ressymb} ) ) {
+        return $self->{DISCUSSION_TIME}->{$ressymb} > $self->{LAST_READ}->{$ressymb};
+    } else {
+#        return $self->{DISCUSSION_TIME}->{$ressymb} >  $self->{LAST_CHECK}; # v.1.1 behavior 
+        return $self->{DISCUSSION_TIME}->{$ressymb} >  0; # in 1.2 will display speech bubble icons for all items with posts until marked as read (even if read in v 1.1).
+    }
+}
+
+sub last_post_time {
     my $self = shift;
-    untie %{$self->{NAV_HASH}} if ($self->{HASH_TIED});
-    untie %{$self->{PARM_HASH}} if ($self->{HASH_TIED});
-    $self->{HASH_TIED} = 0;
+    my $symb = shift;
+    my $ressymb = $self->wrap_symb($symb);
+    return $self->{DISCUSSION_TIME}->{$ressymb};
 }
 
-# when the object is destroyed, be sure to untie all the hashes we tied.
-sub DESTROY {
+sub unread_discussion {
     my $self = shift;
-    $self->untieHashes();
+    my $symb = shift;
+
+    $self->get_discussion_data();
+
+    my $ressymb = $self->wrap_symb($symb);
+    # keys used to store bulletinboard postings use 'unwrapped' symb. 
+    my $discsymb = $self->unwrap_symb($ressymb);
+    my $version = $self->{DISCUSSION_DATA}{'version:'.$discsymb};
+    if (!$version) { return; }
+
+    my $prevread = $self->{LAST_READ}{$ressymb};
+
+    my $unreadcount = 0;
+    my $hiddenflag = 0;
+    my $deletedflag = 0;
+    my ($hidden,$deleted);
+
+    my %subjects;
+
+    for (my $id=$version; $id>0; $id--) {
+	my $vkeys=$self->{DISCUSSION_DATA}{$id.':keys:'.$discsymb};
+	my @keys=split(/:/,$vkeys);
+	if (grep(/^hidden$/ ,@keys)) {
+	    if (!$hiddenflag) {
+		$hidden = $self->{DISCUSSION_DATA}{$id.':'.$discsymb.':hidden'};
+		$hiddenflag = 1;
+	    }
+	} elsif (grep(/^deleted$/,@keys)) {
+	    if (!$deletedflag) {
+		$deleted = $self->{DISCUSSION_DATA}{$id.':'.$discsymb.':deleted'};
+		$deletedflag = 1;
+	    }
+	} else {
+	    if (($hidden !~/\.$id\./) && ($deleted !~/\.$id\./)
+		&& $prevread < $self->{DISCUSSION_DATA}{$id.':'.$discsymb.':timestamp'}) {
+		    $unreadcount++;
+		    $subjects{$unreadcount}=
+			$id.': '.$self->{DISCUSSION_DATA}{$id.':'.$discsymb.':subject'};
+		}
+	}
+    }
+    if (wantarray) {
+	return ($unreadcount,\%subjects);
+    }
+    return $unreadcount
 }
 
-# Private method: Does the given resource (as a symb string) have
-# current discussion? Returns 0 if chat/mail data not extracted.
-sub hasDiscussion {
+sub wrap_symb {
     my $self = shift;
     my $symb = shift;
-    if (!defined($self->{DISCUSSION_TIME})) { return 0; }
+    if ($symb =~ m-___(adm/[^/]+/[^/]+/)(\d+)(/bulletinboard)$-) {
+        unless ($symb =~ m|adm/wrapper/adm|) {
+            $symb = 'bulletin___'.$2.'___adm/wrapper/'.$1.$2.$3;
+        }
+    }
+    return $symb;
+}
 
-    #return defined($self->{DISCUSSION_TIME}->{$symb});
-    return $self->{DISCUSSION_TIME}->{$symb} >
-           $self->{LAST_CHECK};
+sub unwrap_symb {
+    my $self = shift;
+    my $ressymb = shift;
+    my $discsymb = $ressymb;
+    if ($ressymb =~ m-^(bulletin___\d+___)adm/wrapper/(adm/[^/]+/[^/]+/\d+/bulletinboard)$-) {
+         $discsymb = $1.$2;
+    }
+    return $discsymb;
 }
 
 # Private method: Does the given resource (as a symb string) have
 # current feedback? Returns the string in the feedback hash, which
 # will be false if it does not exist.
+
 sub getFeedback { 
     my $self = shift;
     my $symb = shift;
 
+    $self->generate_email_discuss_status();
+
     if (!defined($self->{FEEDBACK})) { return ""; }
     
     return $self->{FEEDBACK}->{$symb};
@@ -1480,21 +2436,37 @@ sub getFeedback {
 sub getErrors { 
     my $self = shift;
     my $src = shift;
-    
+
+    $self->generate_email_discuss_status();
+
     if (!defined($self->{ERROR_MSG})) { return ""; }
     return $self->{ERROR_MSG}->{$src};
 }
 
 =pod
 
-=item * B<getById>(id): Based on the ID of the resource (1.1, 3.2, etc.), get a resource object for that resource. This method, or other methods that use it (as in the resource object) is the only proper way to obtain a resource object.
+=item * B<getById>(id):
+
+Based on the ID of the resource (1.1, 3.2, etc.), get a resource
+object for that resource. This method, or other methods that use it
+(as in the resource object) is the only proper way to obtain a
+resource object.
+
+=item * B<getBySymb>(symb):
+
+Based on the symb of the resource, get a resource object for that
+resource. This is one of the proper ways to get a resource object.
+
+=item * B<getMapByMapPc>(map_pc):
+
+Based on the map_pc of the resource, get a resource object for
+the given map. This is one of the proper ways to get a resource object.
 
 =cut
 
 # The strategy here is to cache the resource objects, and only construct them
 # as we use them. The real point is to prevent reading any more from the tied
 # hash then we have to, which should hopefully alleviate speed problems.
-# Caching is just an incidental detail I throw in because it makes sense.
 
 sub getById {
     my $self = shift;
@@ -1511,29 +2483,56 @@ sub getById {
     return "Apache::lonnavmaps::resource"->new($self, $id);
 }
 
+sub getBySymb {
+    my $self = shift;
+    my $symb = shift;
+
+    my ($mapUrl, $id, $filename) = &Apache::lonnet::decode_symb($symb);
+    my $map = $self->getResourceByUrl($mapUrl);
+    my $returnvalue = undef;
+    if (ref($map)) {
+        $returnvalue = $self->getById($map->map_pc() .'.'.$id);
+    }
+    return $returnvalue;
+}
+
+sub getByMapPc {
+    my $self = shift;
+    my $map_pc = shift;
+    my $map_id = $self->{NAV_HASH}->{'map_id_' . $map_pc};
+    $map_id = $self->{NAV_HASH}->{'ids_' . $map_id};
+    return $self->getById($map_id);
+}
+
 =pod
 
-=item * B<firstResource>(): Returns a resource object reference corresponding to the first resource in the navmap.
+=item * B<firstResource>():
+
+Returns a resource object reference corresponding to the first
+resource in the navmap.
 
 =cut
 
 sub firstResource {
     my $self = shift;
     my $firstResource = $self->navhash('map_start_' .
-                     &Apache::lonnet::clutter($ENV{'request.course.uri'}));
+                     &Apache::lonnet::clutter($env{'request.course.uri'}));
     return $self->getById($firstResource);
 }
 
 =pod
 
-=item * B<finishResource>(): Returns a resource object reference corresponding to the last resource in the navmap.
+=item * B<finishResource>():
+
+Returns a resource object reference corresponding to the last resource
+in the navmap.
 
 =cut
 
 sub finishResource {
     my $self = shift;
     my $firstResource = $self->navhash('map_finish_' .
-                     &Apache::lonnet::clutter($ENV{'request.course.uri'}));
+                     &Apache::lonnet::clutter($env{'request.course.uri'}));
     return $self->getById($firstResource);
 }
 
@@ -1555,17 +2554,26 @@ sub parmval {
 
 sub parmval_real {
     my $self = shift;
-    my ($what,$symb) = @_;
+    my ($what,$symb,$recurse) = @_;
+
+    # Make sure the {USER_OPT} and {COURSE_OPT} hashes are populated
+    $self->generate_course_user_opt();
 
-    my $cid=$ENV{'request.course.id'};
-    my $csec=$ENV{'request.course.sec'};
-    my $uname=$ENV{'user.name'};
-    my $udom=$ENV{'user.domain'};
+    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=$env{'user.name'};
+    my $udom=$env{'user.domain'};
 
     unless ($symb) { return ''; }
     my $result='';
 
-    my ($mapname,$id,$fn)=split(/\_\_\_/,$symb);
+    my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb);
 
 # ----------------------------------------------------- Cascading lookup scheme
     my $rwhat=$what;
@@ -1574,7 +2582,11 @@ sub parmval_real {
 
     my $symbparm=$symb.'.'.$what;
     my $mapparm=$mapname.'___(all).'.$what;
-    my $usercourseprefix=$uname.'_'.$udom.'_'.$cid;
+    my $usercourseprefix=$cid;
+
+    my $grplevel=$usercourseprefix.'.['.$cgroup.'].'.$what;
+    my $grplevelr=$usercourseprefix.'.['.$cgroup.'].'.$symbparm;
+    my $grplevelm=$usercourseprefix.'.['.$cgroup.'].'.$mapparm;
 
     my $seclevel= $usercourseprefix.'.['.$csec.'].'.$what;
     my $seclevelr=$usercourseprefix.'.['.$csec.'].'.$symbparm;
@@ -1596,6 +2608,12 @@ sub parmval_real {
     }
 
 # ------------------------------------------------------- second, check course
+    if ($cgroup ne '' and defined($courseopt)) {
+        if (defined($$courseopt{$grplevelr})) { return $$courseopt{$grplevelr}; }
+        if (defined($$courseopt{$grplevelm})) { return $$courseopt{$grplevelm}; }
+        if (defined($$courseopt{$grplevel})) { return $$courseopt{$grplevel}; }
+    }
+
     if ($csec and defined($courseopt)) {
         if (defined($$courseopt{$seclevelr})) { return $$courseopt{$seclevelr}; }
         if (defined($$courseopt{$seclevelm})) { return $$courseopt{$seclevelm}; }
@@ -1604,8 +2622,6 @@ sub parmval_real {
 
     if (defined($courseopt)) {
         if (defined($$courseopt{$courselevelr})) { return $$courseopt{$courselevelr}; }
-        if (defined($$courseopt{$courselevelm})) { return $$courseopt{$courselevelm}; }
-        if (defined($$courseopt{$courselevel})) { return $$courseopt{$courselevel}; }
     }
 
 # ----------------------------------------------------- third, check map parms
@@ -1615,55 +2631,119 @@ sub parmval_real {
 
 # ----------------------------------------------------- fourth , check default
 
-    my $default=&Apache::lonnet::metadata($fn,$rwhat.'.default');
+    my $meta_rwhat=$rwhat;
+    $meta_rwhat=~s/\./_/g;
+    my $default=&Apache::lonnet::metadata($fn,$meta_rwhat);
     if (defined($default)) { return $default}
+    $default=&Apache::lonnet::metadata($fn,'parameter_'.$meta_rwhat);
+    if (defined($default)) { return $default}
+
+# --------------------------------------------------- fifth, check more course
+    if (defined($courseopt)) {
+        if (defined($$courseopt{$courselevelm})) { return $$courseopt{$courselevelm}; }
+        if (defined($$courseopt{$courselevel})) { return $$courseopt{$courselevel}; }
+    }
 
-# --------------------------------------------------- fifth , cascade up parts
+# --------------------------------------------------- sixth , cascade up parts
 
     my ($space,@qualifier)=split(/\./,$rwhat);
     my $qualifier=join('.',@qualifier);
     unless ($space eq '0') {
-        my ($part,$id)=split(/\_/,$space);
-        if ($id) {
-            my $partgeneral=$self->parmval($part.".$qualifier",$symb);
-            if (defined($partgeneral)) { return $partgeneral; }
-        } else {
-            my $resourcegeneral=$self->parmval("0.$qualifier",$symb);
-            if (defined($resourcegeneral)) { return $resourcegeneral; }
-        }
-    }
+	my @parts=split(/_/,$space);
+	my $id=pop(@parts);
+	my $part=join('_',@parts);
+	if ($part eq '') { $part='0'; }
+	my $partgeneral=$self->parmval($part.".$qualifier",$symb,1);
+	if (defined($partgeneral)) { return $partgeneral; }
+    }
+    if ($recurse) { return undef; }
+    my $pack_def=&Apache::lonnet::packages_tab_default($fn,'resource.'.$what);
+    if (defined($pack_def)) { return $pack_def; }
     return '';
 }
 
-=pod 
-
-=item * B<getResourceByUrl>(url): Retrieves a resource object by URL of the resource. If passed a resource object, it will simply return it, so it is safe to use this method in code like "$res = $navmap->getResourceByUrl($res)", if you're not sure if $res is already an object, or just a URL. If the resource appears multiple times in the course, only the first instance will be returned. As a result, this is probably useful only for maps.
-
-=item * B<retrieveResources>(map, filterFunc, recursive, bailout): 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 function that takes a resource object as its one argument and returns true if the resource should be included, or false if it should not be. If recursive is true, the map will be recursively examined, otherwise it will not be. If bailout is true, the function will return as soon as it finds a resource, if false it will finish. By default, the map is the top-level map of the course, filterFunc is a function that always returns 1, recursive is true, bailout is false. The resources will be returned in a list reference 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 many resources match a given description; for this use, if all you want to know is if I<any> resources match the description, the bailout parameter will allow you to avoid potentially expensive enumeration of all matching resources.
-
-=item * B<hasResources>(map, filterFunc, recursive): Convience method for 
-
- scalar(retrieveResources($map, $filterFunc, $recursive, 1)) > 0
+=pod
 
-which will tell whether the map has resources matching the description in the filter function.
+=item * B<getResourceByUrl>(url,multiple):
 
+Retrieves a resource object by URL of the resource, unless the optional
+multiple parameter is included in wahich caes an array of resource 
+objects is returned. If passed a resource object, it will simply return  
+it, so it is safe to use this method in code like
+"$res = $navmap->getResourceByUrl($res)"
+if you're not sure if $res is already an object, or just a URL. If the
+resource appears multiple times in the course, only the first instance 
+will be returned (useful for maps), unless the multiple parameter has
+been included, in which case all instances are returned in an array.
+
+=item * B<retrieveResources>(map, filterFunc, recursive, bailout, showall):
+
+The map is a specification of a map to retreive the resources from,
+either as a url or as an object. The filterFunc is a reference to a
+function that takes a resource object as its one argument and returns
+true if the resource should be included, or false if it should not
+be. If recursive is true, the map will be recursively examined,
+otherwise it will not be. If bailout is true, the function will return
+as soon as it finds a resource, if false it will finish. If showall is
+true it will not hide maps that contain nothing but one other map. By
+default, the map 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
+many resources match a given description; for this use, if all you
+want to know is if I<any> resources match the description, the bailout
+parameter will allow you to avoid potentially expensive enumeration of
+all matching resources.
+
+=item * B<hasResource>(map, filterFunc, recursive, showall):
+
+Convience method for
+
+ scalar(retrieveResources($map, $filterFunc, $recursive, 1, $showall)) > 0
+
+which will tell whether the map has resources matching the description
+in the filter function.
+
+=item * B<usedVersion>(url):
+
+Retrieves version infomation for a url. Returns the version (a number, or 
+the string "mostrecent") for resources which have version information in  
+the big hash.
+    
 =cut
 
+
 sub getResourceByUrl {
     my $self = shift;
     my $resUrl = shift;
+    my $multiple = shift;
 
     if (ref($resUrl)) { return $resUrl; }
 
     $resUrl = &Apache::lonnet::clutter($resUrl);
     my $resId = $self->{NAV_HASH}->{'ids_' . $resUrl};
-    if ($resId =~ /,/) {
-        $resId = (split (/,/, $resId))[0];
-    }
     if (!$resId) { return ''; }
-    return $self->getById($resId);
+    if ($multiple) {
+        my @resources = ();
+        my @resIds = split (/,/, $resId);
+        foreach my $id (@resIds) {
+            my $resourceId = $self->getById($id);
+            if ($resourceId) { 
+                push(@resources,$resourceId);
+            }
+        }
+        return @resources;
+    } else {
+        if ($resId =~ /,/) {
+            $resId = (split (/,/, $resId))[0];
+        }
+        return $self->getById($resId);
+    }
 }
 
 sub retrieveResources {
@@ -1677,37 +2757,33 @@ sub retrieveResources {
     if (!defined($recursive)) { $recursive = 1; }
     my $bailout = shift;
     if (!defined($bailout)) { $bailout = 0; }
-
+    my $showall = shift;
     # Create the necessary iterator.
     if (!ref($map)) { # assume it's a url of a map.
-        $map = $self->getMapByUrl($map);
+        $map = $self->getResourceByUrl($map);
+    }
+
+    # If nothing was passed, assume top-level map
+    if (!$map) {
+	$map = $self->getById('0.0');
     }
 
     # Check the map's validity.
-    if (!$map || !$map->is_map()) {
+    if (!$map->is_map()) {
         # Oh, to throw an exception.... how I'd love that!
         return ();
     }
 
     # Get an iterator.
     my $it = $self->getIterator($map->map_start(), $map->map_finish(),
-                                !$recursive);
+                                undef, $recursive, $showall);
 
     my @resources = ();
 
     # Run down the iterator and collect the resources.
-    my $depth = 1;
-    $it->next();
-    my $curRes = $it->next();
-
-    while ($depth > 0) {
-        if ($curRes == $it->BEGIN_MAP()) {
-            $depth++;
-        }
-        if ($curRes == $it->END_MAP()) {
-            $depth--;
-        }
-        
+    my $curRes;
+
+    while ($curRes = $it->next()) {
         if (ref($curRes)) {
             if (!&$filterFunc($curRes)) {
                 next;
@@ -1720,7 +2796,6 @@ sub retrieveResources {
             }
         }
 
-        $curRes = $it->next();
     }
 
     return @resources;
@@ -1731,23 +2806,36 @@ sub hasResource {
     my $map = shift;
     my $filterFunc = shift;
     my $recursive = shift;
+    my $showall = shift;
     
-    return scalar($self->retrieveResources($map, $filterFunc, $recursive, 1)) > 0;
+    return scalar($self->retrieveResources($map, $filterFunc, $recursive, 1, $showall)) > 0;
+}
+
+sub usedVersion {
+    my $self = shift;
+    my $linkurl = shift;
+    return $self->navhash("version_$linkurl");
 }
 
 1;
 
 package Apache::lonnavmaps::iterator;
+use Scalar::Util qw(weaken);
+use Apache::lonnet;
 
 =pod
 
 =back
 
-=head1 navmap Iterator
-
-An I<iterator> encapsulates the logic required to traverse a data structure. navmap uses an iterator to traverse the course map according to the criteria you wish to use.
+=head1 Object: navmap Iterator
 
-To obtain an iterator, call the B<getIterator>() function of a B<navmap> object. (Do not instantiate Apache::lonnavmaps::iterator directly.) This will return a reference to the iterator:
+An I<iterator> encapsulates the logic required to traverse a data
+structure. navmap uses an iterator to traverse the course map
+according to the criteria you wish to use.
+
+To obtain an iterator, call the B<getIterator>() function of a
+B<navmap> object. (Do not instantiate Apache::lonnavmaps::iterator
+directly.) This will return a reference to the iterator:
 
 C<my $resourceIterator = $navmap-E<gt>getIterator();>
 
@@ -1759,34 +2847,103 @@ getIterator behaves as follows:
 
 =over 4
 
-=item * B<getIterator>(firstResource, finishResource, filterHash, condition, forceTop): All parameters are optional. firstResource is a resource reference corresponding to where the iterator should start. It defaults to navmap->firstResource() for the corresponding nav map. finishResource corresponds to where you want the iterator to end, defaulting to navmap->finishResource(). filterHash is a hash used as a set containing strings representing the resource IDs, defaulting to empty. Condition is a 1 or 0 that sets what to do with the filter hash: If a 0, then only resource that exist IN the filterHash will be recursed on. If it is a 1, only resources NOT in the filterHash will be recursed on. Defaults to 0. forceTop is a boolean value. If it is false (default), the iterator will only return the first level of map that is not just a single, 'redirecting' map. If true, the iterator will return all information, starting with the top-level map, regardless of content.
+=item * B<getIterator>(firstResource, finishResource, filterHash, condition, forceTop, returnTopMap):
 
-Thus, by default, only top-level resources will be shown. Change the condition to a 1 without changing the hash, and all resources will be shown. Changing the condition to 1 and including some values in the hash will allow you to selectively suppress parts of the navmap, while leaving it on 0 and adding things to the hash will allow you to selectively add parts of the nav map. See the handler code for examples.
-
-The iterator will return either a reference to a resource object, or a token representing something in the map, such as the beginning of a new branch. The possible tokens are:
+All parameters are optional. firstResource is a resource reference
+corresponding to where the iterator should start. It defaults to
+navmap->firstResource() for the corresponding nav map. finishResource
+corresponds to where you want the iterator to end, defaulting to
+navmap->finishResource(). filterHash is a hash used as a set
+containing strings representing the resource IDs, defaulting to
+empty. Condition is a 1 or 0 that sets what to do with the filter
+hash: If a 0, then only resources that exist IN the filterHash will be
+recursed on. If it is a 1, only resources NOT in the filterHash will
+be recursed on. Defaults to 0. forceTop is a boolean value. If it is
+false (default), the iterator will only return the first level of map
+that is not just a single, 'redirecting' map. If true, the iterator
+will return all information, starting with the top-level map,
+regardless of content. returnTopMap, if true (default false), will
+cause the iterator to return the top-level map object (resource 0.0)
+before anything else.
+
+Thus, by default, only top-level resources will be shown. Change the
+condition to a 1 without changing the hash, and all resources will be
+shown. Changing the condition to 1 and including some values in the
+hash will allow you to selectively suppress parts of the navmap, while
+leaving it on 0 and adding things to the hash will allow you to
+selectively add parts of the nav map. See the handler code for
+examples.
+
+The iterator will return either a reference to a resource object, or a
+token representing something in the map, such as the beginning of a
+new branch. The possible tokens are:
 
 =over 4
 
-=item * BEGIN_MAP: A new map is being recursed into. This is returned I<after> the map resource itself is returned.
+=item * B<END_ITERATOR>:
+
+The iterator has returned all that it's going to. Further calls to the
+iterator will just produce more of these. This is a "false" value, and
+is the only false value the iterator which will be returned, so it can
+be used as a loop sentinel.
+
+=item * B<BEGIN_MAP>:
 
-=item * END_MAP: The map is now done.
+A new map is being recursed into. This is returned I<after> the map
+resource itself is returned.
 
-=item * BEGIN_BRANCH: A branch is now starting. The next resource returned will be the first in that branch.
+=item * B<END_MAP>:
 
-=item * END_BRANCH: The branch is now done.
+The map is now done.
+
+=item * B<BEGIN_BRANCH>:
+
+A branch is now starting. The next resource returned will be the first
+in that branch.
+
+=item * B<END_BRANCH>:
+
+The branch is now done.
 
 =back
 
-The tokens are retreivable via methods on the iterator object, i.e., $iterator->END_MAP.
+The tokens are retreivable via methods on the iterator object, i.e.,
+$iterator->END_MAP.
 
-Maps can contain empty resources. The iterator will automatically skip over such resources, but will still treat the structure correctly. Thus, a complicated map with several branches, but consisting entirely of empty resources except for one beginning or ending resource, will cause a lot of BRANCH_STARTs and BRANCH_ENDs, but only one resource will be returned.
+Maps can contain empty resources. The iterator will automatically skip
+over such resources, but will still treat the structure
+correctly. Thus, a complicated map with several branches, but
+consisting entirely of empty resources except for one beginning or
+ending resource, will cause a lot of BRANCH_STARTs and BRANCH_ENDs,
+but only one resource will be returned.
 
 =back
 
+=head2 Normal Usage
+
+Normal usage of the iterator object is to do the following:
+
+ my $it = $navmap->getIterator([your params here]);
+ my $curRes;
+ while ($curRes = $it->next()) {
+   [your logic here]
+ }
+
+Note that inside of the loop, it's frequently useful to check if
+"$curRes" is a reference or not with the reference function; only
+resource objects will be references, and any non-references will 
+be the tokens described above.
+
+Also note there is some old code floating around that trys to track
+the depth of the iterator to see when it's done; do not copy that 
+code. It is difficult to get right and harder to understand then
+this. They should be migrated to this new style.
+
 =cut
 
 # Here are the tokens for the iterator:
 
+sub END_ITERATOR { return 0; }
 sub BEGIN_MAP { return 1; }    # begining of a new map
 sub END_MAP { return 2; }      # end of the map
 sub BEGIN_BRANCH { return 3; } # beginning of a branch
@@ -1799,18 +2956,13 @@ sub min {
     if ($a < $b) { return $a; } else { return $b; }
 }
 
-# In the CVS repository, documentation of this algorithm is included 
-# in /doc/lonnavdocs, as a PDF and .tex source. Markers like **1**
-# will reference the same location in the text as the part of the
-# algorithm is running through.
-
 sub new {
     # magic invocation to create a class instance
     my $proto = shift;
     my $class = ref($proto) || $proto;
     my $self = {};
 
-    $self->{NAV_MAP} = shift;
+    weaken($self->{NAV_MAP} = shift);
     return undef unless ($self->{NAV_MAP});
 
     # Handle the parameters
@@ -1834,6 +2986,11 @@ sub new {
     # Do we want to automatically follow "redirection" maps?
     $self->{FORCE_TOP} = shift;
 
+    # Do we want to return the top-level map object (resource 0.0)?
+    $self->{RETURN_0} = shift;
+    # have we done that yet?
+    $self->{HAVE_RETURNED_0} = 0;
+
     # Now, we need to pre-process the map, by walking forward and backward
     # over the parts of the map we're going to look at.
 
@@ -1854,6 +3011,9 @@ sub new {
     # that isn't just a redirector.
     my $resource; my $resourceCount = 0;
 
+    # Documentation on this algorithm can be found in the CVS repository at 
+    # /docs/lonnavdocs; these "**#**" markers correspond to documentation
+    # in that file.
     # **1**
 
     foreach my $pass (@iterations) {
@@ -1869,13 +3029,13 @@ sub new {
     
         # prime the recursion
         $self->{$firstResourceName}->{DATA}->{$valName} = 0;
-        my $depth = 0;
-        $iterator->next();
+	$iterator->next();
         my $curRes = $iterator->next();
-        while ($depth > -1) {
-            if ($curRes == $iterator->BEGIN_MAP()) { $depth++; }
-            if ($curRes == $iterator->END_MAP()) { $depth--; }
-        
+	my $depth = 1;
+        while ($depth > 0) {
+	    if ($curRes == $iterator->BEGIN_MAP()) { $depth++; }
+	    if ($curRes == $iterator->END_MAP()) { $depth--; }
+
             if (ref($curRes)) {
                 # If there's only one resource, this will save it
                 # we have to filter empty resources from consideration here,
@@ -1908,20 +3068,22 @@ sub new {
                 
                 $curRes->{DATA}->{DISPLAY_DEPTH} = $finalDepth;
                 if ($finalDepth > $maxDepth) {$maxDepth = $finalDepth;}
-                }
-            $curRes = $iterator->next();
+            }
+
+	    $curRes = $iterator->next();
         }
     }
 
     # Check: Was this only one resource, a map?
-    if ($resourceCount == 1 && $resource->is_map() && !$self->{FORCE_TOP}) { 
+    if ($resourceCount == 1 && $resource->is_sequence() && !$self->{FORCE_TOP}) { 
         my $firstResource = $resource->map_start();
         my $finishResource = $resource->map_finish();
         return 
             Apache::lonnavmaps::iterator->new($self->{NAV_MAP}, $firstResource,
                                               $finishResource, $self->{FILTER},
                                               $self->{ALREADY_SEEN}, 
-                                              $self->{CONDITION}, 0);
+                                              $self->{CONDITION},
+					      $self->{FORCE_TOP});
         
     }
 
@@ -1930,6 +3092,7 @@ sub new {
     $self->{MAX_DEPTH} = $maxDepth;
     $self->{STACK} = [];
     $self->{RECURSIVE_ITERATOR_FLAG} = 0;
+    $self->{FINISHED} = 0; # When true, the iterator has finished
 
     for (my $i = 0; $i <= $self->{MAX_DEPTH}; $i++) {
         push @{$self->{STACK}}, [];
@@ -1946,10 +3109,21 @@ sub new {
 
 sub next {
     my $self = shift;
+    my $closeAllPages=shift;
+    if ($self->{FINISHED}) {
+	return END_ITERATOR();
+    }
+
+    # If we want to return the top-level map object, and haven't yet,
+    # do so.
+    if ($self->{RETURN_0} && !$self->{HAVE_RETURNED_0}) {
+        $self->{HAVE_RETURNED_0} = 1;
+        return $self->{NAV_MAP}->getById('0.0');
+    }
 
     if ($self->{RECURSIVE_ITERATOR_FLAG}) {
         # grab the next from the recursive iterator 
-        my $next = $self->{RECURSIVE_ITERATOR}->next();
+        my $next = $self->{RECURSIVE_ITERATOR}->next($closeAllPages);
 
         # is it a begin or end map? If so, update the depth
         if ($next == BEGIN_MAP() ) { $self->{RECURSIVE_DEPTH}++; }
@@ -1999,6 +3173,7 @@ sub next {
             $self->{CURRENT_DEPTH}--;
             return END_BRANCH();
         } else {
+	    $self->{FINISHED} = 1;
             return END_MAP();
         }
     }
@@ -2062,7 +3237,7 @@ sub next {
 
     # That ends the main iterator logic. Now, do we want to recurse
     # down this map (if this resource is a map)?
-    if ($self->{HERE}->is_map() &&
+    if ( ($self->{HERE}->is_sequence() || (!$closeAllPages && $self->{HERE}->is_page())) &&
         (defined($self->{FILTER}->{$self->{HERE}->map_pc()}) xor $self->{CONDITION})) {
         $self->{RECURSIVE_ITERATOR_FLAG} = 1;
         my $firstResource = $self->{HERE}->map_start();
@@ -2071,7 +3246,9 @@ sub next {
         $self->{RECURSIVE_ITERATOR} = 
             Apache::lonnavmaps::iterator->new($self->{NAV_MAP}, $firstResource,
                                               $finishResource, $self->{FILTER},
-                                              $self->{ALREADY_SEEN}, $self->{CONDITION});
+                                              $self->{ALREADY_SEEN},
+					      $self->{CONDITION},
+					      $self->{FORCE_TOP});
     }
 
     # If this is a blank resource, don't actually return it.
@@ -2080,7 +3257,7 @@ sub next {
     my $browsePriv = $self->{HERE}->browsePriv();
     if (!$self->{HERE}->src() || 
         (!($browsePriv eq 'F') && !($browsePriv eq '2')) ) {
-        return $self->next();
+        return $self->next($closeAllPages);
     }
 
     return $self->{HERE};
@@ -2089,7 +3266,13 @@ sub next {
 
 =pod
 
-The other method available on the iterator is B<getStack>, which returns an array populated with the current 'stack' of maps, as references to the resource objects. Example: This is useful when making the navigation map, as we need to check whether we are under a page map to see if we need to link directly to the resource, or to the page. The first elements in the array will correspond to the top of the stack (most inclusive map).
+The other method available on the iterator is B<getStack>, which
+returns an array populated with the current 'stack' of maps, as
+references to the resource objects. Example: This is useful when
+making the navigation map, as we need to check whether we are under a
+page map to see if we need to link directly to the resource, or to the
+page. The first elements in the array will correspond to the top of
+the stack (most inclusive map).
 
 =cut
 
@@ -2118,6 +3301,8 @@ sub populateStack {
 1;
 
 package Apache::lonnavmaps::DFSiterator;
+use Scalar::Util qw(weaken);
+use Apache::lonnet;
 
 # Not documented in the perldoc: This is a simple iterator that just walks
 #  through the nav map and presents the resources in a depth-first search
@@ -2126,7 +3311,7 @@ package Apache::lonnavmaps::DFSiterator;
 #  useful for pre-processing of some kind, and is in fact used by the main
 #  iterator that way, but that's about it.
 # One could imagine merging this into the init routine of the main iterator,
-#  but this might as well be left seperate, since it is possible some other
+#  but this might as well be left separate, since it is possible some other
 #  use might be found for it. - Jeremy
 
 # Unlike the main iterator, this DOES return all resources, even blank ones.
@@ -2146,7 +3331,7 @@ sub new {
     my $class = ref($proto) || $proto;
     my $self = {};
 
-    $self->{NAV_MAP} = shift;
+    weaken($self->{NAV_MAP} = shift);
     return undef unless ($self->{NAV_MAP});
 
     $self->{FIRST_RESOURCE} = shift || $self->{NAV_MAP}->firstResource();
@@ -2272,33 +3457,107 @@ sub next {
     return $self->{HERE};
 }
 
-1;
-
-package Apache::lonnavmaps::resource;
+# Identical to the full iterator methods of the same name. Hate to copy/paste
+# but I also hate to "inherit" either iterator from the other.
 
-use Apache::lonnet;
+sub getStack {
+    my $self=shift;
 
-=pod
+    my @stack;
 
-=head1 Object: resource
+    $self->populateStack(\@stack);
 
-A resource object encapsulates a resource in a resource map, allowing easy manipulation of the resource, querying the properties of the resource (including user properties), and represents a reference that can be used as the canonical representation of the resource by lonnavmap clients like renderers.
+    return \@stack;
+}
 
-A resource only makes sense in the context of a navmap, as some of the data is stored in the navmap object.
+# Private method: Calls the iterators recursively to populate the stack.
+sub populateStack {
+    my $self=shift;
+    my $stack = shift;
 
-You will probably never need to instantiate this object directly. Use Apache::lonnavmaps::navmap, and use the "start" method to obtain the starting resource.
+    push @$stack, $self->{HERE} if ($self->{HERE});
 
-=head2 Public Members
+    if ($self->{RECURSIVE_ITERATOR_FLAG}) {
+        $self->{RECURSIVE_ITERATOR}->populateStack($stack);
+    }
+}
 
-resource objects have a hash called DATA ($resourceRef->{DATA}) that you can store whatever you want in. This allows you to easily do two-pass algorithms without worrying about managing your own resource->data hash.
+1;
 
-=head2 Methods
+package Apache::lonnavmaps::resource;
+use Scalar::Util qw(weaken);
+use Apache::lonnet;
 
-=over 4
+=pod
 
-=item * B<new>($navmapRef, $idString): The first arg is a reference to the parent navmap object. The second is the idString of the resource itself. Very rarely, if ever, called directly. Use the nav map->getByID() method.
+=head1 Object: resource 
 
-=back
+X<resource, navmap object>
+A resource object encapsulates a resource in a resource map, allowing
+easy manipulation of the resource, querying the properties of the
+resource (including user properties), and represents a reference that
+can be used as the canonical representation of the resource by
+lonnavmap clients like renderers.
+
+A resource only makes sense in the context of a navmap, as some of the
+data is stored in the navmap object.
+
+You will probably never need to instantiate this object directly. Use
+Apache::lonnavmaps::navmap, and use the "start" method to obtain the
+starting resource.
+
+Resource objects respect the parameter_hiddenparts, which suppresses 
+various parts according to the wishes of the map author. As of this
+writing, there is no way to override this parameter, and suppressed
+parts will never be returned, nor will their response types or ids be
+stored.
+
+=head2 Overview
+
+A B<Resource> is the most granular type of object in LON-CAPA that can
+be included in a course. It can either be a particular resource, like
+an HTML page, external resource, problem, etc., or it can be a
+container sequence, such as a "page" or a "map".
+
+To see a sequence from the user's point of view, please see the
+B<Creating a Course: Maps and Sequences> chapter of the Author's
+Manual.
+
+A Resource Object, once obtained from a navmap object via a B<getBy*>
+method of the navmap, or from an iterator, allows you to query
+information about that resource.
+
+Generally, you do not ever want to create a resource object yourself,
+so creation has been left undocumented. Always retrieve resources
+from navmap objects.
+
+=head3 Identifying Resources
+
+X<big hash>Every resource is identified by a Resource ID in the big hash that is
+unique to that resource for a given course. X<resource ID, in big hash>
+The Resource ID has the form #.#, where the first number is the same
+for every resource in a map, and the second is unique. For instance,
+for a course laid out like this:
+
+ * Problem 1
+ * Map
+   * Resource 2
+   * Resource 3
+
+C<Problem 1> and C<Map> will share a first number, and C<Resource 2>
+C<Resource 3> will share a first number. The second number may end up
+re-used between the two groups.
+
+The resource ID is only used in the big hash, but can be used in the
+context of a course to identify a resource easily. (For instance, the
+printing system uses it to record which resources from a sequence you 
+wish to print.)
+
+X<symb> X<resource, symb>
+All resources also have B<symb>s, which uniquely identify a resource
+in a course. Many internal LON-CAPA functions expect a symb. A symb
+carries along with it the URL of the resource, and the map it appears
+in. Symbs are much larger then resource IDs.
 
 =cut
 
@@ -2308,7 +3567,7 @@ sub new {
     my $class = ref($proto) || $proto;
     my $self = {};
 
-    $self->{NAV_MAP} = shift;
+    weaken($self->{NAV_MAP} = shift);
     $self->{ID} = shift;
 
     # Store this new resource in the parent nav map's cache.
@@ -2337,31 +3596,57 @@ sub navHash {
 
 =pod
 
-B<Metadata Retreival>
+=head2 Methods
+
+Once you have a resource object, here's what you can do with it:
 
-These are methods that help you retrieve metadata about the resource: Method names are based on the fields in the compiled course representation.
+=head3 Attribute Retrieval
+
+Every resource has certain attributes that can be retrieved and used:
 
 =over 4
 
-=item * B<compTitle>: Returns a "composite title", that is equal to $res->title() if the resource has a title, and is otherwise the last part of the URL (e.g., "problem.problem").
+=item * B<ID>: Every resource has an ID that is unique for that
+    resource in the course it is in. The ID is actually in the hash
+    representing the resource, so for a resource object $res, obtain
+    it via C<$res->{ID}).
+
+=item * B<compTitle>:
+
+Returns a "composite title", that is equal to $res->title() if the
+resource has a title, and is otherwise the last part of the URL (e.g.,
+"problem.problem").
+
+=item * B<ext>:
+
+Returns true if the resource is external.
 
-=item * B<ext>: Returns true if the resource is external.
+=item * B<kind>:
 
-=item * B<goesto>: Returns the "goesto" value from the compiled nav map. (It is likely you want to use B<getNext> instead.)
+Returns the kind of the resource from the compiled nav map.
 
-=item * B<kind>: Returns the kind of the resource from the compiled nav map.
+=item * B<randomout>:
 
-=item * B<randomout>: Returns true if this resource was chosen to NOT be shown to the user by the random map selection feature. In other words, this is usually false.
+Returns true if this resource was chosen to NOT be shown to the user
+by the random map selection feature. In other words, this is usually
+false.
 
-=item * B<randompick>: Returns true for a map if the randompick feature is being used on the map. (?)
+=item * B<randompick>:
 
-=item * B<src>: Returns the source for the resource.
+Returns true for a map if the randompick feature is being used on the
+map. (?)
 
-=item * B<symb>: Returns the symb for the resource.
+=item * B<src>:
 
-=item * B<title>: Returns the title of the resource.
+Returns the source for the resource.
 
-=item * B<to>: Returns the "to" value from the compiled nav map. (It is likely you want to use B<getNext> instead.)
+=item * B<symb>:
+
+Returns the symb for the resource.
+
+=item * B<title>:
+
+Returns the title of the resource.
 
 =back
 
@@ -2370,33 +3655,87 @@ These are methods that help you retrieve
 # These info functions can be used directly, as they don't return
 # resource information.
 sub comesfrom { my $self=shift; return $self->navHash("comesfrom_", 1); }
+sub encrypted { my $self=shift; return $self->navHash("encrypted_", 1); }
 sub ext { my $self=shift; return $self->navHash("ext_", 1) eq 'true:'; }
 sub from { my $self=shift; return $self->navHash("from_", 1); }
+# considered private and undocumented
 sub goesto { my $self=shift; return $self->navHash("goesto_", 1); }
 sub kind { my $self=shift; return $self->navHash("kind_", 1); }
 sub randomout { my $self=shift; return $self->navHash("randomout_", 1); }
 sub randompick { 
     my $self = shift;
-    return $self->{NAV_MAP}->{PARM_HASH}->{$self->symb .
-                                               '.0.parameter_randompick'};
+    return $self->parmval('randompick');
+}
+sub link {
+    my $self=shift;
+    if ($self->encrypted()) { return &Apache::lonenc::encrypted($self->src); }
+    return $self->src;
 }
 sub src { 
     my $self=shift;
     return $self->navHash("src_", 1);
 }
+sub shown_symb {
+    my $self=shift;
+    if ($self->encrypted()) {return &Apache::lonenc::encrypted($self->symb());}
+    return $self->symb();
+}
+sub id {
+    my $self=shift;
+    return $self->{ID};
+}
+sub enclosing_map_src {
+    my $self=shift;
+    (my $first, my $second) = $self->{ID} =~ /(\d+).(\d+)/;
+    return $self->navHash('map_id_'.$first);
+}
 sub symb {
     my $self=shift;
     (my $first, my $second) = $self->{ID} =~ /(\d+).(\d+)/;
     my $symbSrc = &Apache::lonnet::declutter($self->src());
-    return &Apache::lonnet::declutter(
-         $self->navHash('map_id_'.$first)) 
+    my $symb = &Apache::lonnet::declutter($self->navHash('map_id_'.$first)) 
         . '___' . $second . '___' . $symbSrc;
+    return &Apache::lonnet::symbclean($symb);
+}
+sub wrap_symb {
+    my $self = shift;
+    return $self->{NAV_MAP}->wrap_symb($self->symb());
 }
-sub title { my $self=shift; return $self->navHash("title_", 1); }
+sub title { 
+    my $self=shift; 
+    if ($self->{ID} eq '0.0') {
+	# If this is the top-level map, return the title of the course
+	# since this map can not be titled otherwise.
+	return $env{'course.'.$env{'request.course.id'}.'.description'};
+    }
+    return $self->navHash("title_", 1); }
+# considered private and undocumented
 sub to { my $self=shift; return $self->navHash("to_", 1); }
+sub condition {
+    my $self=shift;
+    my $undercond=$self->navHash("undercond_", 1);
+    if (!defined($undercond)) { return 1; };
+    my $condid=$self->navHash("condid_$undercond");
+    if (!defined($condid)) { return 1; };
+    my $condition=&Apache::lonnet::directcondval($condid);
+    return $condition;
+}
+sub condval {
+    my $self=shift;
+    my ($pathname,$filename) = 
+	&Apache::lonnet::split_uri_for_cond($self->src());
+
+    my $match=($env{'acc.res.'.$env{'request.course.id'}.'.'.$pathname}=~
+	       /\&\Q$filename\E\:([\d\|]+)\&/);
+    if ($match) {
+	return &Apache::lonnet::condval($1);
+    }
+    return 0;
+}
 sub compTitle {
     my $self = shift;
     my $title = $self->title();
+    $title=~s/\&colon\;/\:/gs;
     if (!$title) {
         $title = $self->src();
         $title = substr($title, rindex($title, '/') + 1);
@@ -2411,19 +3750,48 @@ These methods are shortcuts to deciding
 
 =over 4
 
-=item * B<is_map>: Returns true if the resource is a map type.
+=item * B<is_map>:
 
-=item * B<is_problem>: Returns true if the resource is a problem type, false otherwise. (Looks at the extension on the src field; might need more to work correctly.)
+Returns true if the resource is a map type.
 
-=item * B<is_page>: Returns true if the resource is a page.
+=item * B<is_problem>:
 
-=item * B<is_sequence>: Returns true if the resource is a sequence.
+Returns true if the resource is a problem type, false
+otherwise. (Looks at the extension on the src field; might need more
+to work correctly.)
+
+=item * B<is_page>:
+
+Returns true if the resource is a page.
+
+=item * B<is_sequence>:
+
+Returns true if the resource is a sequence.
 
 =back
 
 =cut
 
+sub hasResource {
+   my $self = shift;
+   return $self->{NAV_MAP}->hasResource(@_);
+}
 
+sub retrieveResources {
+   my $self = shift;
+   return $self->{NAV_MAP}->retrieveResources(@_);
+}
+
+sub is_exam {
+    my ($self,$part) = @_;
+    if ($self->parmval('type',$part) eq 'exam') {
+        return 1;
+    }
+    if ($self->src() =~ /\.(exam)$/) {
+        return 1;
+    }
+    return 0;
+}
 sub is_html {
     my $self=shift;
     my $src = $self->src();
@@ -2433,24 +3801,69 @@ sub is_map { my $self=shift; return defi
 sub is_page {
     my $self=shift;
     my $src = $self->src();
-    return ($src =~ /page$/);
+    return $self->navHash("is_map_", 1) && 
+	$self->navHash("map_type_" . $self->map_pc()) eq 'page';
+}
+sub is_practice {
+    my $self=shift;
+    my ($part) = @_;
+    if ($self->parmval('type',$part) eq 'practice') {
+        return 1;
+    }
+    return 0;
 }
 sub is_problem {
     my $self=shift;
     my $src = $self->src();
-    return ($src =~ /problem$/);
+    if ($src =~ /\.(problem|exam|quiz|assess|survey|form|library|task)$/) {
+	return !($self->is_practice());
+    }
+    return 0;
+}
+sub contains_problem {
+    my $self=shift;
+    if ($self->is_page()) {
+	my $hasProblem=$self->hasResource($self,sub { $_[0]->is_problem() },1);
+	return $hasProblem;
+    }
+    return 0;
 }
 sub is_sequence {
     my $self=shift;
+    return $self->navHash("is_map_", 1) && 
+	$self->navHash("map_type_" . $self->map_pc()) eq 'sequence';
+}
+sub is_survey {
+    my $self = shift();
+    my $part = shift();
+    if ($self->parmval('type',$part) eq 'survey') {
+        return 1;
+    }
+    if ($self->src() =~ /\.(survey)$/) {
+        return 1;
+    }
+    return 0;
+}
+sub is_task {
+    my $self=shift;
     my $src = $self->src();
-    return ($src =~ /sequence$/);
+    return ($src =~ /\.(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());
 }
 
 # Private method: Shells out to the parmval in the nav map, handler parts.
 sub parmval {
     my $self = shift;
     my $what = shift;
-    my $part = shift || "0";
+    my $part = shift;
+    if (!defined($part)) { 
+        $part = '0'; 
+    }
     return $self->{NAV_MAP}->parmval($part.'.'.$what, $self->symb());
 }
 
@@ -2458,17 +3871,31 @@ sub parmval {
 
 B<Map Methods>
 
-These methods are useful for getting information about the map properties of the resource, if the resource is a map (B<is_map>).
+These methods are useful for getting information about the map
+properties of the resource, if the resource is a map (B<is_map>).
 
 =over 4
 
-=item * B<map_finish>: Returns a reference to a resource object corresponding to the finish resource of the map.
+=item * B<map_finish>:
+
+Returns a reference to a resource object corresponding to the finish
+resource of the map.
+
+=item * B<map_pc>:
 
-=item * B<map_pc>: Returns the pc value of the map, which is the first number that appears in the resource ID of the resources in the map, and is the number that appears around the middle of the symbs of the resources in that map.
+Returns the pc value of the map, which is the first number that
+appears in the resource ID of the resources in the map, and is the
+number that appears around the middle of the symbs of the resources in
+that map.
 
-=item * B<map_start>: Returns a reference to a resource object corresponding to the start resource of the map.
+=item * B<map_start>:
 
-=item * B<map_type>: Returns a string with the type of the map in it.
+Returns a reference to a resource object corresponding to the start
+resource of the map.
+
+=item * B<map_type>:
+
+Returns a string with the type of the map in it.
 
 =back
 
@@ -2477,7 +3904,7 @@ These methods are useful for getting inf
 sub map_finish {
     my $self = shift;
     my $src = $self->src();
-    $src = Apache::lonnet::clutter($src);
+    $src = &Apache::lonnet::clutter($src);
     my $res = $self->navHash("map_finish_$src", 0);
     $res = $self->{NAV_MAP}->getById($res);
     return $res;
@@ -2490,7 +3917,7 @@ sub map_pc {
 sub map_start {
     my $self = shift;
     my $src = $self->src();
-    $src = Apache::lonnet::clutter($src);
+    $src = &Apache::lonnet::clutter($src);
     my $res = $self->navHash("map_start_$src", 0);
     $res = $self->{NAV_MAP}->getById($res);
     return $res;
@@ -2501,8 +3928,6 @@ sub map_type {
     return $self->navHash("map_type_$pc", 0);
 }
 
-
-
 #####
 # Property queries
 #####
@@ -2517,33 +3942,69 @@ sub map_type {
 
 =head2 Resource Parameters
 
-In order to use the resource parameters correctly, the nav map must have been instantiated with genCourseAndUserOptions set to true, so the courseopt and useropt is read correctly. Then, you can call these functions to get the relevant parameters for the resource. Each function defaults to part "0", but can be directed to another part by passing the part as the parameter.
-
-These methods are responsible for getting the parameter correct, not merely reflecting the contents of the GDBM hashes. As we move towards dates relative to other dates, these methods should be updated to reflect that. (Then, anybody using these methods won't have to update their code.)
+In order to use the resource parameters correctly, the nav map must
+have been instantiated with genCourseAndUserOptions set to true, so
+the courseopt and useropt is read correctly. Then, you can call these
+functions to get the relevant parameters for the resource. Each
+function defaults to part "0", but can be directed to another part by
+passing the part as the parameter.
+
+These methods are responsible for getting the parameter correct, not
+merely reflecting the contents of the GDBM hashes. As we move towards
+dates relative to other dates, these methods should be updated to
+reflect that. (Then, anybody using these methods will not have to update
+their code.)
 
 =over 4
 
-=item * B<acc>: Get the Client IP/Name Access Control information.
+=item * B<acc>:
+
+Get the Client IP/Name Access Control information.
+
+=item * B<answerdate>:
+
+Get the answer-reveal date for the problem.
+
+=item * B<awarded>: 
+
+Gets the awarded value for the problem part. Requires genUserData set to
+true when the navmap object was created.
 
-=item * B<answerdate>: Get the answer-reveal date for the problem.
+=item * B<duedate>:
 
-=item * B<duedate>: Get the due date for the problem.
+Get the due date for the problem.
 
-=item * B<tries>: Get the number of tries the student has used on the problem.
+=item * B<tries>:
 
-=item * B<maxtries>: Get the number of max tries allowed.
+Get the number of tries the student has used on the problem.
 
-=item * B<opendate>: Get the open date for the problem.
+=item * B<maxtries>:
 
-=item * B<sig>: Get the significant figures setting.
+Get the number of max tries allowed.
 
-=item * B<tol>: Get the tolerance for the problem.
+=item * B<opendate>:
 
-=item * B<tries>: Get the number of tries the user has already used on the problem.
+Get the open date for the problem.
 
-=item * B<type>: Get the question type for the problem.
+=item * B<sig>:
 
-=item * B<weight>: Get the weight for the problem.
+Get the significant figures setting.
+
+=item * B<tol>:
+
+Get the tolerance for the problem.
+
+=item * B<tries>:
+
+Get the number of tries the user has already used on the problem.
+
+=item * B<type>:
+
+Get the question type for the problem.
+
+=item * B<weight>:
+
+Get the weight for the problem.
 
 =back
 
@@ -2562,10 +4023,34 @@ sub answerdate {
     }
     return $self->parmval("answerdate", $part);
 }
-sub awarded { my $self = shift; return $self->queryRestoreHash('awarded', shift); }
+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'};
+}
+# this should work exactly like the copy in lonhomework.pm
 sub duedate {
     (my $self, my $part) = @_;
-    return $self->parmval("duedate", $part);
+    my $date;
+    my $interval=$self->parmval("interval", $part);
+    my $due_date=$self->parmval("duedate", $part);
+    if (defined($interval)) {
+	my $first_access=&Apache::lonnet::get_first_access('map',$self->symb);
+	if (defined($first_access)) {
+	    $interval = $first_access+$interval;
+	    $date = ($interval < $due_date)? $interval : $due_date;
+	} else {
+	    $date = $due_date;
+	}
+    } else {
+	$date = $due_date;
+    }
+    return $date;
+}
+sub handgrade {
+    (my $self, my $part) = @_;
+    return $self->parmval("handgrade", $part);
 }
 sub maxtries {
     (my $self, my $part) = @_;
@@ -2579,6 +4064,10 @@ sub opendate {
     }
     return $self->parmval("opendate");
 }
+sub problemstatus {
+    (my $self, my $part) = @_;
+    return lc $self->parmval("problemstatus", $part);
+}
 sub sig {
     (my $self, my $part) = @_;
     return $self->parmval("sig", $part);
@@ -2599,7 +4088,21 @@ sub type {
 }
 sub weight { 
     my $self = shift; my $part = shift;
-    return $self->parmval("weight", $part);
+    if (!defined($part)) { $part = '0'; }
+    return &Apache::lonnet::EXT('resource.'.$part.'.weight',
+				$self->symb(), $env{'user.domain'},
+				$env{'user.name'}, 
+				$env{'request.course.sec'});
+}
+sub part_display {
+    my $self= shift(); my $partID = shift();
+    if (! defined($partID)) { $partID = '0'; }
+    my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',
+                                     $self->symb);
+    if (! defined($display) || $display eq '') {
+        $display = $partID;
+    }
+    return $display;
 }
 
 # Multiple things need this
@@ -2634,9 +4137,31 @@ Misc. functions for the resource.
 
 =over 4
 
-=item * B<hasDiscussion>: Returns a false value if there has been discussion since the user last logged in, true if there has. Always returns false if the discussion data was not extracted when the nav map was constructed.
+=item * B<hasDiscussion>:
+
+Returns a false value if there has been discussion since the user last
+logged in, true if there has. Always returns false if the discussion
+data was not extracted when the nav map was constructed.
+
+=item * B<last_post_time>:
+
+Returns a false value if there hasn't been discussion otherwise returns
+unix timestamp of last time a discussion posting (or edit) was made.
+
+=item * B<unread_discussion>:
 
-=item * B<getFeedback>: Gets the feedback for the resource and returns the raw feedback string for the resource, or the null string if there is no feedback or the email data was not extracted when the nav map was constructed. Usually used like this:
+returns in scalar context the count of the number of unread discussion
+postings
+
+returns in list context both the count of postings and a hash ref
+containing the subjects of all unread postings
+
+=item * B<getFeedback>:
+
+Gets the feedback for the resource and returns the raw feedback string
+for the resource, or the null string if there is no feedback or the
+email data was not extracted when the nav map was constructed. Usually
+used like this:
 
  for (split(/\,/, $res->getFeedback())) {
     my $link = &Apache::lonnet::escape($_);
@@ -2651,6 +4176,16 @@ sub hasDiscussion {
     return $self->{NAV_MAP}->hasDiscussion($self->symb());
 }
 
+sub last_post_time {
+    my $self = shift;
+    return $self->{NAV_MAP}->last_post_time($self->symb());
+}
+
+sub unread_discussion {
+    my $self = shift;
+    return $self->{NAV_MAP}->unread_discussion($self->symb());
+}
+
 sub getFeedback {
     my $self = shift;
     my $source = $self->src();
@@ -2667,9 +4202,43 @@ sub getErrors {
 
 =pod
 
-=item * B<parts>(): Returns a list reference containing sorted strings corresponding to each part of the problem. To count the number of parts, use the list in a scalar context, and subtract one if greater than two. (One part problems have a part 0. Multi-parts have a part 0, plus a part for each part. Filtering part 0 if you want it is up to you.)
+=item * B<parts>():
+
+Returns a list reference containing sorted strings corresponding to
+each part of the problem. Single part problems have only a part '0'.
+Multipart problems do not return their part '0', since they typically
+do not really matter. 
+
+=item * B<countParts>():
+
+Returns the number of parts of the problem a student can answer. Thus,
+for single part problems, returns 1. For multipart, it returns the
+number of parts in the problem, not including psuedo-part 0. 
+
+=item * B<countResponses>():
+
+Returns the total number of responses in the problem a student can answer.
+
+=item * B<responseTypes>():
+
+Returns a hash whose keys are the response types.  The values are the number 
+of times each response type is used.  This is for the I<entire> problem, not 
+just a single part.
+
+=item * B<multipart>():
+
+Returns true if the problem is multipart, false otherwise. Use this instead
+of countParts if all you want is multipart/not multipart.
+
+=item * B<responseType>($part):
+
+Returns the response type of the part, without the word "response" on the
+end. Example return values: 'string', 'essay', 'numeric', etc.
+
+=item * B<responseIds>($part):
 
-=item * B<countParts>(): Returns the number of parts of the problem a student can answer. Thus, for single part problems, returns 1. For multipart, it returns the number of parts in the problem, not including psuedo-part 0. Thus, B<parts> may return an array with fewer parts in it then countParts might lead you to believe.
+Retreives the response IDs for the given part as an array reference containing
+strings naming the response IDs. This may be empty.
 
 =back
 
@@ -2678,7 +4247,7 @@ sub getErrors {
 sub parts {
     my $self = shift;
 
-    if ($self->ext) { return ['0']; }
+    if ($self->ext) { return []; }
 
     $self->extractParts();
     return $self->{PARTS};
@@ -2689,16 +4258,75 @@ sub countParts {
     
     my $parts = $self->parts();
 
+    # If I left this here, then it's not necessary.
+    #my $delta = 0;
+    #for my $part (@$parts) {
+    #    if ($part eq '0') { $delta--; }
+    #}
+
     if ($self->{RESOURCE_ERROR}) {
         return 0;
     }
 
-    if (scalar(@{$parts}) < 2) { return 1;}
+    return scalar(@{$parts}); # + $delta;
+}
+
+sub countResponses {
+    my $self = shift;
+    my $count;
+    foreach my $part (@{$self->parts()}) {
+        $count+= scalar($self->responseIds($part));
+    }
+    return $count;
+}
+
+sub responseTypes {
+    my $self = shift;
+    my %responses;
+    foreach my $part (@{$self->parts()}) {
+        foreach my $responsetype ($self->responseType($part)) {
+            $responses{$responsetype}++ if (defined($responsetype));
+        }
+    }
+    return %responses;
+}
+
+sub multipart {
+    my $self = shift;
+    return $self->countParts() > 1;
+}
+
+sub singlepart {
+    my $self = shift;
+    return $self->countParts() == 1;
+}
+
+sub responseType {
+    my $self = shift;
+    my $part = shift;
+
+    $self->extractParts();
+    if (defined($self->{RESPONSE_TYPES}->{$part})) {
+	return @{$self->{RESPONSE_TYPES}->{$part}};
+    } else {
+	return undef;
+    }
+}
+
+sub responseIds {
+    my $self = shift;
+    my $part = shift;
 
-    return scalar(@{$parts}) - 1;
+    $self->extractParts();
+    if (defined($self->{RESPONSE_IDS}->{$part})) {
+	return @{$self->{RESPONSE_IDS}->{$part}};
+    } else {
+	return undef;
+    }
 }
 
-# Private function: Extracts the parts information and saves it
+# Private function: Extracts the parts information, both part names and
+# part types, and saves it. 
 sub extractParts { 
     my $self = shift;
     
@@ -2707,27 +4335,118 @@ sub extractParts {
 
     $self->{PARTS} = [];
 
+    my %parts;
+
     # Retrieve part count, if this is a problem
     if ($self->is_problem()) {
+	my $partorder = &Apache::lonnet::metadata($self->src(), 'partorder');
         my $metadata = &Apache::lonnet::metadata($self->src(), 'packages');
-        if (!$metadata) {
-            $self->{RESOURCE_ERROR} = 1;
-            $self->{PARTS} = [];
-            return;
-        }
-        foreach (split(/\,/,$metadata)) {
-            if ($_ =~ /^part_(.*)$/) {
-                my $part = $1;
-                # check to see if part is turned off.
-                if (! Apache::loncommon::check_if_partid_hidden($part, $self->symb())) {
-                    push @{$self->{PARTS}}, $1;
+
+	if ($partorder) {
+	    my @parts;
+	    for my $part (split (/,/,$partorder)) {
+		if (!Apache::loncommon::check_if_partid_hidden($part, $self->symb())) {
+		    push @parts, $part;
+		    $parts{$part} = 1;
+		}
+	    }
+	    $self->{PARTS} = \@parts;
+	} else {
+	    if (!$metadata) {
+		$self->{RESOURCE_ERROR} = 1;
+		$self->{PARTS} = [];
+		$self->{PART_TYPE} = {};
+		return;
+	    }
+	    foreach (split(/\,/,$metadata)) {
+		if ($_ =~ /^(?:part|Task)_(.*)$/) {
+		    my $part = $1;
+		    # This floods the logs if it blows up
+		    if (defined($parts{$part})) {
+			&Apache::lonnet::logthis("$part multiply defined in metadata for " . $self->symb());
+		    }
+		    
+		    # check to see if part is turned off.
+		    
+		    if (!Apache::loncommon::check_if_partid_hidden($part, $self->symb())) {
+			$parts{$part} = 1;
+		    }
+		}
+	    }
+	    my @sortedParts = sort keys %parts;
+	    $self->{PARTS} = \@sortedParts;
+        }
+        
+
+        # These hashes probably do not need names that end with "Hash"....
+        my %responseIdHash;
+        my %responseTypeHash;
+
+
+        # Init the responseIdHash
+        foreach (@{$self->{PARTS}}) {
+            $responseIdHash{$_} = [];
+        }
+
+        # Now, the unfortunate thing about this is that parts, part name, and
+        # response id are delimited by underscores, but both the part
+        # name and response id can themselves have underscores in them.
+        # So we have to use our knowlege of part names to figure out 
+        # where the part names begin and end, and even then, it is possible
+        # to construct ambiguous situations.
+        foreach my $data (split /,/, $metadata) {
+            if ($data =~ /^([a-zA-Z]+)response_(.*)/
+		|| $data =~ /^(Task)_(.*)/) {
+                my $responseType = $1;
+                my $partStuff = $2;
+                my $partIdSoFar = '';
+                my @partChunks = split /_/, $partStuff;
+                my $i = 0;
+                for ($i = 0; $i < scalar(@partChunks); $i++) {
+                    if ($partIdSoFar) { $partIdSoFar .= '_'; }
+                    $partIdSoFar .= $partChunks[$i];
+                    if ($parts{$partIdSoFar}) {
+                        my @otherChunks = @partChunks[$i+1..$#partChunks];
+                        my $responseId = join('_', @otherChunks);
+			if ($self->is_task()) {
+			    push(@{$responseIdHash{$partIdSoFar}},
+				 $partIdSoFar);
+			} else {
+			    push(@{$responseIdHash{$partIdSoFar}},
+				 $responseId);
+			}
+                        push(@{$responseTypeHash{$partIdSoFar}},
+			     $responseType);
+                    }
                 }
             }
         }
-        
-        
-        my @sortedParts = sort @{$self->{PARTS}};
-        $self->{PARTS} = \@sortedParts;
+	my $resorder = &Apache::lonnet::metadata($self->src(),'responseorder');
+        #
+        # Reorder the arrays in the %responseIdHash and %responseTypeHash
+	if ($resorder) {
+	    my @resorder=split(/,/,$resorder);
+	    foreach my $part (keys(%responseIdHash)) {
+		my $i=0;
+		my %resids = map { ($_,$i++) } @{ $responseIdHash{$part} };
+		my @neworder;
+		foreach my $possibleid (@resorder) {
+		    if (exists($resids{$possibleid})) {
+			push(@neworder,$resids{$possibleid});
+		    }
+		}
+		my @ids;
+		my @type;
+		foreach my $element (@neworder) {
+		    push (@ids,$responseIdHash{$part}->[$element]);
+		    push (@type,$responseTypeHash{$part}->[$element]);
+		}
+		$responseIdHash{$part}=\@ids;
+		$responseTypeHash{$part}=\@type;
+	    }
+	}
+        $self->{RESPONSE_IDS} = \%responseIdHash;
+        $self->{RESPONSE_TYPES} = \%responseTypeHash;
     }
 
     return;
@@ -2737,11 +4456,14 @@ sub extractParts {
 
 =head2 Resource Status
 
-Problem resources have status information, reflecting their various dates and completion statuses. 
+Problem resources have status information, reflecting their various
+dates and completion statuses.
 
-There are two aspects to the status: the date-related information and the completion information.
+There are two aspects to the status: the date-related information and
+the completion information.
 
-Idiomatic usage of these two methods would probably look something like
+Idiomatic usage of these two methods would probably look something
+like
 
  foreach ($resource->parts()) {
     my $dateStatus = $resource->getDateStatus($_);
@@ -2754,13 +4476,20 @@ Idiomatic usage of these two methods wou
     ... use it here ...
  }
 
-Which you use depends on exactly what you are looking for. The status() function has been optimized for the nav maps display and may not precisely match what you need elsewhere.
+Which you use depends on exactly what you are looking for. The
+status() function has been optimized for the nav maps display and may
+not precisely match what you need elsewhere.
 
-The symbolic constants shown below can be accessed through the resource object: $res->OPEN.
+The symbolic constants shown below can be accessed through the
+resource object: C<$res->OPEN>.
 
 =over 4
 
-=item * B<getDateStatus>($part): ($part defaults to 0). A convenience function that returns a symbolic constant telling you about the date status of the part. The possible return values are:
+=item * B<getDateStatus>($part):
+
+($part defaults to 0). A convenience function that returns a symbolic
+constant telling you about the date status of the part. The possible
+return values are:
 
 =back
 
@@ -2768,18 +4497,30 @@ B<Date Codes>
 
 =over 4
 
-=item * B<OPEN_LATER>: The problem will be opened later.
+=item * B<OPEN_LATER>:
+
+The problem will be opened later.
+
+=item * B<OPEN>:
 
-=item * B<OPEN>: Open and not yet due.
+Open and not yet due.
 
 
-=item * B<PAST_DUE_ANSWER_LATER>: The due date has passed, but the answer date has not yet arrived.
+=item * B<PAST_DUE_ANSWER_LATER>:
 
-=item * B<PAST_DUE_NO_ANSWER>: The due date has passed and there is no answer opening date set.
+The due date has passed, but the answer date has not yet arrived.
 
-=item * B<ANSWER_OPEN>: The answer date is here.
+=item * B<PAST_DUE_NO_ANSWER>:
 
-=item * B<NETWORK_FAILURE>: The information is unknown due to network failure.
+The due date has passed and there is no answer opening date set.
+
+=item * B<ANSWER_OPEN>:
+
+The answer date is here.
+
+=item * B<NETWORK_FAILURE>:
+
+The information is unknown due to network failure.
 
 =back
 
@@ -2833,29 +4574,49 @@ B<>
 
 =over 4
 
-=item * B<getCompletionStatus>($part): ($part defaults to 0.) A convenience function that returns a symbolic constant telling you about the completion status of the part, with the following possible results:
+=item * B<getCompletionStatus>($part):
+
+($part defaults to 0.) A convenience function that returns a symbolic
+constant telling you about the completion status of the part, with the
+following possible results:
 
-=back 
+=back
 
 B<Completion Codes>
 
 =over 4
 
-=item * B<NOT_ATTEMPTED>: Has not been attempted at all.
+=item * B<NOT_ATTEMPTED>:
+
+Has not been attempted at all.
+
+=item * B<INCORRECT>:
+
+Attempted, but wrong by student.
+
+=item * B<INCORRECT_BY_OVERRIDE>:
+
+Attempted, but wrong by instructor override.
 
-=item * B<INCORRECT>: Attempted, but wrong by student.
+=item * B<CORRECT>:
 
-=item * B<INCORRECT_BY_OVERRIDE>: Attempted, but wrong by instructor override.
+Correct or correct by instructor.
 
-=item * B<CORRECT>: Correct or correct by instructor.
+=item * B<CORRECT_BY_OVERRIDE>:
 
-=item * B<CORRECT_BY_OVERRIDE>: Correct by instructor override.
+Correct by instructor override.
 
-=item * B<EXCUSED>: Excused. Not yet implemented.
+=item * B<EXCUSED>:
 
-=item * B<NETWORK_FAILURE>: Information not available due to network failure.
+Excused. Not yet implemented.
 
-=item * B<ATTEMPTED>: Attempted, and not yet graded.
+=item * B<NETWORK_FAILURE>:
+
+Information not available due to network failure.
+
+=item * B<ATTEMPTED>:
+
+Attempted, and not yet graded.
 
 =back
 
@@ -2871,13 +4632,17 @@ sub ATTEMPTED             { return 16; }
 
 sub getCompletionStatus {
     my $self = shift;
+    my $part = shift;
     return $self->NETWORK_FAILURE if ($self->{NAV_MAP}->{NETWORK_FAILURE});
 
-    my $status = $self->queryRestoreHash('solved', shift);
+    my $status = $self->queryRestoreHash('solved', $part);
 
-    # Left as seperate if statements in case we ever do more with this
+    # Left as separate if statements in case we ever do more with this
     if ($status eq 'correct_by_student') {return $self->CORRECT;}
-    if ($status eq 'correct_by_override') {return $self->CORRECT_BY_OVERRIDE; }
+    if ($status eq 'correct_by_scantron') {return $self->CORRECT;}
+    if ($status eq 'correct_by_override') {
+	return $self->CORRECT_BY_OVERRIDE;
+    }
     if ($status eq 'incorrect_attempted') {return $self->INCORRECT; }
     if ($status eq 'incorrect_by_override') {return $self->INCORRECT_BY_OVERRIDE; }
     if ($status eq 'excused') {return $self->EXCUSED; }
@@ -2889,7 +4654,7 @@ sub queryRestoreHash {
     my $self = shift;
     my $hashentry = shift;
     my $part = shift;
-    $part = "0" if (!defined($part));
+    $part = "0" if (!defined($part) || $part eq '');
     return $self->NETWORK_FAILURE if ($self->{NAV_MAP}->{NETWORK_FAILURE});
 
     $self->getReturnHash();
@@ -2901,39 +4666,87 @@ sub queryRestoreHash {
 
 B<Composite Status>
 
-Along with directly returning the date or completion status, the resource object includes a convenience function B<status>() that will combine the two status tidbits into one composite status that can represent the status of the resource as a whole. The precise logic is documented in the comments of the status method. The following results may be returned, all available as methods on the resource object ($res->NETWORK_FAILURE):
+Along with directly returning the date or completion status, the
+resource object includes a convenience function B<status>() that will
+combine the two status tidbits into one composite status that can
+represent the status of the resource as a whole. This method represents
+the concept of the thing we want to display to the user on the nav maps
+screen, which is a combination of completion and open status. The precise logic is
+documented in the comments of the status method. The following results
+may be returned, all available as methods on the resource object
+($res->NETWORK_FAILURE): In addition to the return values that match
+the date or completion status, this function can return "ANSWER_SUBMITTED"
+if that problemstatus parameter value is set to No, suppressing the
+incorrect/correct feedback.
 
 =over 4
 
-=item * B<NETWORK_FAILURE>: The network has failed and the information is not available.
+=item * B<NETWORK_FAILURE>:
+
+The network has failed and the information is not available.
+
+=item * B<NOTHING_SET>:
+
+No dates have been set for this problem (part) at all. (Because only
+certain parts of a multi-part problem may be assigned, this can not be
+collapsed into "open later", as we do not know a given part will EVER
+be opened. For single part, this is the same as "OPEN_LATER".)
+
+=item * B<CORRECT>:
 
-=item * B<NOTHING_SET>: No dates have been set for this problem (part) at all. (Because only certain parts of a multi-part problem may be assigned, this can not be collapsed into "open later", as we don't know a given part will EVER be opened. For single part, this is the same as "OPEN_LATER".)
+For any reason at all, the part is considered correct.
 
-=item * B<CORRECT>: For any reason at all, the part is considered correct.
+=item * B<EXCUSED>:
 
-=item * B<EXCUSED>: For any reason at all, the problem is excused.
+For any reason at all, the problem is excused.
 
-=item * B<PAST_DUE_NO_ANSWER>: The problem is past due, not considered correct, and no answer date is set.
+=item * B<PAST_DUE_NO_ANSWER>:
 
-=item * B<PAST_DUE_ANSWER_LATER>: The problem is past due, not considered correct, and an answer date in the future is set.
+The problem is past due, not considered correct, and no answer date is
+set.
 
-=item * B<ANSWER_OPEN>: The problem is past due, not correct, and the answer is now available.
+=item * B<PAST_DUE_ANSWER_LATER>:
 
-=item * B<OPEN_LATER>: The problem is not yet open.
+The problem is past due, not considered correct, and an answer date in
+the future is set.
 
-=item * B<TRIES_LEFT>: The problem is open, has been tried, is not correct, but there are tries left.
+=item * B<ANSWER_OPEN>:
 
-=item * B<INCORRECT>: The problem is open, and all tries have been used without getting the correct answer.
+The problem is past due, not correct, and the answer is now available.
 
-=item * B<OPEN>: The item is open and not yet tried.
+=item * B<OPEN_LATER>:
 
-=item * B<ATTEMPTED>: The problem has been attempted.
+The problem is not yet open.
+
+=item * B<TRIES_LEFT>:
+
+The problem is open, has been tried, is not correct, but there are
+tries left.
+
+=item * B<INCORRECT>:
+
+The problem is open, and all tries have been used without getting the
+correct answer.
+
+=item * B<OPEN>:
+
+The item is open and not yet tried.
+
+=item * B<ATTEMPTED>:
+
+The problem has been attempted.
+
+=item * B<ANSWER_SUBMITTED>:
+
+An answer has been submitted, but the student should not see it.
 
 =back
 
 =cut
 
-sub TRIES_LEFT { return 10; }
+sub TRIES_LEFT       { return 20; }
+sub ANSWER_SUBMITTED { return 21; }
+sub PARTIALLY_CORRECT{ return 22; }
 
 sub status {
     my $self = shift;
@@ -2946,12 +4759,35 @@ sub status {
     # dimension and 5 entries on the other, which we want to colorize,
     # plus network failure and "no date data at all".
 
+    #if ($self->{RESOURCE_ERROR}) { return NETWORK_FAILURE; }
     if ($completionStatus == NETWORK_FAILURE) { return NETWORK_FAILURE; }
 
+    my $suppressFeedback = $self->problemstatus($part) eq 'no';
+    # If there's an answer date and we're past it, don't
+    # suppress the feedback; student should know
+    if ($self->duedate($part) && $self->duedate($part) < time() &&
+	$self->answerdate($part) && $self->answerdate($part) < time()) {
+	$suppressFeedback = 0;
+    }
+
     # There are a few whole rows we can dispose of:
     if ($completionStatus == CORRECT ||
         $completionStatus == CORRECT_BY_OVERRIDE ) {
-        return CORRECT; 
+	if ( $suppressFeedback ) { return ANSWER_SUBMITTED }
+	my $awarded=$self->awarded($part);
+	if ($awarded < 1 && $awarded > 0) {
+            return PARTIALLY_CORRECT;
+	} elsif ($awarded<1) {
+	    return INCORRECT;
+	}
+	return CORRECT; 
+    }
+
+    # If it's WRONG... and not open
+    if ( ($completionStatus == INCORRECT || 
+	  $completionStatus == INCORRECT_BY_OVERRIDE)
+	 && (!$self->opendate($part) ||  $self->opendate($part) > time()) ) {
+	return INCORRECT;
     }
 
     if ($completionStatus == ATTEMPTED) {
@@ -2972,7 +4808,7 @@ sub status {
 
     if ($dateStatus == PAST_DUE_ANSWER_LATER ||
         $dateStatus == PAST_DUE_NO_ANSWER ) {
-        return $dateStatus; 
+        return $suppressFeedback ? ANSWER_SUBMITTED : $dateStatus; 
     }
 
     if ($dateStatus == ANSWER_OPEN) {
@@ -2990,24 +4826,166 @@ sub status {
     if ($completionStatus == INCORRECT || $completionStatus == INCORRECT_BY_OVERRIDE) {
         # and there are TRIES LEFT:
         if ($self->tries($part) < $self->maxtries($part) || !$self->maxtries($part)) {
-            return TRIES_LEFT;
+            return $suppressFeedback ? ANSWER_SUBMITTED : TRIES_LEFT;
         }
-        return INCORRECT; # otherwise, return orange; student can't fix this
+        return $suppressFeedback ? ANSWER_SUBMITTED : INCORRECT; # otherwise, return orange; student can't fix this
     }
 
     # Otherwise, it's untried and open
     return OPEN; 
 }
 
+sub CLOSED { return 23; }
+sub ERROR { return 24; }
+
+=pod
+
+B<Simple Status>
+
+Convenience method B<simpleStatus> provides a "simple status" for the resource.
+"Simple status" corresponds to "which icon is shown on the
+Navmaps". There are six "simple" statuses:
+
+=over 4
+
+=item * B<CLOSED>: The problem is currently closed. (No icon shown.)
+
+=item * B<OPEN>: The problem is open and unattempted.
+
+=item * B<CORRECT>: The problem is correct for any reason.
+
+=item * B<INCORRECT>: The problem is incorrect and can still be
+completed successfully.
+
+=item * B<ATTEMPTED>: The problem has been attempted, but the student
+does not know if they are correct. (The ellipsis icon.)
+
+=item * B<ERROR>: There is an error retrieving information about this
+problem.
+
+=back
+
+=cut
+
+# This hash maps the composite status to this simple status, and
+# can be used directly, if you like
+my %compositeToSimple = 
+    (
+      NETWORK_FAILURE()       => ERROR,
+      NOTHING_SET()           => CLOSED,
+      CORRECT()               => CORRECT,
+      PARTIALLY_CORRECT()     => PARTIALLY_CORRECT,
+      EXCUSED()               => CORRECT,
+      PAST_DUE_NO_ANSWER()    => INCORRECT,
+      PAST_DUE_ANSWER_LATER() => INCORRECT,
+      ANSWER_OPEN()           => INCORRECT,
+      OPEN_LATER()            => CLOSED,
+      TRIES_LEFT()            => OPEN,
+      INCORRECT()             => INCORRECT,
+      OPEN()                  => OPEN,
+      ATTEMPTED()             => ATTEMPTED,
+      ANSWER_SUBMITTED()      => ATTEMPTED
+     );
+
+sub simpleStatus {
+    my $self = shift;
+    my $part = shift;
+    my $status = $self->status($part);
+    return $compositeToSimple{$status};
+}
+
+=pod
+
+B<simpleStatusCount> will return an array reference containing, in
+this order, the number of OPEN, CLOSED, CORRECT, INCORRECT, ATTEMPTED,
+and ERROR parts the given problem has.
+
+=cut
+    
+# This maps the status to the slot we want to increment
+my %statusToSlotMap = 
+    (
+     OPEN()      => 0,
+     CLOSED()    => 1,
+     CORRECT()   => 2,
+     INCORRECT() => 3,
+     ATTEMPTED() => 4,
+     ERROR()     => 5
+     );
+
+sub statusToSlot { return $statusToSlotMap{shift()}; }
+
+sub simpleStatusCount {
+    my $self = shift;
+
+    my @counts = (0, 0, 0, 0, 0, 0, 0);
+    foreach my $part (@{$self->parts()}) {
+	$counts[$statusToSlotMap{$self->simpleStatus($part)}]++;
+    }
+
+    return \@counts;
+}
+
+=pod
+
+B<Completable>
+
+The completable method represents the concept of I<whether the student can
+currently do the problem>. If the student can do the problem, which means
+that it is open, there are tries left, and if the problem is manually graded
+or the grade is suppressed via problemstatus, the student has not tried it
+yet, then the method returns 1. Otherwise, it returns 0, to indicate that 
+either the student has tried it and there is no feedback, or that for
+some reason it is no longer completable (not open yet, successfully completed,
+out of tries, etc.). As an example, this is used as the filter for the
+"Uncompleted Homework" option for the nav maps.
+
+If this does not quite meet your needs, do not fiddle with it (unless you are
+fixing it to better match the student's conception of "completable" because
+it's broken somehow)... make a new method.
+
+=cut
+
+sub completable {
+    my $self = shift;
+    if (!$self->is_problem()) { return 0; }
+    my $partCount = $self->countParts();
+
+    foreach my $part (@{$self->parts()}) {
+        if ($part eq '0' && $partCount != 1) { next; }
+        my $status = $self->status($part);
+        # "If any of the parts are open, or have tries left (implies open),
+        # and it is not "attempted" (manually graded problem), it is
+        # not "complete"
+	if ($self->getCompletionStatus($part) == ATTEMPTED() ||
+	    $status == ANSWER_SUBMITTED() ) {
+	    # did this part already, as well as we can
+	    next;
+	}
+	if ($status == OPEN() || $status == TRIES_LEFT()) {
+	    return 1;
+	}
+    }
+        
+    # If all the parts were complete, so was this problem.
+    return 0;
+}
+
 =pod
 
 =head2 Resource/Nav Map Navigation
 
 =over 4
 
-=item * B<getNext>(): Retreive an array of the possible next resources after this one. Always returns an array, even in the one- or zero-element case. 
+=item * B<getNext>():
+
+Retreive an array of the possible next resources after this
+one. Always returns an array, even in the one- or zero-element case.
+
+=item * B<getPrevious>():
 
-=item * B<getPrevious>(): Retreive an array of the possible previous resources from this one. Always returns an array, even in the one- or zero-element case. 
+Retreive an array of the possible previous resources from this
+one. Always returns an array, even in the one- or zero-element case.
 
 =cut
 
@@ -3017,6 +4995,7 @@ sub getNext {
     my $to = $self->to();
     foreach my $branch ( split(/,/, $to) ) {
         my $choice = $self->{NAV_MAP}->getById($branch);
+        #if (!$choice->condition()) { next; }
         my $next = $choice->goesto();
         $next = $self->{NAV_MAP}->getById($next);
 
@@ -3045,7 +5024,8 @@ sub browsePriv {
         return $self->{BROWSE_PRIV};
     }
 
-    $self->{BROWSE_PRIV} = &Apache::lonnet::allowed('bre', $self->src());
+    $self->{BROWSE_PRIV} = &Apache::lonnet::allowed('bre',$self->src(),
+						    $self->symb());
 }
 
 =pod