X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=lib%2FNet%2FZ3950%2FZOOM.pm;h=3bbed5053601532d85eb66b9d1214ee619cf8524;hb=0b413d7f000f44e8359b6679b49ab5ea05a1bc1c;hp=de8a0400b8f19749704aba73c12f5c278affc5d2;hpb=f6593c83417f8e33a25067a8068f8bbff7d8b2e5;p=ZOOM-Perl-moved-to-github.git
diff --git a/lib/Net/Z3950/ZOOM.pm b/lib/Net/Z3950/ZOOM.pm
index de8a040..3bbed50 100644
--- a/lib/Net/Z3950/ZOOM.pm
+++ b/lib/Net/Z3950/ZOOM.pm
@@ -1,22 +1,20 @@
-# $Id: ZOOM.pm,v 1.17 2006-04-07 12:06:08 mike Exp $
-
package Net::Z3950::ZOOM;
use 5.008;
use strict;
use warnings;
-our $VERSION = '1.05';
+our $VERSION = '1.29';
require XSLoader;
XSLoader::load('Net::Z3950::ZOOM', $VERSION);
my($vs, $ss) = ("x" x 100, "x" x 100); # allocate space for these strings
my $version = Net::Z3950::ZOOM::yaz_version($vs, $ss);
-if ($version < 0x02010B && ! -f "/tmp/ignore-ZOOM-YAZ-version-mismatch") {
+if ($version < 0x040000 && ! -f "/tmp/ignore-ZOOM-YAZ-version-mismatch") {
warn <<__EOT__;
*** WARNING!
-ZOOM-Perl requires at least version 2.0.11 of YAZ, but is currently
+ZOOM-Perl requires at least version 4.0.0 of YAZ, but is currently
running against only version $vs (sys-string '$ss').
Some things may not work.
__EOT__
@@ -40,6 +38,8 @@ sub ERROR_UNSUPPORTED_QUERY { 10009 }
sub ERROR_INVALID_QUERY { 10010 }
sub ERROR_CQL_PARSE { 10011 }
sub ERROR_CQL_TRANSFORM { 10012 }
+sub ERROR_CCL_CONFIG { 10013 }
+sub ERROR_CCL_PARSE { 10014 }
# Event types, as returned from connection_last_event()
sub EVENT_NONE { 0 }
@@ -54,6 +54,21 @@ sub EVENT_RECV_RECORD { 8 }
sub EVENT_RECV_SEARCH { 9 }
sub EVENT_END { 10 } # In YAZ 2.1.17 and later
+# CCL error-codes, which are in a different space from the ZOOM errors
+sub CCL_ERR_OK { 0 }
+sub CCL_ERR_TERM_EXPECTED { 1 }
+sub CCL_ERR_RP_EXPECTED { 2 }
+sub CCL_ERR_SETNAME_EXPECTED { 3 }
+sub CCL_ERR_OP_EXPECTED { 4 }
+sub CCL_ERR_BAD_RP { 5 }
+sub CCL_ERR_UNKNOWN_QUAL { 6 }
+sub CCL_ERR_DOUBLE_QUAL { 7 }
+sub CCL_ERR_EQ_EXPECTED { 8 }
+sub CCL_ERR_BAD_RELATION { 9 }
+sub CCL_ERR_TRUNC_NOT_LEFT { 10 }
+sub CCL_ERR_TRUNC_NOT_BOTH { 11 }
+sub CCL_ERR_TRUNC_NOT_RIGHT { 12 }
+
=head1 NAME
@@ -112,11 +127,51 @@ sub event_str {
} elsif ($code == EVENT_RECV_SEARCH) {
return "receive search";
} elsif ($code == EVENT_END) {
- return "receive end";
+ return "end";
}
return "impossible event " . $code;
}
+
+# Switch API variant depending on $type. This works because the
+# get_string() and get_binary() functions have different returns
+# types, one of which is implemented as a NUL-terminated string and
+# the other as a pointer-and-length structure.
+#
+# Some Z39.50 servers, when asked for an OPAC-format record in the
+# case where no circulation information is available, will return a
+# USMARC record rather than an OPAC record containing only a
+# bibliographic part. This non-OPAC records is not recognised by the
+# underlying record_get() code in ZOOM-C, which ends up returning a
+# null pointer. To make life a little less painful when dealing with
+# such servers until ZOOM-C is fixed, this code recognises the
+# wrong-record-syntax case and returns the XML for the bibliographic
+# part anyway.
+#
+sub record_get {
+ my($rec, $type) = @_;
+
+ my $simpletype = $type;
+ $simpletype =~ s/;.*//;
+ if (grep { $type eq $_ } qw(database syntax schema)) {
+ return record_get_string($rec, $type);
+ } else {
+ my $val = record_get_binary($rec, $type);
+ if ($simpletype eq "opac" && !defined $val) {
+ my $newtype = $type;
+ if ($newtype !~ s/.*?;/xml;/) {
+ $newtype = "xml";
+ }
+ $val = record_get_binary($rec, $newtype);
+ $val = ("\n \n" . $val .
+ " \n");
+
+ }
+ return $val;
+ }
+}
+
+
=head1 SEE ALSO
The C module, included in the same distribution as this one.
@@ -127,7 +182,7 @@ Mike Taylor, Emike@indexdata.comE
=head1 COPYRIGHT AND LICENCE
-Copyright (C) 2005 by Index Data.
+Copyright (C) 2005-2014 by Index Data.
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself, either Perl version 5.8.4 or,