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;
-}