--- loncom/interface/lonnavmaps.pm	2002/11/15 17:30:33	1.107
+++ loncom/interface/lonnavmaps.pm	2002/11/15 20:12:11	1.110
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.107 2002/11/15 17:30:33 bowersj2 Exp $
+# $Id: lonnavmaps.pm,v 1.110 2002/11/15 20:12:11 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -113,10 +113,22 @@ sub handler {
         $condition = 1;
     }
 
+    my $currenturl = $ENV{'form.postdata'};
+    $currenturl=~s/^http\:\/\///;
+    $currenturl=~s/^[^\/]+//;
+
+    # alreadyHere allows us to only open the maps necessary to view
+    # the current location once, while at the same time remembering
+    # the current location. Without that check, the user would never
+    # be able to close those maps; the user would close it, and the
+    # currenturl scan would re-open it.
+    my $queryAdd = "postdata=" . &Apache::lonnet::escape($currenturl) .
+        "&alreadyHere=1";
+
     if ($condition) {
-        $r->print('<a href="navmaps?condition=0&filter=">Close All Folders</a>');
+        $r->print("<a href=\"navmaps?condition=0&filter=&$queryAdd\">Close All Folders</a>");
     } else {
-        $r->print('<a href="navmaps?condition=1&filter=">Open All Folders</a>');
+        $r->print("<a href=\"navmaps?condition=1&filter=&$queryAdd\">Open All Folders</a>");
     }
 
     $r->print('<br>&nbsp;');
@@ -193,18 +205,6 @@ sub handler {
     my $topResource = $navmap->getById("0.0");
     my $inlineTopLevelMaps = $topResource->src() =~ m|^/uploaded/.*default\.sequence$|;
 
-    my $currenturl = $ENV{'form.postdata'};
-    $currenturl=~s/^http\:\/\///;
-    $currenturl=~s/^[^\/]+//;
-
-    # alreadyHere allows us to only open the maps necessary to view
-    # the current location once, while at the same time remembering
-    # the current location. Without that check, the user would never
-    # be able to close those maps; the user would close it, and the
-    # currenturl scan would re-open it.
-    my $queryAdd = "postdata=" . &Apache::lonnet::escape($currenturl) .
-        "&alreadyHere=1";
-
     # Begin the HTML table
     # four cols: resource + indent, chat+feedback, icon, text string
     $r->print('<table cellspacing="0" cellpadding="3" border="0" bgcolor="#FFFFFF">' ."\n");
@@ -526,7 +526,6 @@ sub handler {
                 }
 
                 $r->print("  ${newBranchText}${linkopen}$icon${linkclose}\n");
-                #$r->print($curRes->awarded($part));
 
                 my $curMarkerBegin = "";
                 my $curMarkerEnd = "";
@@ -2005,10 +2004,7 @@ sub answerdate {
     }
     return $self->parmval("answerdate", $part);
 }
-sub awarded {
-    (my $self, my $part) = @_;
-    return $self->parmval("awarded", $part);
-}
+sub awarded { my $self = shift; return $self->queryRestoreHash('awarded', shift); }
 sub duedate {
     (my $self, my $part) = @_;
     return $self->parmval("duedate", $part);
@@ -2033,24 +2029,18 @@ sub tol {
     (my $self, my $part) = @_;
     return $self->parmval("tol", $part);
 }
-sub tries {
-    my $self = shift;
-    my $part = shift;
-    $part = '0' if (!defined($part));
-
-    # Make sure return hash is loaded, should error check
-    $self->getReturnHash();
-    
-    my $tries = $self->{RETURN_HASH}->{'resource.'.$part.'.tries'};
-    if (!defined($tries)) {return '0';}
+sub tries { 
+    my $self = shift; 
+    my $tries = $self->queryRestoreHash('tries', shift);
+    if (!defined($tries)) { return '0';}
     return $tries;
 }
 sub type {
     (my $self, my $part) = @_;
     return $self->parmval("type", $part);
 }
-sub weight {
-    (my $self, my $part) = @_;
+sub weight { 
+    my $self = shift; my $part = shift;
     return $self->parmval("weight", $part);
 }
 
@@ -2312,14 +2302,9 @@ sub ATTEMPTED             { return 16; }
 
 sub getCompletionStatus {
     my $self = shift;
-    my $part = shift;
-    $part = "0" if (!defined($part));
     return $self->NETWORK_FAILURE if ($self->{NAV_MAP}->{NETWORK_FAILURE});
 
-    # Make sure return hash exists
-    $self->getReturnHash();
-    
-    my $status = $self->{RETURN_HASH}->{'resource.'.$part.'.solved'};
+    my $status = $self->queryRestoreHash('solved', shift);
 
     # Left as seperate if statements in case we ever do more with this
     if ($status eq 'correct_by_student') {return $self->CORRECT;}
@@ -2331,6 +2316,18 @@ sub getCompletionStatus {
     return $self->NOT_ATTEMPTED;
 }
 
+sub queryRestoreHash {
+    my $self = shift;
+    my $hashentry = shift;
+    my $part = shift;
+    $part = "0" if (!defined($part));
+    return $self->NETWORK_FAILURE if ($self->{NAV_MAP}->{NETWORK_FAILURE});
+
+    $self->getReturnHash();
+
+    return $self->{RETURN_HASH}->{'resource.'.$part.'.'.$hashentry};
+}
+
 =pod
 
 B<Composite Status>