[open-ils-commits] r14633 - branches/rel_1_6/Open-ILS/src/reporter (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2009-10-27 15:03:29 -0400 (Tue, 27 Oct 2009)
New Revision: 14633

Modified:
   branches/rel_1_6/Open-ILS/src/reporter/find_orphaned_reports.pl
Log:
Update find_orphaned_reports.pl to modern Evergreen (with apologies to chromatic):
  * prefer non-deprecated reporter database settings
  * use opensrf_core.xml instead of bootstrap.conf
  * fix typo (boostrap -> bootstrap)


Modified: branches/rel_1_6/Open-ILS/src/reporter/find_orphaned_reports.pl
===================================================================
--- branches/rel_1_6/Open-ILS/src/reporter/find_orphaned_reports.pl	2009-10-27 19:02:15 UTC (rev 14632)
+++ branches/rel_1_6/Open-ILS/src/reporter/find_orphaned_reports.pl	2009-10-27 19:03:29 UTC (rev 14633)
@@ -10,10 +10,10 @@
 use OpenILS::Reporter::SQLBuilder;
 use File::Find;
 
-my ($config, $du, $live, %seen) = ('SYSCONFDIR/bootstrap.conf', 0, 0);
+my ($config, $du, $live, %seen) = ('SYSCONFDIR/opensrf_core.xml', 0, 0);
 
 GetOptions(
-	"boostrap=s"	=> \$config,
+	"bootstrap=s"	=> \$config,
 	"du"	=> \$du,
 	"live"	=> \$live,
 );
@@ -24,9 +24,9 @@
 my $db_driver = $sc->config_value( reporter => setup => database => 'driver' );
 my $db_host = $sc->config_value( reporter => setup => database => 'host' );
 my $db_port = $sc->config_value( reporter => setup => database => 'port' );
-my $db_name = $sc->config_value( reporter => setup => database => 'name' );
+my $db_name = $sc->config_value( reporter => setup => database => 'db' ) || $sc->config_value( reporter => setup => database => 'name' );
 my $db_user = $sc->config_value( reporter => setup => database => 'user' );
-my $db_pw = $sc->config_value( reporter => setup => database => 'password' );
+my $db_pw = $sc->config_value( reporter => setup => database => 'pw' ) || $sc->config_value( reporter => setup => database => 'password' );
 
 my $output_base = $sc->config_value( reporter => setup => files => 'output_base' );