X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FNet%2FZ3950%2FZOOM.pm;h=f42f757f5f505eebf89accfe53fd666b3d13f9be;hb=3f358bb1bf680d73fe8b73b3c06cae406e53f16d;hp=efde3c05c23bfa95cb74e2ebb97a32165e9710bf;hpb=e4bbd9744710dba2d6019c684085b7836fbd3ea0;p=ZOOM-Perl-moved-to-github.git
diff --git a/lib/Net/Z3950/ZOOM.pm b/lib/Net/Z3950/ZOOM.pm
index efde3c0..f42f757 100644
--- a/lib/Net/Z3950/ZOOM.pm
+++ b/lib/Net/Z3950/ZOOM.pm
@@ -1,4 +1,4 @@
-# $Id: ZOOM.pm,v 1.34 2007-02-26 15:58:57 mike Exp $
+# $Id: ZOOM.pm,v 1.42 2008-09-29 16:22:25 mike Exp $
package Net::Z3950::ZOOM;
@@ -6,7 +6,7 @@ use 5.008;
use strict;
use warnings;
-our $VERSION = '1.19';
+our $VERSION = '1.26';
require XSLoader;
XSLoader::load('Net::Z3950::ZOOM', $VERSION);
@@ -134,6 +134,46 @@ sub event_str {
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.