From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 21 Sep 2009 15:10:55 +0000 (+0000)
Subject: properly populate %services hash of configured Z servers
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=8da413b4cc5e86b79bb2e836f66d96cedd931972;p=evergreen%2Fmasslnc.git

properly populate %services hash of configured Z servers

git-svn-id: svn://svn.open-ils.org/ILS/trunk@14072 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm b/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
index 98e2b297eb..79a937ce1c 100755
--- a/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
@@ -86,9 +86,19 @@ sub query_services {
 	return $e->event unless $e->checkauth;
 	return $e->event unless $e->allowed('REMOTE_Z3950_QUERY');
 
+	return fetch_service_defs();
+}
+
+# -------------------------------------------------------------------
+# What services do we have config info for?
+# -------------------------------------------------------------------
+sub fetch_service_defs {
+
+    $sclient = OpenSRF::Utils::SettingsClient->new();
     my $hash = $sclient->config_value('z3950', 'services');
 
     # overlay config file values with in-db values
+    my $e = new_editor();
     if($e->can('search_config_z3950_source')) {
 
         my $sources = $e->search_config_z3950_source(
@@ -139,6 +149,7 @@ sub query_services {
         }
     };
 
+    %services = %$hash; # cache these internally so we can actually use the db-configured sources
     return $hash;
 }
 
@@ -147,11 +158,9 @@ sub query_services {
 # -------------------------------------------------------------------
 # Load the pre-defined Z server configs
 # -------------------------------------------------------------------
-sub initialize {
-	$sclient = OpenSRF::Utils::SettingsClient->new();
-	$default_service = $sclient->config_value("z3950", "default" );
-	my $servs = $sclient->config_value("z3950", "services" );
-	$services{$_} = $$servs{$_} for keys %$servs;
+sub child_init {
+    fetch_service_defs();
+    $default_service = $sclient->config_value("z3950", "default" );
 }