X-Git-Url: http://git.indexdata.com/?p=ZOOM-Perl-moved-to-github.git;a=blobdiff_plain;f=lib%2FNet%2FZ3950%2FZOOM.pm;h=2b1796499de9648ef9d7071fc3311eb189cef57f;hp=49ec94f2c96e604b8914a559899a76c0b6e4ddfe;hb=bd9655f57c044d15ff28da78ceb2f2f100ea5b84;hpb=d7a1cc281d05b9a152c3f71d71449775d601002e

diff --git a/lib/Net/Z3950/ZOOM.pm b/lib/Net/Z3950/ZOOM.pm
index 49ec94f..2b17964 100644
--- a/lib/Net/Z3950/ZOOM.pm
+++ b/lib/Net/Z3950/ZOOM.pm
@@ -1,12 +1,10 @@
-# $Id: ZOOM.pm,v 1.33 2007-02-26 14:36:11 mike Exp $
-
 package Net::Z3950::ZOOM; 
 
 use 5.008;
 use strict;
 use warnings;
 
-our $VERSION = '1.18';
+our $VERSION = '1.29';
 
 require XSLoader;
 XSLoader::load('Net::Z3950::ZOOM', $VERSION);
@@ -134,6 +132,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 = ("<opacRecord>\n  <bibliographicRecord>\n" . $val .
+		    "  </bibliographicRecord>\n</opacRecord>");
+
+	}
+	return $val;
+    }
+}
+
+
 =head1 SEE ALSO
 
 The C<ZOOM> module, included in the same distribution as this one.