[LON-CAPA-cvs] cvs: loncom(version_2_1_X) /interface lonnavmaps.pm

[albertel]

albertel		Fri Feb 10 17:35:26 2006 EDT

  Modified files:              (Branch: version_2_1_X)
    /loncom/interface	lonnavmaps.pm 
  Log:
  - backport 1.359
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.349.2.5 loncom/interface/lonnavmaps.pm:1.349.2.6
--- loncom/interface/lonnavmaps.pm:1.349.2.5	Thu Dec 29 13:50:35 2005
+++ loncom/interface/lonnavmaps.pm	Fri Feb 10 17:35:24 2006
@@ -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.6 2006/02/10 22:35:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3641,9 +3641,8 @@
 }
 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\|]+)\&/);