[open-ils-commits] r8120 - in trunk/Open-ILS: examples src/reporter src/support-scripts

[svn at svn.open-ils.org]

Author: miker
Date: 2007-12-01 13:15:03 -0500 (Sat, 01 Dec 2007)
New Revision: 8120

Modified:
   trunk/Open-ILS/examples/opensrf.xml.example
   trunk/Open-ILS/src/reporter/clark-kent.pl
   trunk/Open-ILS/src/support-scripts/settings-tester.pl
Log:
changing reporter to use <pw> instead of <password> to match the other services; updating settings-tester.pl to match

Modified: trunk/Open-ILS/examples/opensrf.xml.example
===================================================================
--- trunk/Open-ILS/examples/opensrf.xml.example	2007-11-30 14:16:37 UTC (rev 8119)
+++ trunk/Open-ILS/examples/opensrf.xml.example	2007-12-01 18:15:03 UTC (rev 8120)
@@ -54,7 +54,7 @@
                     <port>5432</port>
                     <db>evergreen</db>
                     <user>postgres</user>
-                    <password>postgres</password>
+                    <pw>postgres</pw>
                 </database>
                 <files>
                     <!-- successful report outputs go here -->

Modified: trunk/Open-ILS/src/reporter/clark-kent.pl
===================================================================
--- trunk/Open-ILS/src/reporter/clark-kent.pl	2007-11-30 14:16:37 UTC (rev 8119)
+++ trunk/Open-ILS/src/reporter/clark-kent.pl	2007-12-01 18:15:03 UTC (rev 8120)
@@ -57,7 +57,7 @@
     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);
 

Modified: trunk/Open-ILS/src/support-scripts/settings-tester.pl
===================================================================
--- trunk/Open-ILS/src/support-scripts/settings-tester.pl	2007-11-30 14:16:37 UTC (rev 8119)
+++ trunk/Open-ILS/src/support-scripts/settings-tester.pl	2007-12-01 18:15:03 UTC (rev 8120)
@@ -110,6 +110,12 @@
 	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;