-# $Id: ZOOM.pm,v 1.16 2005-11-08 16:42:08 mike Exp $
+# $Id: ZOOM.pm,v 1.24 2005-12-21 17:01:41 mike Exp $
use strict;
use warnings;
sub UNSUPPORTED_PROTOCOL { Net::Z3950::ZOOM::ERROR_UNSUPPORTED_PROTOCOL }
sub UNSUPPORTED_QUERY { Net::Z3950::ZOOM::ERROR_UNSUPPORTED_QUERY }
sub INVALID_QUERY { Net::Z3950::ZOOM::ERROR_INVALID_QUERY }
+sub CQL_PARSE { Net::Z3950::ZOOM::ERROR_CQL_PARSE }
+sub CQL_TRANSFORM { Net::Z3950::ZOOM::ERROR_CQL_TRANSFORM }
# The following are added specifically for this OO interface
sub CREATE_QUERY { 20001 }
sub QUERY_CQL { 20002 }
sub SORTBY { 20004 }
sub CLONE { 20005 }
sub PACKAGE { 20006 }
+sub SCANTERM { 20007 }
# The "Event" package contains constants returned by last_event()
package ZOOM::Event;
return "can't clone record";
} elsif ($code == ZOOM::Error::PACKAGE) {
return "can't create package";
+ } elsif ($code == ZOOM::Error::SCANTERM) {
+ return "can't retrieve term from scan-set";
}
return Net::Z3950::ZOOM::diag_str($code);
}
-### More of the ZOOM::Exception instantiations should use this
sub _oops {
- my($code, $addinfo) = @_;
+ my($code, $addinfo, $diagset) = @_;
- die new ZOOM::Exception($code, diag_str($code), $addinfo);
+ die new ZOOM::Exception($code, diag_str($code), $addinfo, $diagset);
}
# ----------------------------------------------------------------------------
sub new {
my $class = shift();
- my($code, $message, $addinfo) = @_;
- ### support diag-set, too
+ my($code, $message, $addinfo, $diagset) = @_;
return bless {
code => $code,
message => $message,
addinfo => $addinfo,
+ diagset => $diagset || "ZOOM",
}, $class;
}
return $this->{addinfo};
}
+sub diagset {
+ my $this = shift();
+ return $this->{diagset};
+}
+
+sub render {
+ my $this = shift();
+ my $res = "ZOOM error " . $this->code() . ' "' . $this->message() . '"';
+ $res .= ' (addinfo: "' . $this->addinfo() . '")' if $this->addinfo();
+ $res .= " from diag-set '" . $this->diagset() . "'" if $this->diagset();
+ return $res;
+}
+
+# This means that untrapped exceptions render nicely.
+use overload '""' => \&render;
# ----------------------------------------------------------------------------
my $class = shift();
my($host, $port) = @_;
- my $_conn = Net::Z3950::ZOOM::connection_new($host, $port);
- my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy");
- $errcode = Net::Z3950::ZOOM::connection_error($_conn, $errmsg, $addinfo);
- die new ZOOM::Exception($errcode, $errmsg, $addinfo) if $errcode;
-
- return bless {
+ my $_conn = Net::Z3950::ZOOM::connection_new($host, $port || 0);
+ my $conn = bless {
host => $host,
port => $port,
_conn => $_conn,
};
+ $conn->_check();
+ return $conn;
+}
+
+# PRIVATE to this class and to ZOOM::Query::CQL2RPN::new()
+sub _conn {
+ my $this = shift();
+
+ my $_conn = $this->{_conn};
+ die "{_conn} undefined: has this Connection been destroy()ed?"
+ if !defined $_conn;
+
+ return $_conn;
+}
+
+sub _check {
+ my $this = shift();
+
+ my($errcode, $errmsg, $addinfo, $diagset) = (undef, "x", "x", "x");
+ $errcode = Net::Z3950::ZOOM::connection_error_x($this->_conn(), $errmsg,
+ $addinfo, $diagset);
+ die new ZOOM::Exception($errcode, $errmsg, $addinfo, $diagset)
+ if $errcode;
}
sub create {
};
}
-# PRIVATE to this class
-sub _conn {
- my $this = shift();
-
- my $_conn = $this->{_conn};
- die "{_conn} undefined: has this Connection been destroy()ed?"
- if !defined $_conn;
-
- return $_conn;
-}
-
sub error_x {
my $this = shift();
return Net::Z3950::ZOOM::connection_addinfo($this->_conn());
}
+sub diagset {
+ my $this = shift();
+ return Net::Z3950::ZOOM::connection_diagset($this->_conn());
+}
+
sub connect {
my $this = shift();
my($host, $port) = @_;
Net::Z3950::ZOOM::connection_connect($this->_conn(), $host, $port);
- my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy");
- $errcode = Net::Z3950::ZOOM::connection_error($this->_conn(),
- $errmsg, $addinfo);
- die new ZOOM::Exception($errcode, $errmsg, $addinfo) if $errcode;
+ $this->_check();
# No return value
}
my $_rs = Net::Z3950::ZOOM::connection_search($this->_conn(),
$query->_query());
- my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy");
- $errcode = Net::Z3950::ZOOM::connection_error($this->_conn(),
- $errmsg, $addinfo);
- die new ZOOM::Exception($errcode, $errmsg, $addinfo) if $errcode;
-
+ $this->_check();
return _new ZOOM::ResultSet($this, $query, $_rs);
}
my($pqf) = @_;
my $_rs = Net::Z3950::ZOOM::connection_search_pqf($this->_conn(), $pqf);
- my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy");
- $errcode = Net::Z3950::ZOOM::connection_error($this->_conn(),
- $errmsg, $addinfo);
- die new ZOOM::Exception($errcode, $errmsg, $addinfo) if $errcode;
-
+ $this->_check();
return _new ZOOM::ResultSet($this, $pqf, $_rs);
}
-sub scan {
+sub scan_pqf {
my $this = shift();
my($startterm) = @_;
my $_ss = Net::Z3950::ZOOM::connection_scan($this->_conn(), $startterm);
- my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy");
- $errcode = Net::Z3950::ZOOM::connection_error($this->_conn(),
- $errmsg, $addinfo);
- die new ZOOM::Exception($errcode, $errmsg, $addinfo) if $errcode;
-
+ $this->_check();
return _new ZOOM::ScanSet($this, $startterm, $_ss);
}
+sub scan {
+ my $this = shift();
+ my($query) = @_;
+
+ my $_ss = Net::Z3950::ZOOM::connection_scan1($this->_conn(),
+ $query->_query());
+ $this->_check();
+ return _new ZOOM::ScanSet($this, $query, $_ss);
+}
+
sub package {
my $this = shift();
my($options) = @_;
}
+package ZOOM::Query::CQL2RPN;
+our @ISA = qw(ZOOM::Query);
+
+sub new {
+ my $class = shift();
+ my($string, $conn) = @_;
+
+ my $q = Net::Z3950::ZOOM::query_create()
+ or ZOOM::_oops(ZOOM::Error::CREATE_QUERY);
+ # check() throws the exception we want; but we only want it on failure!
+ Net::Z3950::ZOOM::query_cql2rpn($q, $string, $conn->_conn()) == 0
+ or $conn->_check();
+
+ return bless {
+ _query => $q,
+ }, $class;
+}
+
+
package ZOOM::Query::PQF;
our @ISA = qw(ZOOM::Query);
my($which) = @_;
my $_rec = Net::Z3950::ZOOM::resultset_record($this->_rs(), $which);
- ### Check for error -- but how?
+ $this->{conn}->_check();
+
+ # Even if no error has occurred, I think record() might
+ # legitimately return undef if we're running in asynchronous mode
+ # and the record just hasn't been retrieved yet. This goes double
+ # for record_immediate().
return undef if !defined $_rec;
# For some reason, I have to use the explicit "->" syntax in order
my $_rec = Net::Z3950::ZOOM::resultset_record_immediate($this->_rs(),
$which);
- ### Check for error -- but how?
+ $this->{conn}->_check();
+ # The record might legitimately not be there yet
return undef if !defined $_rec;
return ZOOM::Record->_new($this, $which, $_rec);
my $raw = Net::Z3950::ZOOM::resultset_records($this->_rs(), $start, $count,
$return_records);
+ # By design, $raw may be undefined (if $return_records is true)
return undef if !defined $raw;
# We need to package up the returned records in ZOOM::Record objects
return bless {
conn => $conn,
- startterm => $startterm,
+ startterm => $startterm,# This is not currently used, which is
+ # just as well since it could be
+ # either a string (when the SS is
+ # created with scan()) or a
+ # ZOOM::Query object (when it's
+ # created with scan1())
_ss => $_ss,
}, $class;
}
return $_ss;
}
+sub option {
+ my $this = shift();
+ my($key, $value) = @_;
+
+ my $oldval = Net::Z3950::ZOOM::scanset_option_get($this->_ss(), $key);
+ Net::Z3950::ZOOM::scanset_option_set($this->_ss(), $key, $value)
+ if defined $value;
+
+ return $oldval;
+}
+
sub size {
my $this = shift();
my($occ, $len) = (0, 0);
my $term = Net::Z3950::ZOOM::scanset_term($this->_ss(), $which,
- $occ, $len);
- return undef if !defined $term;
+ $occ, $len)
+ or ZOOM::_oops(ZOOM::Error::SCANTERM);
+
die "length of term '$term' differs from returned len=$len"
if length($term) != $len;
my($occ, $len) = (0, 0);
my $term = Net::Z3950::ZOOM::scanset_display_term($this->_ss(), $which,
- $occ, $len);
- return undef if !defined $term;
+ $occ, $len)
+ or ZOOM::_oops(ZOOM::Error::SCANTERM);
+
die "length of display term '$term' differs from returned len=$len"
if length($term) != $len;
my($type) = @_;
Net::Z3950::ZOOM::package_send($this->_p(), $type);
- my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy");
- $errcode = Net::Z3950::ZOOM::connection_error($this->{conn}->_conn(),
- $errmsg, $addinfo);
- die new ZOOM::Exception($errcode, $errmsg, $addinfo) if $errcode;
+ $this->{conn}->_check();
}
sub destroy {
}
+# There follows trivial support for YAZ logging. This is wired out
+# into the Net::Z3950::ZOOM package, and we here provide wrapper
+# functions -- nothing more than aliases, really -- in the ZOOM::Log
+# package. There really is no point in inventing an OO interface.
+#
+# Passing @_ directly to the underlying Net::Z3950::ZOOM::* functions
+# doesn't work, for reasons that I can't begin to fathom, and that
+# don't particularly interest me. Unpacking into scalars and passing
+# those _does_ work, so that's what we do.
+
+package ZOOM::Log;
+
+sub mask_str { my($a) = @_; Net::Z3950::ZOOM::yaz_log_mask_str($a); }
+sub init { my($a, $b, $c) = @_;
+ Net::Z3950::ZOOM::yaz_log_init($a, $b, $c) }
+sub init_file { my($a) = @_; Net::Z3950::ZOOM::yaz_log_init_file($a) }
+sub init_level { my($a) = @_; Net::Z3950::ZOOM::yaz_log_init_level($a) }
+sub init_prefix { my($a) = @_; Net::Z3950::ZOOM::yaz_log_init_prefix($a) }
+sub time_format { my($a) = @_; Net::Z3950::ZOOM::yaz_log_time_format($a) }
+sub init_max_size { my($a) = @_; Net::Z3950::ZOOM::yaz_log_init_max_size($a) }
+sub log { my($a,$b) = @_; Net::Z3950::ZOOM::yaz_log($a, $b) }
+
+
1;