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

Timestamp:

Nov 21, 2006, 3:21:03 PM (20 years ago)

Author:

Paul Price

Message:

Ordering resulted in warnings.

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.5 2006-11-22 00:32:13 price Exp $
+# $Id: Config.pm,v 1.6 2006-11-22 01:21:03 price Exp $
 
 package PS::IPP::Config;
@@ -248 +248 @@
     foreach my $item (@$mdc) {
         if ($item->{name} eq $name) {
-            if ($item->{type} eq "STR") {
+            if ($item->{class} eq "metadata") {
+                return $item->{value};
+            }
+            if ($item->{class} eq "scalar" and $item->{type} eq "STR") {
                 # Redirect
                 return _mdLookupMDwithRedirect($mdc, $item->{value});
             }
-            carp "$name within metadata is not of type METADATA.\n" unless $item->{class} eq "metadata";
-            return $item->{value};
+            carp "$name within metadata is not of type METADATA or STR.\n";
+            return undef;
         }
     }