-# $Id: ZOOM.pm,v 1.9 2005-10-24 16:42:16 mike Exp $
+# $Id: ZOOM.pm,v 1.13 2005-11-07 15:48:08 mike Exp $
use strict;
use warnings;
package ZOOM;
-sub diag_str {
- my($code) = @_;
- return Net::Z3950::ZOOM::diag_str($code);
-}
-
# Member naming convention: hash-element names which begin with an
# underscore represent underlying ZOOM-C object descriptors; those
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 }
+# The following are added specifically for this OO interface
+sub CREATE_QUERY { 20001 }
+sub QUERY_CQL { 20002 }
+sub QUERY_PQF { 20003 }
+sub SORTBY { 20004 }
+sub CLONE { 20005 }
# The "Event" package contains constants returned by last_event()
package ZOOM::Event;
sub RECV_RECORD { Net::Z3950::ZOOM::EVENT_RECV_RECORD }
sub RECV_SEARCH { Net::Z3950::ZOOM::EVENT_RECV_SEARCH }
+# ----------------------------------------------------------------------------
+
+package ZOOM;
+
+sub diag_str {
+ my($code) = @_;
+
+ # Special cases for error specific to the OO layer
+ if ($code == ZOOM::Error::CREATE_QUERY) {
+ return "can't create query object";
+ } elsif ($code == ZOOM::Error::QUERY_CQL) {
+ return "can't set CQL query";
+ } elsif ($code == ZOOM::Error::QUERY_PQF) {
+ return "can't set prefix query";
+ } elsif ($code == ZOOM::Error::SORTBY) {
+ return "can't set sort-specification";
+ } elsif ($code == ZOOM::Error::CLONE) {
+ return "can't clone record";
+ }
+
+ return Net::Z3950::ZOOM::diag_str($code);
+}
+
+### More of the ZOOM::Exception instantiations should use this
+sub _oops {
+ my($code, $addinfo) = @_;
+
+ die new ZOOM::Exception($code, diag_str($code), $addinfo);
+}
# ----------------------------------------------------------------------------
};
}
-# PRIVATE within this class
+# PRIVATE to this class
sub _conn {
my $this = shift();
my $_conn = $this->{_conn};
- die "{_conn} undefined: has this ResultSet been destroy()ed?"
+ die "{_conn} undefined: has this Connection been destroy()ed?"
if !defined $_conn;
return $_conn;
return $oldval;
}
-
-sub search_pqf {
+sub search {
my $this = shift();
my($query) = @_;
- my $_rs = Net::Z3950::ZOOM::connection_search_pqf($this->_conn(), $query);
+ 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);
return _new ZOOM::ResultSet($this, $query, $_rs);
}
+sub search_pqf {
+ my $this = shift();
+ 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;
+
+ return _new ZOOM::ResultSet($this, $pqf, $_rs);
+}
+
sub destroy {
my $this = shift();
sub new {
my $class = shift();
die "You can't create $class objects: it's a virtual base class";
+}
+# PRIVATE to this class and ZOOM::Connection::search()
+sub _query {
+ my $this = shift();
+
+ my $_query = $this->{_query};
+ die "{_query} undefined: has this Query been destroy()ed?"
+ if !defined $_query;
+
+ return $_query;
}
+sub sortby {
+ my $this = shift();
+ my($sortby) = @_;
-package ZOOM::Query::RPN;
+ Net::Z3950::ZOOM::query_sortby($this->_query(), $sortby) == 0
+ or ZOOM::_oops(ZOOM::Error::SORTBY, $sortby);
+}
+
+sub destroy {
+ my $this = shift();
+
+ Net::Z3950::ZOOM::query_destroy($this->_query());
+ $this->{_query} = undef;
+}
+
+
+package ZOOM::Query::CQL;
+our @ISA = qw(ZOOM::Query);
sub new {
my $class = shift();
+ my($string) = @_;
- ### Er ...
+ my $q = Net::Z3950::ZOOM::query_create()
+ or ZOOM::_oops(ZOOM::Error::CREATE_QUERY);
+ Net::Z3950::ZOOM::query_cql($q, $string) == 0
+ or ZOOM::_oops(ZOOM::Error::QUERY_CQL, $string);
+
+ return bless {
+ _query => $q,
+ }, $class;
+}
+
+
+package ZOOM::Query::PQF;
+our @ISA = qw(ZOOM::Query);
+
+sub new {
+ my $class = shift();
+ my($string) = @_;
+
+ my $q = Net::Z3950::ZOOM::query_create()
+ or ZOOM::_oops(ZOOM::Error::CREATE_QUERY);
+ Net::Z3950::ZOOM::query_prefix($q, $string) == 0
+ or ZOOM::_oops(ZOOM::Error::QUERY_PQF, $string);
+
+ return bless {
+ _query => $q,
+ }, $class;
}
die "You can't create $class objects directly";
}
-# PRIVATE to ZOOM::Connection::search()
+# PRIVATE to ZOOM::Connection::search() and ZOOM::Connection::search_pqf()
sub _new {
my $class = shift();
my($conn, $query, $_rs) = @_;
return bless {
conn => $conn,
- query => $query,
+ query => $query, # This is not currently used, which is
+ # just as well since it could be
+ # either a string (when the RS is
+ # created with search_pqf()) or a
+ # ZOOM::Query object (when it's
+ # created with search())
_rs => $_rs,
}, $class;
}
-# PRIVATE within this class
+# PRIVATE to this class
sub _rs {
my $this = shift();
return $_rs;
}
+sub option {
+ my $this = shift();
+ my($key, $value) = @_;
+
+ my $oldval = Net::Z3950::ZOOM::resultset_option_get($this->_rs(), $key);
+ Net::Z3950::ZOOM::resultset_option_set($this->_rs(), $key, $value)
+ if defined $value;
+
+ return $oldval;
+}
+
sub size {
my $this = shift();
my $_rec = Net::Z3950::ZOOM::resultset_record($this->_rs(), $which);
### Check for error -- but how?
+ return undef if !defined $_rec;
# For some reason, I have to use the explicit "->" syntax in order
# to invoke the ZOOM::Record constructor here, even though I don't
return ZOOM::Record->_new($this, $which, $_rec);
}
+sub record_immediate {
+ my $this = shift();
+ my($which) = @_;
+
+ my $_rec = Net::Z3950::ZOOM::resultset_record_immediate($this->_rs(),
+ $which);
+ ### Check for error -- but how?
+ return undef if !defined $_rec;
+
+ return ZOOM::Record->_new($this, $which, $_rec);
+}
+
+sub cache_reset {
+ my $this = shift();
+
+ Net::Z3950::ZOOM::resultset_cache_reset($this->_rs());
+}
+
+sub records {
+ my $this = shift();
+ my($start, $count, $return_records) = @_;
+
+ my $raw = Net::Z3950::ZOOM::resultset_records($this->_rs(), $start, $count,
+ $return_records);
+ return undef if !defined $raw;
+
+ # We need to package up the returned records in ZOOM::Record objects
+ my @res = ();
+ for my $i (0 .. @$raw-1) {
+ my $_rec = $raw->[$i];
+ if (!defined $_rec) {
+ push @res, undef;
+ } else {
+ push @res, ZOOM::Record->_new($this, $start+$i, $_rec);
+ }
+ }
+
+ return \@res;
+}
+
+sub sort {
+ my $this = shift();
+ my($sort_type, $sort_spec) = @_;
+
+ Net::Z3950::ZOOM::resultset_sort($this->_rs(), $sort_type, $sort_spec);
+ ### There's no way to check for success, as this is a void function
+}
+
sub destroy {
my $this = shift();
die "You can't create $class objects directly";
}
-# PRIVATE to ZOOM::ResultSet::record()
+# PRIVATE to ZOOM::ResultSet::record(),
+# ZOOM::ResultSet::record_immediate(), ZOOM::ResultSet::records() and
+# ZOOM::Record::clone()
+#
sub _new {
my $class = shift();
my($rs, $which, $_rec) = @_;
}, $class;
}
-# PRIVATE within this class
+# PRIVATE to this class
sub _rec {
my $this = shift();
- return $this->{_rec};
+ my $_rec = $this->{_rec};
+ die "{_rec} undefined: has this Record been destroy()ed?"
+ if !defined $_rec;
+
+ return $_rec;
}
sub render {
return $string;
}
+sub clone {
+ my $this = shift();
+
+ my $raw = Net::Z3950::ZOOM::record_clone($this->_rec())
+ or ZOOM::_oops(ZOOM::Error::CLONE);
+
+ # Arg 1 (rs) is undefined as the new record doesn't belong to an RS
+ return _new ZOOM::Record(undef, undef, $raw);
+}
+
+sub destroy {
+ my $this = shift();
+
+ Net::Z3950::ZOOM::record_destroy($this->_rec());
+ $this->{_rec} = undef;
+}
+
1;