Markdown

[ZOOM-Perl-moved-to-github.git] / lib / Net / Z3950 / ZOOM.pm

diff --git a/lib/Net/Z3950/ZOOM.pm b/lib/Net/Z3950/ZOOM.pm
index b8e3fda..ba0572b 100644 (file)
--- a/lib/Net/Z3950/ZOOM.pm
+++ b/lib/Net/Z3950/ZOOM.pm
@@ -1,22 +1,20 @@
-# $Id: ZOOM.pm,v 1.37 2008-05-14 13:29:57 mike Exp $
-
 package Net::Z3950::ZOOM; 
 
 use 5.008;
 use strict;
 use warnings;
 
-our $VERSION = '1.22';
+our $VERSION = '1.30';
 
 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 < 0x020132 && ! -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.1.50 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__
@@ -153,12 +151,21 @@ sub event_str {
 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 ($type eq "opac" && !defined $val) {
-           $val = record_get_binary($rec, "xml");
+       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;
     }
@@ -175,7 +182,7 @@ Mike Taylor, E<lt>mike@indexdata.comE<gt>
 
 =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,