--- loncom/interface/lonnavmaps.pm	2010/02/10 16:45:31	1.423.2.3
+++ loncom/interface/lonnavmaps.pm	2009/09/23 14:30:45	1.423.4.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.423.2.3 2010/02/10 16:45:31 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.423.4.2 2009/09/23 14:30:45 gci Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -597,7 +597,7 @@ sub getLinkForResource {
 	    my ($map,$id,$src)=&Apache::lonnet::decode_symb($res->symb());
 	    if ($map=~/\.page$/) {
 		my $url=&Apache::lonnet::clutter($map);
-                $anchor=&escape($res->shown_symb());
+		$anchor=&escape($src->shown_symb());
 		return ($url,$res->shown_symb(),$anchor);
 	    }
         }
@@ -695,7 +695,11 @@ sub getDescription {
         return &mt("Excused by instructor");
     }
     if ($status == $res->ATTEMPTED) {
-        return &mt("Answer submitted, not yet graded");
+        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");
+        }
     }
     if ($status == $res->TRIES_LEFT) {
         my $tries = $res->tries($part);
@@ -715,7 +719,11 @@ sub getDescription {
         }
     }
     if ($status == $res->ANSWER_SUBMITTED) {
-        return &mt('Answer submitted');
+        if ($res->src() eq '/res/gci/gci/internal/submission.problem') {
+            return &mt('Question(s) submitted for review');
+        } else {
+            return &mt('Answer submitted');
+        }
     }
 }
 
@@ -880,6 +888,11 @@ sub render_resource {
     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"};
@@ -3498,11 +3511,7 @@ sub navHash {
     my $self = shift;
     my $param = shift;
     my $id = shift;
-    my $arg = $param . ($id?$self->{ID}:"");
-    if (defined($arg)) {
-        return $self->{NAV_MAP}->navhash($arg);
-    }
-    return;
+    return $self->{NAV_MAP}->navhash($param . ($id?$self->{ID}:""));
 }
 
 =pod