--- loncom/interface/lonnavmaps.pm	2010/09/13 03:07:56	1.440.2.2
+++ loncom/interface/lonnavmaps.pm	2009/12/27 01:31:05	1.441
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.440.2.2 2010/09/13 03:07:56 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.441 2009/12/27 01:31:05 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -699,11 +699,7 @@ sub getDescription {
         return &mt("Excused by instructor");
     }
     if ($status == $res->ATTEMPTED) {
-        if ($res->src() eq '/res/gci/gci/internal/submission.problem') {
-            return &mt('Question(s) submitted for review');
-        } else {
-            return &mt("Answer submitted, not yet graded");
-        }
+        return &mt("Answer submitted, not yet graded");
     }
     if ($status == $res->TRIES_LEFT) {
         my $tries = $res->tries($part);
@@ -723,11 +719,7 @@ sub getDescription {
         }
     }
     if ($status == $res->ANSWER_SUBMITTED) {
-        if ($res->src() eq '/res/gci/gci/internal/submission.problem') {
-            return &mt('Question(s) submitted for review');
-        } else {
-            return &mt('Answer submitted');
-        }
+        return &mt('Answer submitted');
     }
 }
 
@@ -2385,7 +2377,7 @@ resource object.
 Based on the symb of the resource, get a resource object for that
 resource. This is one of the proper ways to get a resource object.
 
-=item * B<getByMapPc>(map_pc):
+=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.
@@ -3540,7 +3532,11 @@ sub navHash {
     my $self = shift;
     my $param = shift;
     my $id = shift;
-    return $self->{NAV_MAP}->navhash($param . ($id?$self->{ID}:""));
+    my $arg = $param . ($id?$self->{ID}:"");
+    if (defined($arg)) {
+        return $self->{NAV_MAP}->navhash($arg);
+    }
+    return;
 }
 
 =pod
@@ -3879,12 +3875,6 @@ resource of the map.
 
 Returns a string with the type of the map in it.
 
-=item *B<map_hierarchy>:
-
-Returns a string with a comma-separated ordered list of map_pc IDs
-for the hierarchy of maps containing a map, with the top level
-map first, then descending to deeper levels, with the enclosing map last.
-
 =back
 
 =cut
@@ -3915,11 +3905,6 @@ sub map_type {
     my $pc = $self->map_pc();
     return $self->navHash("map_type_$pc", 0);
 }
-sub map_hierarchy {
-    my $self = shift;
-    my $pc = $self->map_pc();
-    return $self->navHash("map_hierarchy_$pc", 0);
-}
 
 #####
 # Property queries