Changeset 13589

Timestamp:

May 31, 2007, 7:42:14 PM (19 years ago)

Author:

eugene

Message:

allow base to not include a leading /

File:

• trunk/PS-IPP-Config/lib/PS/IPP/Config.pm (modified) (2 diffs)

trunk/PS-IPP-Config/lib/PS/IPP/Config.pm

@@ -1 +1 @@
 # Copyright (c) 2006  Paul Price, Joshua Hoblitt
 #
-# $Id: Config.pm,v 1.51 2007-06-01 01:00:26 price Exp $
+# $Id: Config.pm,v 1.52 2007-06-01 05:42:14 eugene Exp $
 
 package PS::IPP::Config;
@@ -166 +166 @@
 sub caturi
 {
-    my $base = shift;           # Base name (might be "path://SOMETHING" or "neb://SOMETHING")
+    my $base = shift;           # Base name (might be "foo /foo path://SOMETHING" or "neb://SOMETHING")
     my @segments = @_;          # Path segments
 
+    carp "base is not inited" if not defined $base;
     my ($scheme) = $base =~ m|^(\S+):|; # The scheme, e.g., file://, path://
     $base =~ s|^\S+:/*||;
-    my $root = '/' if $base =~ m|^/|; # Any root slashes?
+
+    my $root = '';
+    if ($base =~ m|^/|) { $root = '/'; }
 
     unshift @segments, $base if $base =~ /\S+/;