--- loncom/interface/lonnavmaps.pm	2006/01/12 23:35:55	1.358
+++ loncom/interface/lonnavmaps.pm	2006/02/14 15:58:47	1.360
@@ -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.360 2006/02/14 15:58:47 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\|]+)\&/);
@@ -3761,6 +3760,11 @@ sub is_survey {
     }
     return 0;
 }
+sub is_task {
+    my $self=shift;
+    my $src = $self->src();
+    return ($src =~ /\.(task)$/)
+}
 
 sub is_empty_sequence {
     my $self=shift;
@@ -4274,7 +4278,8 @@ sub extractParts {
         # where the part names begin and end, and even then, it is possible
         # to construct ambiguous situations.
         foreach (split /,/, $metadata) {
-            if ($_ =~ /^([a-zA-Z]+)response_(.*)/) {
+            if ($_ =~ /^([a-zA-Z]+)response_(.*)/
+		|| $_ =~ /^(Task)_(.*)/) {
                 my $responseType = $1;
                 my $partStuff = $2;
                 my $partIdSoFar = '';