Index: trunk/DataStoreServer/scripts/dsdbh.pm
===================================================================
--- trunk/DataStoreServer/scripts/dsdbh.pm	(revision 17381)
+++ trunk/DataStoreServer/scripts/dsdbh.pm	(revision 17381)
@@ -0,0 +1,20 @@
+# create a database handle based on the configuration given
+# in environment variables
+
+sub getDBHandle {
+    my $dbserver = $ENV{DBSERVER};
+    my $dbuser   = $ENV{DBUSER};
+    my $dbpass   = $ENV{DBPASSWORD};
+    my $dbname   = $ENV{DBNAME};
+
+    die "database enviornment not set up" unless defined($dbserver) and defined($dbuser)
+        and defined($dbpass) and defined($dbname);
+
+    my $dsn = "DBI:mysql:host=$dbserver;database=$dbname";
+
+    my $dbh = DBI->connect($dsn, $dbuser, $dbpass) or die "Cannot connect to server\n";
+
+    return $dbh;
+}
+
+return 1;
Index: trunk/DataStoreServer/scripts/dsfsindex
===================================================================
--- trunk/DataStoreServer/scripts/dsfsindex	(revision 16954)
+++ trunk/DataStoreServer/scripts/dsfsindex	(revision 17381)
@@ -8,17 +8,9 @@
 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 $PS_EXIT_DATA_ERROR = 5;
 
 my $fileset = pop;
@@ -114,18 +106,2 @@
     print "$line\n";
 }
-
-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;
-}
Index: trunk/DataStoreServer/scripts/dsprodindex
===================================================================
--- trunk/DataStoreServer/scripts/dsprodindex	(revision 16954)
+++ trunk/DataStoreServer/scripts/dsprodindex	(revision 17381)
@@ -7,16 +7,8 @@
 
 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
-		       );
+use dsdbh;
 
+my $PS_EXIT_CONFIG_ERROR = 3;
+my $PS_EXIT_DATA_ERROR = 5;
 my $product = shift;
 die("must specify product to list") unless defined $product;
@@ -145,19 +137,2 @@
     print "$line\n";
 }
-
-# TODO: move this 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;
-}
Index: trunk/DataStoreServer/scripts/dsrootindex
===================================================================
--- trunk/DataStoreServer/scripts/dsrootindex	(revision 16954)
+++ trunk/DataStoreServer/scripts/dsrootindex	(revision 17381)
@@ -8,17 +8,9 @@
 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,19 +38,2 @@
     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;
-}
Index: trunk/DataStoreServer/scripts/tabledefs.sql
===================================================================
--- trunk/DataStoreServer/scripts/tabledefs.sql	(revision 16954)
+++ trunk/DataStoreServer/scripts/tabledefs.sql	(revision 17381)
@@ -77,5 +77,5 @@
 
 # none of these types have any type specific columns
-INSERT INTO dsFileType (type) VALUES('psrequest');
-INSERT INTO dsFileType (type) VALUES('psresults');
-INSERT INTO dsFileType (type) VALUES('pstamp');
+#INSERT INTO dsFileType (type) VALUES('psrequest');
+#INSERT INTO dsFileType (type) VALUES('psresults');
+#INSERT INTO dsFileType (type) VALUES('pstamp');