From fea6cb8748e014b54cfef58578882890bb9007a0 Mon Sep 17 00:00:00 2001
From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 11 Jun 2007 16:58:29 +0000
Subject: [PATCH] New wrapper classes built on the work of a potenial patch
 from Dan Scott. Tested using the Gentoo VMWare image using both Zoom and
 Net::Z3950.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@7409 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/src/perlmods/OpenILS/Utils/ZClient.pm | 117 +++++++++++++++++++++----
 1 file changed, 98 insertions(+), 19 deletions(-)

diff --git a/Open-ILS/src/perlmods/OpenILS/Utils/ZClient.pm b/Open-ILS/src/perlmods/OpenILS/Utils/ZClient.pm
index db6407c722..4379f19bb0 100644
--- a/Open-ILS/src/perlmods/OpenILS/Utils/ZClient.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Utils/ZClient.pm
@@ -1,8 +1,11 @@
 package OpenILS::Utils::ZClient;
 use UNIVERSAL::require;
 
+use overload 'bool' => sub { return $_[0]->{connection} ? 1 : 0 };
+
 our $conn_class = 'ZOOM::Connection';
 our $imp_class = 'ZOOM';
+our $AUTOLOAD;
 
 # Detect the installed z client, prefering ZOOM.
 if (!$imp_class->use()) {
@@ -10,27 +13,9 @@ if (!$imp_class->use()) {
 	$imp_class = 'Net::Z3950';  # Try Net::Z3950
 	if ($imp_class->use()) {
 
-		# Load the modules we're going to modify
-		'Net::Z3950::Connection'->use();
-		'Net::Z3950::ResultSet'->use();
-		'Net::Z3950::Record'->use();
-
 		# Tell 'new' how to build the connection
 		$conn_class = 'Net::Z3950::Connection';
 		
-		# Now we're going to give Net::Z3950 a ZOOM-ish interface
-
-		# Move 'record' out of the way ...
-		*{'Net::Z3950::ResultSet::_real_record'}  = *{'Net::Z3950::ResultSet::record'};
-		# ... and install a new version using the 0-based ZOOM semantics
-		*{'Net::Z3950::ResultSet::record'}  = sub { return shift()->_real_record(shift() - 1); };
-
-		# Alias 'search' with the ZOOM 'search_pqf' method
-		*{'Net::Z3950::Connection::search_pqf'}  = *{'Net::Z3950::Connection::search'};
-
-		# And finally, alias 'rawdata' with the ZOOM 'raw' method
-		*{'Net::Z3950::Record::raw'}  = sub { return shift()->rawdata(@_); }
-
 	} else {
 		die "Cannot load a z39.50 client implementation!  Please install either ZOOM or Net::Z3950.\n";
 	}
@@ -42,12 +27,106 @@ if (!$imp_class->use()) {
 sub new {
 	my $class = shift();
 	my @args = @_;
+
 	if ($class ne __PACKAGE__) { # NOT called OO-ishly
 		# put the first param back if called like OpenILS::Utils::ZClient::new()
 		unshift @args, $class;
 	}
 
-	return $conn_class->new(@_);
+	return bless { connection => $conn_class->new(@_) } => __PACKAGE__;
+}
+
+sub search {
+	my $self = shift;
+	my $r =  $imp_class eq 'Net::Z3950' ?
+		$self->{connection}->search( @_ ) :
+		$self->{connection}->search_pqf( @_ );
+
+	return OpenILS::Utils::ZClient::ResultSet->new( $r );
+}
+
+*{__PACKAGE__ . '::search_pqf'} = \&search; 
+
+sub AUTOLOAD {
+	my $self = shift;
+
+	my $method = $AUTOLOAD;
+	$method =~ s/.*://;   # strip fully-qualified portion
+
+	return $self->{connection}->$method( @_ );
+}
+
+#-------------------------------------------------------------------------------
+package OpenILS::Utils::ZClient::ResultSet;
+
+our $AUTOLOAD;
+
+sub new {
+	my $class = shift;
+	my @args = @_;
+
+	if ($class ne __PACKAGE__) { # NOT called OO-ishly
+		# put the first param back if called like OpenILS::Utils::ZClient::ResultSet::new()
+		unshift @args, $class;
+	}
+
+
+	return bless { result => $args[0] } => __PACKAGE__;
+}
+
+sub record {
+	my $self = shift;
+	my $offset = shift;
+	my $r = $imp_class eq 'Net::Z3950' ?
+		$self->{result}->record( ++$offset ) :
+		$self->{result}->record( $offset );
+
+	return  OpenILS::Utils::ZClient::Record->new( $r );
+}
+
+sub AUTOLOAD {
+	my $self = shift;
+
+	my $method = $AUTOLOAD;
+	$method =~ s/.*://;   # strip fully-qualified portion
+
+	return $self->{result}->$method( @_ );
+}
+
+#-------------------------------------------------------------------------------
+package OpenILS::Utils::ZClient::Record;
+
+our $AUTOLOAD;
+
+sub new {
+	my $class = shift;
+	my @args = @_;
+
+	if ($class ne __PACKAGE__) { # NOT called OO-ishly
+		# put the first param back if called like OpenILS::Utils::ZClient::ResultSet::new()
+		unshift @args, $class;
+	}
+
+
+	return bless { record => shift() } => __PACKAGE__;
+}
+
+sub rawdata {
+	my $self = shift;
+	return $OpenILS::Utils::ZClient::imp_class eq 'Net::Z3950' ?
+		$self->{record}->rawdata( @_ ) :
+		$self->{record}->raw( @_ );
+}
+
+*{__PACAKGE__ . '::raw'} = \&rawdata; 
+
+sub AUTOLOAD {
+	my $self = shift;
+
+	my $method = $AUTOLOAD;
+	$method =~ s/.*://;   # strip fully-qualified portion
+
+	return $self->{record}->$method( @_ );
 }
 
 
-- 
2.11.0