--- loncom/interface/lonnavmaps.pm	2002/11/14 16:47:13	1.104
+++ loncom/interface/lonnavmaps.pm	2002/11/15 17:30:33	1.107
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.104 2002/11/14 16:47:13 bowersj2 Exp $
+# $Id: lonnavmaps.pm,v 1.107 2002/11/15 17:30:33 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,15 +37,13 @@
 # 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
 
 package Apache::lonnavmaps;
 
 use strict;
 use Apache::Constants qw(:common :http);
-use Apache::lonnet();
 use Apache::loncommon();
-use GDBM_File;
 use POSIX qw (floor strftime);
 
 sub handler {
@@ -73,7 +71,7 @@ sub handler {
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
 
-    # Create the nav map the nav map
+    # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new(
                         $ENV{"request.course.fn"}.".db",
                         $ENV{"request.course.fn"}."_parms.db", 1, 1);
@@ -437,11 +435,7 @@ sub handler {
                     'symb='.&Apache::lonnet::escape($curRes->symb()).
                     '"';
 
-                my $title = $curRes->title();
-                if (!$title) {
-                    $title = $curRes->src();
-                    $title = substr ($title, rindex($title, "/") + 1);
-                }
+                my $title = $curRes->compTitle();
                 my $partLabel = "";
                 my $newBranchText = "";
 
@@ -532,6 +526,7 @@ sub handler {
                 }
 
                 $r->print("  ${newBranchText}${linkopen}$icon${linkclose}\n");
+                #$r->print($curRes->awarded($part));
 
                 my $curMarkerBegin = "";
                 my $curMarkerEnd = "";
@@ -1289,6 +1284,11 @@ 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;
@@ -1331,6 +1331,8 @@ sub new {
 
     my $maxDepth = 0; # tracks max depth
 
+    # **1**
+
     foreach my $pass (@iterations) {
         my $direction = $pass->[0];
         my $valName = $pass->[1];
@@ -1356,12 +1358,12 @@ sub new {
                 my $nextResources = $curRes->$nextResourceMethod();
                 my $resourceCount = scalar(@{$nextResources});
 
-                if ($resourceCount == 1) {
+                if ($resourceCount == 1) { # **3**
                     my $current = $nextResources->[0]->{DATA}->{$valName} || 999999999;
                     $nextResources->[0]->{DATA}->{$valName} = min($resultingVal, $current);
                 }
                 
-                if ($resourceCount > 1) {
+                if ($resourceCount > 1) { # **4**
                     foreach my $res (@{$nextResources}) {
                         my $current = $res->{DATA}->{$valName} || 999999999;
                         $res->{DATA}->{$valName} = min($current, $resultingVal + 1);
@@ -1369,7 +1371,7 @@ sub new {
                 }
             }
             
-            # Assign the final val
+            # Assign the final val (**2**)
             if (ref($curRes) && $direction == BACKWARD()) {
                 my $finalDepth = min($curRes->{DATA}->{TOP_DOWN_VAL},
                                      $curRes->{DATA}->{BOT_UP_VAL});
@@ -1391,7 +1393,7 @@ sub new {
         push @{$self->{STACK}}, [];
     }
 
-    # Prime the recursion w/ the first resource
+    # Prime the recursion w/ the first resource **5**
     push @{$self->{STACK}->[0]}, $self->{FIRST_RESOURCE};
     $self->{ALREADY_SEEN}->{$self->{FIRST_RESOURCE}->{ID}} = 1;
 
@@ -1440,8 +1442,8 @@ sub next {
     my $newDepth;
     my $here;
     while ( $i >= 0 && !$found ) {
-        if ( scalar(@{$self->{STACK}->[$i]}) > 0 ) {
-            $here = pop @{$self->{STACK}->[$i]};
+        if ( scalar(@{$self->{STACK}->[$i]}) > 0 ) { # **6**
+            $here = pop @{$self->{STACK}->[$i]}; # **7**
             $found = 1;
             $newDepth = $i;
         }
@@ -1461,7 +1463,7 @@ sub next {
 
     # If this is not a resource, it must be an END_BRANCH marker we want
     # to return directly.
-    if (!ref($here)) {
+    if (!ref($here)) { # **8**
         if ($here == END_BRANCH()) { # paranoia, in case of later extension
             $self->{CURRENT_DEPTH}--;
             return $here;
@@ -1509,7 +1511,7 @@ sub next {
     # one level lower. Thus, this is the end of the branch, since there are no
     # more resources added to this level or above.
     my $isEndOfBranch = $maxDepthAdded < $self->{CURRENT_DEPTH};
-    if ($isEndOfBranch) {
+    if ($isEndOfBranch) { # **9**
         push @{$self->{STACK}->[$self->{CURRENT_DEPTH}]}, END_BRANCH();
     }
 
@@ -1784,6 +1786,8 @@ These are methods that help you retrieve
 
 =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<ext>: Returns true if the resource is external.
 
 =item * B<goesto>: Returns the "goesto" value from the compiled nav map. (It is likely you want to use B<getNext> instead.)
@@ -1833,7 +1837,15 @@ sub symb {
 }
 sub title { my $self=shift; return $self->navHash("title_", 1); }
 sub to { my $self=shift; return $self->navHash("to_", 1); }
-
+sub compTitle {
+    my $self = shift;
+    my $title = $self->title();
+    if (!$title) {
+        $title = $self->src();
+        $title = substr($title, rindex($title, '/') + 1);
+    }
+    return $title;
+}
 =pod
 
 B<Predicate Testing the Resource>
@@ -1993,6 +2005,10 @@ sub answerdate {
     }
     return $self->parmval("answerdate", $part);
 }
+sub awarded {
+    (my $self, my $part) = @_;
+    return $self->parmval("awarded", $part);
+}
 sub duedate {
     (my $self, my $part) = @_;
     return $self->parmval("duedate", $part);