--- loncom/interface/lonnavmaps.pm	2006/01/12 23:35:55	1.358
+++ loncom/interface/lonnavmaps.pm	2006/02/10 22:33:45	1.359
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.358 2006/01/12 23:35:55 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.359 2006/02/10 22:33:45 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3658,9 +3658,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\|]+)\&/);