[open-ils-commits] r8189 - trunk/Open-ILS/src/support-scripts

[svn at svn.open-ils.org]

Author: dbs
Date: 2007-12-10 14:41:48 -0500 (Mon, 10 Dec 2007)
New Revision: 8189

Modified:
   trunk/Open-ILS/src/support-scripts/settings-tester.pl
Log:
Add a test for incorrect driver in /reporter/; bug found by Ben Ostrowsky.
Test for /reporter/ in xpath including delimiters, instead of just "reporter".


Modified: trunk/Open-ILS/src/support-scripts/settings-tester.pl
===================================================================
--- trunk/Open-ILS/src/support-scripts/settings-tester.pl	2007-12-10 13:50:04 UTC (rev 8188)
+++ trunk/Open-ILS/src/support-scripts/settings-tester.pl	2007-12-10 19:41:48 UTC (rev 8189)
@@ -153,14 +153,17 @@
 		$language = $lang_nodes[0]->findvalue("child::text()");
 	}
 	if ($driver eq "pgsql") {
-		if ($language eq "C") {
+		if ($driver_xpath =~ m#/reporter/#) {
+			$result = "* ERROR: reporter application must use driver 'Pg', but '$driver' is defined\n";
+			warn $result;
+		} elsif ($language eq "C") {
 			$result = "* OK: $driver language is $language in $lang_xpath\n";
 		} else {
 			$result = "* ERROR: $driver language is $language in $lang_xpath\n";
 			warn $result;
 		}
 	} elsif ($driver eq "Pg") {
-		if ($driver_xpath =~ /reporter/) {
+		if ($driver_xpath =~ m#/reporter/#) {
 			$result = "* OK: $driver language is undefined for reporter base configuration\n";
 		} elsif ($language eq "perl") {
 			$result = "* OK: $driver language is $language in $lang_xpath\n";