From 4c172650d189c3ad12701f1081647b1847a7deb5 Mon Sep 17 00:00:00 2001
From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Sat, 1 Dec 2007 18:15:03 +0000
Subject: [PATCH] changing reporter to use <pw> instead of <password> to match
 the other services; updating settings-tester.pl to match

git-svn-id: svn://svn.open-ils.org/ILS/trunk@8120 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/examples/opensrf.xml.example           | 2 +-
 Open-ILS/src/reporter/clark-kent.pl             | 2 +-
 Open-ILS/src/support-scripts/settings-tester.pl | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Open-ILS/examples/opensrf.xml.example b/Open-ILS/examples/opensrf.xml.example
index 0a1bec1fe1..87accd92dc 100644
--- a/Open-ILS/examples/opensrf.xml.example
+++ b/Open-ILS/examples/opensrf.xml.example
@@ -54,7 +54,7 @@ Example opensrf config file for OpenILS
                     <port>5432</port>
                     <db>evergreen</db>
                     <user>postgres</user>
-                    <password>postgres</password>
+                    <pw>postgres</pw>
                 </database>
                 <files>
                     <!-- successful report outputs go here -->
diff --git a/Open-ILS/src/reporter/clark-kent.pl b/Open-ILS/src/reporter/clark-kent.pl
index cd08972e89..d05f46bd1d 100755
--- a/Open-ILS/src/reporter/clark-kent.pl
+++ b/Open-ILS/src/reporter/clark-kent.pl
@@ -57,7 +57,7 @@ if (!$db_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' );
+my $db_pw = $sc->config_value( reporter => setup => database => 'pw' );
 
 die "Unable to retrieve database connection information from the settings server" unless ($db_driver && $db_host && $db_port && $db_name && $db_user);
 
diff --git a/Open-ILS/src/support-scripts/settings-tester.pl b/Open-ILS/src/support-scripts/settings-tester.pl
index 774f00966f..02366f6bf1 100755
--- a/Open-ILS/src/support-scripts/settings-tester.pl
+++ b/Open-ILS/src/support-scripts/settings-tester.pl
@@ -110,6 +110,12 @@ foreach my $database (@databases) {
 	my $db_port = $database->findvalue("./port");	
 	my $db_user = $database->findvalue("./user");	
 	my $db_pw = $database->findvalue("./pw");	
+    if (!$db_pw && $database->findvalue('../../local-name()') eq 'reporter') {
+        $db_pw = $database->findvalue("./password");
+        warn "* Deprecated <password> elemnt used for the <reporter>.  ".
+            "Please use <pw> instead.\n" if ($db_pw);
+    }
+
 	my $osrf_xpath;
 	foreach my $node ($database->findnodes("ancestor::node()")) {
 		next unless $node->nodeType == XML::LibXML::XML_ELEMENT_NODE;
-- 
2.11.0