Changeset 17381 for trunk/DataStoreServer/scripts/dsrootindex

Timestamp:

Apr 7, 2008, 3:59:25 PM (18 years ago)

Author:

bills

Message:

Allow the data store server to be installed without a full IPP installation.

File:

• trunk/DataStoreServer/scripts/dsrootindex (modified) (2 diffs)

trunk/DataStoreServer/scripts/dsrootindex

@@ -8 +8 @@
 use warnings;
 
+use dsdbh;
+
 use DBI;
 
-use PS::IPP::Config qw($PS_EXIT_SUCCESS
-                       $PS_EXIT_UNKNOWN_ERROR
-                       $PS_EXIT_SYS_ERROR
-                       $PS_EXIT_CONFIG_ERROR
-                       $PS_EXIT_PROG_ERROR
-                       $PS_EXIT_DATA_ERROR
-                       $PS_EXIT_TIMEOUT_ERROR
-                       metadataLookupStr
-                       metadataLookupBool
-                       caturi
-                       );
+my $PS_EXIT_CONFIG_ERROR = 3;
 
 my $dbh = getDBHandle();
@@ -46 +38 @@
     print $line;
 }
-
-# todo move to a module
-sub getDBHandle {
-    my $ipprc =  PS::IPP::Config->new(); # IPP Configuration
-    my $siteConfig = $ipprc->{_siteConfig};
-
-    my $dbserver = metadataLookupStr($siteConfig, 'DBSERVER');
-    my $dbname   = metadataLookupStr($siteConfig, 'DBNAME');
-    my $dbuser   = metadataLookupStr($siteConfig, 'DBUSER');
-    my $dbpass   = metadataLookupStr($siteConfig, 'DBPASSWORD');
-    exit ($PS_EXIT_CONFIG_ERROR) unless defined $dbserver and $dbname and $dbuser and $dbpass;
-
-    my $dsn = "DBI:mysql:host=$dbserver;database=$dbname";
-
-    my $dbh = DBI->connect($dsn, $dbuser, $dbpass) or die "Cannot connect to server\n";
-    return $dbh;
-}