Changeset 29748

Timestamp:

Nov 10, 2010, 2:56:07 PM (15 years ago)

Author:

bills

Message:

impplement metadataLookupS32 and use it when looking up DBPORT. Put default back to type S32

Location:

trunk

Files:

• PS-IPP-Config/lib/PS/IPP/Config.pm (modified) (4 diffs)
• ippconfig/site.config.in (modified) (1 diff)

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

@@ -39 +39 @@
                     metadataLookupMD
                     metadataLookupBool
+                    metadataLookupS32
                     caturi
                     file_scheme
@@ -353 +354 @@
     my $dbuser = metadataLookupStr($self->{_siteConfig}, "DBUSER");
     my $dbpassword = metadataLookupStr($self->{_siteConfig}, "DBPASSWORD");
-    my $dbport = metadataLookupStr($self->{_siteConfig}, "DBPORT");
+    my $dbport = metadataLookupS32($self->{_siteConfig}, "DBPORT");
     my $admindb = "ippadmin";
 
@@ -1371 +1372 @@
     return undef if not defined $item;
     my $name = shift;                # Name of item
-    carp "$name within metadata is not of type STR.\n" unless $item->{type} eq "STR";
+    carp "$name within metadata is type $item->{type} not STR.\n" unless $item->{type} eq "STR";
+    return $item->{value};
+}
+
+# Lookup the metadata, checking the type is S32
+sub metadataLookupS32
+{
+    my $item = metadataLookup(@_);
+    return undef if not defined $item;
+    my $name = shift;                # Name of item
+    carp "$name within metadata is type $item->{type} not S32.\n" unless $item->{type} eq "S32";
     return $item->{value};
 }
@@ -1391 +1402 @@
     return undef if not defined $item;
     my $name = shift;                # Name of item
-    carp "$name within metadata is not of type BOOL.\n" unless $item->{type} eq "BOOL";
+    carp "$name within metadata is type $item->{type} not BOOL.\n" unless $item->{type} eq "BOOL";
     return $item->{value};
 }

trunk/ippconfig/site.config.in

@@ -53 +53 @@
 DBUSER          STR     XXX                     # Database user name (for psDBInit)
 DBPASSWORD      STR     XXX                     # Database password (for psDBInit)
-DBPORT          STR     0                       # Database port (for psDBInit); 0 = default
+DBPORT          S32     0                       # Database port (for psDBInit); 0 = default
 
 # DataStore Database configuration