--- loncom/interface/lonnavmaps.pm	2005/12/05 21:37:19	1.349.2.2
+++ loncom/interface/lonnavmaps.pm	2006/05/15 23:51:34	1.349.2.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.349.2.2 2005/12/05 21:37:19 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.349.2.9 2006/05/15 23:51:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -57,7 +57,7 @@ my %statusIconMap =
      $resObj->CLOSED       => '',
      $resObj->OPEN         => 'navmap.open.gif',
      $resObj->CORRECT      => 'navmap.correct.gif',
-     $resObj->PARTIALLY_CORRECT      => 'navmap.ellipsis.gif',
+     $resObj->PARTIALLY_CORRECT      => 'navmap.partial.gif',
      $resObj->INCORRECT    => 'navmap.wrong.gif',
      $resObj->ATTEMPTED    => 'navmap.ellipsis.gif',
      $resObj->ERROR        => ''
@@ -530,7 +530,8 @@ sub getDescription {
     if ($status == $res->PAST_DUE_NO_ANSWER) {
         return &mt("Was due")." " . timeToHumanString($res->duedate($part),'end');
     }
-    if ($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT) {
+    if (($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT)
+	&& $res->handgrade($part) ne 'yes') {
         return &mt("Answer available");
     }
     if ($status == $res->EXCUSED) {
@@ -2265,6 +2266,25 @@ sub get_user_data {
     $self->{RETRIEVED_USER_DATA} = 1;
 }
 
+sub get_discussion_data {
+    my $self = shift;
+    if ($self->{RETRIEVED_DISCUSSION_DATA}) {
+         return  $self->{DISCUSSION_DATA};
+    }
+                                                                                
+    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::dump($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 {
@@ -2482,7 +2502,7 @@ sub parmval_real {
     my $result='';
 
     my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb);
-
+    $mapname = &Apache::lonnet::deversion($mapname);
 # ----------------------------------------------------- Cascading lookup scheme
     my $rwhat=$what;
     $what=~s/^parameter\_//;
@@ -3621,9 +3641,8 @@ sub condition {
 }
 sub condval {
     my $self=shift;
-    my $uri=&Apache::lonnet::deversion(&Apache::lonnet::declutter($self->src()));
-    my ($pathname,$filename)=($uri=~m|(.*)/([^/]*)|);
-    $pathname=~s/^adm\/wrapper\///;    
+    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\|]+)\&/);
@@ -3709,7 +3728,6 @@ sub contains_problem {
 }
 sub is_sequence {
     my $self=shift;
-    my $src = $self->src();
     return $self->navHash("is_map_", 1) && 
 	$self->navHash("map_type_" . $self->map_pc()) eq 'sequence';
 }
@@ -3779,7 +3797,7 @@ Returns a string with the type of the ma
 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;
@@ -3792,7 +3810,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;