--- loncom/interface/lonnavmaps.pm	2005/12/29 18:50:35	1.349.2.5
+++ loncom/interface/lonnavmaps.pm	2006/05/11 21:55:37	1.349.2.7
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.349.2.5 2005/12/29 18:50:35 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.349.2.7 2006/05/11 21:55:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3641,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\|]+)\&/);
@@ -3729,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';
 }
@@ -3799,20 +3797,20 @@ 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::deversion(&Apache::lonnet::clutter($src));
     my $res = $self->navHash("map_finish_$src", 0);
     $res = $self->{NAV_MAP}->getById($res);
     return $res;
 }
 sub map_pc {
     my $self = shift;
-    my $src = $self->src();
+    my $src = &Apache::lonnet::deversion($self->src());
     return $self->navHash("map_pc_$src", 0);
 }
 sub map_start {
     my $self = shift;
     my $src = $self->src();
-    $src = Apache::lonnet::clutter($src);
+    $src = &Apache::lonnet::deversion(&Apache::lonnet::clutter($src));
     my $res = $self->navHash("map_start_$src", 0);
     $res = $self->{NAV_MAP}->getById($res);
     return $res;