Changeset 13629 for trunk/PS-IPP-Config/lib/PS/IPP/Config.pm

Timestamp:

Jun 4, 2007, 4:49:03 PM (19 years ago)

Author:

Paul Price

Message:

Making URI scheme name case-insensitive.

File:

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

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

@@ -1 +1 @@
 # Copyright (c) 2006  Paul Price, Joshua Hoblitt
 #
-# $Id: Config.pm,v 1.52 2007-06-01 05:42:14 eugene Exp $
+# $Id: Config.pm,v 1.53 2007-06-05 02:49:03 price Exp $
 
 package PS::IPP::Config;
@@ -187 +187 @@
     my $joined = join('/', @segments);
     if (defined $scheme) {
-        $joined = $scheme . "://" . $joined;
+        $joined = lc($scheme) . "://" . $joined;
     } else {
         $joined = $root . $joined;
@@ -258 +258 @@
 
     return $name unless defined $scheme; # Probably a file name instead of a URI
+    $scheme = lc($scheme);
 
     if ($scheme eq 'neb') {
@@ -282 +283 @@
     my ($scheme) = $name =~ m|^(\S+):|; # The scheme, e.g., file://, path://
     if (defined $scheme) {
+        $scheme = lc($scheme);
         if ($scheme eq 'neb') {
             $name =~ s|^(\S+):/*||;
@@ -315 +317 @@
     my ($scheme) = $name =~ m|^(\S+):|; # The scheme, e.g., file://, path://
     if (defined $scheme) {
+        $scheme = lc($scheme);
         if ($scheme eq 'neb') {
             $name =~ s|^(\S+):/*||;
@@ -342 +345 @@
 
     my ($scheme) = $name =~ m|^(\S+):|; # The scheme, e.g., file://, path://
-    if (defined $scheme and $scheme eq 'neb') {
+    if (defined $scheme and lc($scheme) eq 'neb') {
         $name =~ s|^(\S+):/*||;
         $self->_neb_start();
@@ -358 +361 @@
 
     my ($scheme) = $name =~ m|^(\S+):|; # The scheme, e.g., file://, path://
-    if (defined $scheme and $scheme eq 'neb') {
+    if (defined $scheme and lc($scheme) eq 'neb') {
         $name =~ s|^(\S+):/*||;
         $self->_neb_start();
@@ -377 +380 @@
 
     my ($scheme) = $target =~ m|^(\S+):|; # The scheme, e.g., file://, path://
-    if (defined $scheme and $scheme eq 'neb') {
+    if (defined $scheme and lc($scheme) eq 'neb') {
         $target =~ s|^(\S+):/*||;
         $self->_neb_start();
@@ -416 +419 @@
 
     my ($scheme) = $name =~ m|^(\S+):|; # The scheme, e.g., file://, path://
-    return $name if defined $scheme and $scheme eq 'neb'; # Nothing to be done: Nebulous handles it all
+    return $name if defined $scheme and lc($scheme) eq 'neb'; # Nothing to be done: Nebulous handles it all
 
     # Might need to create a directory
@@ -470 +473 @@
     my ($scheme) = $name =~ m|^(\S+):|; # The scheme, e.g., file, path
     if (defined $scheme) {
+        $scheme = lc($scheme);
         if ($scheme eq 'path' or $scheme eq 'file') {
             # We may as well search for a 'better' path