[open-ils-commits] r7964 - branches/rel_1_2/Open-ILS/src/reporter

[svn at svn.open-ils.org]

Author: dbs
Date: 2007-11-01 18:50:03 -0400 (Thu, 01 Nov 2007)
New Revision: 7964

Modified:
   branches/rel_1_2/Open-ILS/src/reporter/clark-kent.pl
Log:
Backport fix from trunk:
Warn that <database><name> is deprecated for the reporter section in opensrf.xml


Modified: branches/rel_1_2/Open-ILS/src/reporter/clark-kent.pl
===================================================================
--- branches/rel_1_2/Open-ILS/src/reporter/clark-kent.pl	2007-11-01 22:48:48 UTC (rev 7963)
+++ branches/rel_1_2/Open-ILS/src/reporter/clark-kent.pl	2007-11-01 22:50:03 UTC (rev 7964)
@@ -50,7 +50,11 @@
 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' );
+if (!$db_name) {
+    $db_name = $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 $db_name; 
+}
 my $db_user = $sc->config_value( reporter => setup => database => 'user' );
 my $db_pw = $sc->config_value( reporter => setup => database => 'password' );