From 63f3e1655f1d4fa026bf481c579005b447e9cfc1 Mon Sep 17 00:00:00 2001 From: miker Date: Thu, 20 Dec 2007 01:16:38 +0000 Subject: [PATCH] make native-evergreen-catalog a default, always-on z-target git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@8243 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm | 3 +-- Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm | 12 +++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm b/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm index e530c578cc..cb74984920 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm @@ -529,8 +529,7 @@ __PACKAGE__->register_method( method => 'cat_search_z_style_wrapper', api_name => 'open-ils.search.biblio.zstyle', stream => 1, - signature => q/@see open-ils.search.biblio.multiclass/); - +); sub cat_search_z_style_wrapper { my $self = shift; my $client = shift; diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm b/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm index 734ffe1169..497d15ac53 100755 --- a/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm @@ -149,6 +149,7 @@ sub do_class_search { my @connections; my @results; for (my $i = 0; $i < @{$$args{service}}; $i++) { + my %tmp_args = %$args; $tmp_args{service} = $$args{service}[$i]; $tmp_args{username} = $$args{username}[$i]; @@ -156,6 +157,16 @@ sub do_class_search { $logger->debug("z3950: service: $tmp_args{service}, async: $tmp_args{async}"); + if ($tmp_args{service} eq 'native-evergreen-catalog') { + my $method = $self->method_lookup('open-ils.search.biblio.zstyle'); + $conn->respond( + $self->method_lookup( + 'open-ils.search.biblio.zstyle' + )->run($auth, \%tmp_args) + ); + next; + } + $tmp_args{query} = compile_query('and', $tmp_args{service}, $tmp_args{search}); my $res = $self->do_service_search( $conn, $auth, \%tmp_args ); @@ -168,7 +179,6 @@ sub do_class_search { $logger->debug("z3950: Connections created"); - my @records; while ((my $index = OpenILS::Utils::ZClient::event( \@connections )) != 0) { my $ev = $connections[$index - 1]->last_event(); $logger->debug("z3950: Received event $ev"); -- 2.11.0