From ae4bdb787378935d1600bdad6afe05c11ebb9694 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Thu, 3 Dec 2015 12:08:42 -0500
Subject: [PATCH] JBAS-980 auth batcher DB params consistency

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 KCLS/linking/authority_authority_linker_batcher.pl | 43 ++++++++--------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/KCLS/linking/authority_authority_linker_batcher.pl b/KCLS/linking/authority_authority_linker_batcher.pl
index 7d8eb4fe3f..10521746b7 100755
--- a/KCLS/linking/authority_authority_linker_batcher.pl
+++ b/KCLS/linking/authority_authority_linker_batcher.pl
@@ -51,33 +51,22 @@ use OpenSRF::System;
 
 my $batch_size = 1000;
 my $lower_bound = 0;
-
-my $hostname = 'evergreentest.catalystitservices.com';
-my $portnum = '5415';
-
-my $result = GetOptions("lower-bound=i" => \$lower_bound,
-                        "batch-size=i" => \$batch_size,
-                        "hostname=s" => \$hostname,
-                        "portnum=s" => \$portnum);
-
-my $config = '/openils/conf/opensrf_core.xml';
-OpenSRF::System->bootstrap_client( config_file => $config );
-my $sc = OpenSRF::Utils::SettingsClient->new;
-my $platform = $sc->config_value( apps => 'open-ils.storage' => app_settings => databases => 'driver' );
-my $host = $sc->config_value( apps => 'open-ils.storage' => app_settings => databases => database => 'host' );
-my $port = $sc->config_value( apps => 'open-ils.storage' => app_settings => databases => database => 'port' );
-my $database = $sc->config_value( apps => 'open-ils.storage' => app_settings => databases => database => 'db' );
-
-if (!$database) {
-    $database = $sc->config_value( reporter => setup => database => 'name' );
-    print STDERR "WARN: <database><name> is a deprecated setting for database name. For future compatibility, you should use <database><db> instead." if $database;
-}
-my $user = $sc->config_value( apps => 'open-ils.storage' => app_settings => databases => database => 'user' );
-my $pw = $sc->config_value( apps => 'open-ils.storage' => app_settings => databases => database => 'pw' );
-
-my $dsn = "dbi:$platform:dbname = $database; host = $host; port = $port";
-
-my $dbh = DBI->connect($dsn,$user, $pw);
+my $db_host = 'localhost';
+my $db_port = '5432';
+my $db_user = 'evergreen';
+my $db_pass = 'evergreen';
+
+my $result = GetOptions(
+    "lower-bound=i" => \$lower_bound,
+    "batch-size=i" => \$batch_size,
+    "db-host=s" => \$db_host,
+    "db-user=s" => \$db_user,
+    "db-pass=s" => \$db_pass,
+    "db-port=s" => \$db_port
+);
+
+my $dsn = "dbi:Pg:database=evergreen;host=$db_host;port=$db_port";
+my $dbh = DBI->connect($dsn, $db_user, $db_pass);
 
 $dbh->do('SET statement_timeout = 0;');
 
-- 
2.11.0