-# $Id: ZOOM.pm,v 1.24 2005-12-21 17:01:41 mike Exp $
+# $Id: ZOOM.pm,v 1.33 2006-04-12 12:00:48 mike Exp $
use strict;
use warnings;
package ZOOM;
-
# Member naming convention: hash-element names which begin with an
# underscore represent underlying ZOOM-C object descriptors; those
# which lack them represent Perl's ZOOM objects. (The same convention
sub CLONE { 20005 }
sub PACKAGE { 20006 }
sub SCANTERM { 20007 }
+sub LOGLEVEL { 20008 }
# The "Event" package contains constants returned by last_event()
package ZOOM::Event;
sub RECV_APDU { Net::Z3950::ZOOM::EVENT_RECV_APDU }
sub RECV_RECORD { Net::Z3950::ZOOM::EVENT_RECV_RECORD }
sub RECV_SEARCH { Net::Z3950::ZOOM::EVENT_RECV_SEARCH }
+sub ZEND { Net::Z3950::ZOOM::EVENT_END }
# ----------------------------------------------------------------------------
return "can't create package";
} elsif ($code == ZOOM::Error::SCANTERM) {
return "can't retrieve term from scan-set";
+ } elsif ($code == ZOOM::Error::LOGLEVEL) {
+ return "unregistered log-level";
}
return Net::Z3950::ZOOM::diag_str($code);
}
+sub event_str {
+ return Net::Z3950::ZOOM::event_str(@_);
+}
+
+sub event {
+ my($connsref) = @_;
+
+ my @_connsref = map { $_->_conn() } @$connsref;
+ return Net::Z3950::ZOOM::event(\@_connsref);
+}
+
sub _oops {
my($code, $addinfo, $diagset) = @_;
sub new {
my $class = shift();
- my($host, $port) = @_;
+ my($host, $port, @options) = @_;
+
+ my $_opts = Net::Z3950::ZOOM::options_create();
+ while (@options >= 2) {
+ my $key = shift(@options);
+ my $val = shift(@options);
+ Net::Z3950::ZOOM::options_set($_opts, $key, $val);
+ }
- my $_conn = Net::Z3950::ZOOM::connection_new($host, $port || 0);
+ die "Odd number of options specified"
+ if @options;
+
+ my $_conn = Net::Z3950::ZOOM::connection_create($_opts);
+ Net::Z3950::ZOOM::connection_connect($_conn, $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()
+# PRIVATE to this class, to ZOOM::event() and to ZOOM::Query::CQL2RPN::new()
sub _conn {
my $this = shift();
my $this = shift();
my($host, $port) = @_;
+ $port = 0 if !defined $port;
Net::Z3950::ZOOM::connection_connect($this->_conn(), $host, $port);
$this->_check();
# No return value
return _new ZOOM::Package($this, $options, $_p);
}
+sub last_event {
+ my $this = shift();
+
+ return Net::Z3950::ZOOM::connection_last_event($this->_conn());
+}
+
sub destroy {
my $this = shift();
sub render {
my $this = shift();
- my $len = 0;
- my $string = Net::Z3950::ZOOM::record_get($this->_rec(), "render", $len);
- # I don't think we need '$len' at all. ### Probably the Perl-to-C
- # glue code should use the value of `len' as well as the opaque
- # data-pointer returned, to ensure that the SV contains all of the
- # returned data and does not stop at the first NUL character in
- # binary data. Carefully check the ZOOM_record_get() documentation.
- return $string;
+ return $this->get("render", @_);
}
sub raw {
my $this = shift();
+ return $this->get("raw", @_);
+}
+
+sub get {
+ my $this = shift();
+ my($type, $args) = @_;
+
+ $type = "$type;$args" if defined $args;
my $len = 0;
- my $string = Net::Z3950::ZOOM::record_get($this->_rec(), "raw", $len);
- # See comment about $len in render()
+ my $string = Net::Z3950::ZOOM::record_get($this->_rec(), $type, $len);
+ # I don't think we need '$len' at all. ### Probably the Perl-to-C
+ # glue code should use the value of `len' as well as the opaque
+ # data-pointer returned, to ensure that the SV contains all of the
+ # returned data and does not stop at the first NUL character in
+ # binary data. Carefully check the ZOOM_record_get() documentation.
return $string;
}
package ZOOM::Log;
sub mask_str { my($a) = @_; Net::Z3950::ZOOM::yaz_log_mask_str($a); }
+sub module_level { my($a) = @_; Net::Z3950::ZOOM::yaz_log_module_level($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_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) }
+
+sub log {
+ my($level, @message) = @_;
+
+ if ($level !~ /^(0x)?\d+$/) {
+ # Assuming its log-level name, we look it up.
+ my $num = module_level($level);
+ ZOOM::_oops(ZOOM::Error::LOGLEVEL, $level)
+ if $num == 0;
+ $level = $num;
+ }
+
+ Net::Z3950::ZOOM::yaz_log($level, join("", @message));
+}
1;