--- loncom/interface/lonnavmaps.pm	2005/12/29 18:12:36	1.349.2.4
+++ loncom/interface/lonnavmaps.pm	2006/02/10 22:35:24	1.349.2.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.349.2.4 2005/12/29 18:12:36 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.349.2.6 2006/02/10 22:35:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -530,9 +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
-	    && $res->handgrade($part) ne 'yes')) {
+    if (($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT)
+	&& $res->handgrade($part) ne 'yes') {
         return &mt("Answer available");
     }
     if ($status == $res->EXCUSED) {
@@ -3642,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\|]+)\&/);