-# $Id: Record.pm,v 1.20 2006-11-29 18:17:16 mike Exp $
package ZOOM::IRSpy::Record;
+### I don't think there's any reason for this to be separate from
+# ZOOM::IRSpy::Connection, now that the correspondence is always 1:1
use 5.008;
use strict;
use warnings;
+use Scalar::Util;
use XML::LibXML;
use XML::LibXML::XPathContext;
-use ZOOM::IRSpy::Utils qw(xml_encode isodate);
+use ZOOM::IRSpy::Utils qw(xml_encode isodate irspy_xpath_context);
=head1 NAME
$zeerex = _empty_zeerex_record($target);
}
+ ### Parser should be in the IRSpy object
my $parser = new XML::LibXML();
- return bless {
+ my $this = bless {
irspy => $irspy,
target => $target,
parser => $parser,
zeerex => $parser->parse_string($zeerex)->documentElement(),
+ zoom_error => { TIMEOUT => 0 },
}, $class;
+
+ #Scalar::Util::weaken($this->{irspy});
+ #Scalar::Util::weaken($this->{parser});
+
+ return $this;
}
+sub zoom_error { return shift->{'zoom_error'} }
sub _empty_zeerex_record {
my($target) = @_;
- ### Doesn't recognise SRU/SRW URLs
- my($host, $port, $db) = ZOOM::IRSpy::_parse_target_string($target);
+ my($protocol, $host, $port, $db) =
+ ZOOM::IRSpy::_parse_target_string($target);
+ my $xprotocol = xml_encode($protocol);
my $xhost = xml_encode($host);
my $xport = xml_encode($port);
my $xdb = xml_encode($db);
return <<__EOT__;
<explain xmlns="http://explain.z3950.org/dtd/2.0/">
- <serverInfo protocol="Z39.50" version="1995">
+ <serverInfo protocol="$xprotocol">
<host>$xhost</host>
<port>$xport</port>
<database>$xdb</database>
my($xpath, $frag) = @_;
#print STDERR "this=$this, xpath='$xpath', frag='$frag'\n";
- my $root = $this->{zeerex}; # XML::LibXML::Element ISA XML::LibXML::Node
- my $xc = XML::LibXML::XPathContext->new($root);
+ my $xc = $this->xpath_context();
$xc->registerNs(zeerex => "http://explain.z3950.org/dtd/2.0/");
$xc->registerNs(irspy => $ZOOM::IRSpy::Utils::IRSPY_NS);
# fully general version would work its way through each
# component of the XPath, but for now we just treat it as a
# single chunk to go inside the top-level node.
- $this->_half_decent_appendWellBalancedChunk($root,
+ $this->_half_decent_appendWellBalancedChunk($xc->getContextNode(),
"<$xpath></$xpath>");
@nodes = $xc->findnodes($xpath);
die("still no matches for '$xpath' after creating: can't append")
$this->_half_decent_appendWellBalancedChunk($nodes[0], $frag);
}
+sub xpath_context {
+ my $this = shift();
+
+ return irspy_xpath_context($this->{zeerex});
+}
+
sub store_result {
my ($this, $type, %info) = @_;
my $xml = "<irspy:$type";
foreach my $key (keys %info) {
- $xml .= " $key=\"" . $this->_string2cdata($info{$key}) . "\"";
+ $xml .= " $key=\"" . xml_encode($info{$key}) . "\"";
}
$xml .= ">" . isodate(time()) . "</irspy:$type>\n";
if (1) {
$frag =~ s,>, xmlns:irspy="$ZOOM::IRSpy::Utils::IRSPY_NS">,;
- $node->appendWellBalancedChunk($frag);
+ eval {
+ $node->appendWellBalancedChunk($frag);
+ }; if ($@) {
+ print STDERR "died while trying to appendWellBalancedChunk(), probably due to bad XML:\n$frag";
+ die $@;
+ }
return;
}
}
-# Yes, I know that this is already implemented in IRSpy.pm. I suggest that we
-# introduce a toolkit package with such subroutines...
-#
-sub _string2cdata {
- my ($this, $buffer) = @_;
- $buffer =~ s/&/&/gs;
- $buffer =~ s/</</gs;
- $buffer =~ s/>/>/gs;
- $buffer =~ s/"/"/gs;
- $buffer =~ s/'/'/gs;
-
- return $buffer;
-}
-
-
=head1 SEE ALSO
ZOOM::IRSpy