[open-ils-commits] r8243 - branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search

[svn at svn.open-ils.org]

Author: miker
Date: 2007-12-19 20:16:38 -0500 (Wed, 19 Dec 2007)
New Revision: 8243

Modified:
   branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
   branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
Log:
make native-evergreen-catalog a default, always-on z-target

Modified: branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
===================================================================
--- branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm	2007-12-20 00:05:42 UTC (rev 8242)
+++ branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm	2007-12-20 01:16:38 UTC (rev 8243)
@@ -529,8 +529,7 @@
 	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;

Modified: branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
===================================================================
--- branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm	2007-12-20 00:05:42 UTC (rev 8242)
+++ branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm	2007-12-20 01:16:38 UTC (rev 8243)
@@ -149,6 +149,7 @@
 	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 @@
 
 		$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 @@
 
 	$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");