Changeset 14792

Timestamp:

Sep 7, 2007, 11:29:50 AM (19 years ago)

Author:

Paul Price

Message:

Also needed to change the stripping of the scheme off the filename.

File:

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

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

@@ -1 +1 @@
 # Copyright (c) 2006  Paul Price, Joshua Hoblitt
 #
-# $Id: Config.pm,v 1.67 2007-09-07 21:21:19 price Exp $
+# $Id: Config.pm,v 1.68 2007-09-07 21:29:50 price Exp $
 
 package PS::IPP::Config;
@@ -196 +196 @@
     carp "base is not inited" if not defined $base;
     my $scheme = file_scheme($base); # The scheme, e.g., file://, path://
-    $base =~ s|^\S+:/*||;
+    $base =~ s|^$scheme:/*||;
 
     my $root = '';
@@ -285 +285 @@
 
     if ($scheme eq 'neb') {
-        $name =~ s|^(\S+):/*||;
+        $name =~ s|^neb:/*||;
         $self->_neb_start();
         my $neb = $self->{nebulous}; # Nebulous handle
@@ -310 +310 @@
         $scheme = lc($scheme);
         if ($scheme eq 'neb') {
-            $name =~ s|^(\S+):/*||;
+            $name =~ s|^neb:/*||;
             $self->_neb_start();
             return $self->{nebulous}->open_create( $name );
@@ -345 +345 @@
         $scheme = lc($scheme);
         if ($scheme eq 'neb') {
-            $name =~ s|^(\S+):/*||;
+            $name =~ s|^neb:/*||;
             $self->_neb_start();
             return $self->{nebulous}->open_create( $name );
@@ -373 +373 @@
     my $scheme = file_scheme($name); # The scheme, e.g., file://, path://
     if (defined $scheme and lc($scheme) eq 'neb') {
-        $name =~ s|^(\S+):/*||;
+        $name =~ s|^neb:/*||;
         $self->_neb_start();
         $name = $self->{nebulous}->create( $name );
@@ -389 +389 @@
     my $scheme = file_scheme($name); # The scheme, e.g., file://, path://
     if (defined $scheme and lc($scheme) eq 'neb') {
-        $name =~ s|^(\S+):/*||;
+        $name =~ s|^neb:/*||;
         $self->_neb_start();
         return (defined $self->{nebulous}->find_instances( $name ) ? 1 : 0);
@@ -408 +408 @@
     my $scheme = file_scheme($target); # The scheme, e.g., file://, path://
     if (defined $scheme and lc($scheme) eq 'neb') {
-        $target =~ s|^(\S+):/*||;
+        $target =~ s|^neb:/*||;
         $self->_neb_start();
         $target = $self->{nebulous}->create( $target );
@@ -484 +484 @@
     }
 
-    $name =~ s|^\S+:/*||;
+    $name =~ s|^$scheme:/*||;
 
     if (lc($scheme) eq 'file') {