X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2FZOOM%2FIRSpy%2FRecord.pm;h=c5b6c1bab63ac6965c9a5fb33b2f5d95dcd154e6;hb=403ced66f3b48705e1e58c3e8caa6336c4008637;hp=165f62e525c6ed7304515a7b596c57c32e6ec253;hpb=4172edcd817f7b978a772fe2b8365e4f1ee8f3bb;p=irspy-moved-to-github.git
diff --git a/lib/ZOOM/IRSpy/Record.pm b/lib/ZOOM/IRSpy/Record.pm
index 165f62e..c5b6c1b 100644
--- a/lib/ZOOM/IRSpy/Record.pm
+++ b/lib/ZOOM/IRSpy/Record.pm
@@ -1,14 +1,16 @@
-# $Id: Record.pm,v 1.10 2006-07-25 16:53:28 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 irspy_xpath_context);
=head1 NAME
@@ -26,33 +28,46 @@ I<## To follow>
sub new {
my $class = shift();
- my($target, $zeerex) = @_;
+ my($irspy, $target, $zeerex) = @_;
if (!defined $zeerex) {
$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__;
-
- $host
- $port
- $db
+
+ $xhost
+ $xport
+ $xdb
__EOT__
@@ -64,10 +79,9 @@ sub append_entry {
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 => "http://indexdata.com/irspy/1.0");
+ $xc->registerNs(irspy => $ZOOM::IRSpy::Utils::IRSPY_NS);
my @nodes = $xc->findnodes($xpath);
if (@nodes == 0) {
@@ -75,20 +89,39 @@ sub append_entry {
# 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")
if @nodes == 0;
}
- ZOOM::Log::log("irspy",
- scalar(@nodes), " matches for '$xpath': using first")
+ $this->{irspy}->log("warn",
+ scalar(@nodes), " matches for '$xpath': using first")
if @nodes > 1;
$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 = "\n";
+
+ $this->append_entry('irspy:status', $xml);
+}
+
# *sigh*
#
@@ -106,7 +139,7 @@ sub append_entry {
# namespace mapping for that node -- but that only affects pre-parsed
# trees, and is no use for parsing. Hence the following pair of lines
# DOES NOT WORK:
-# $node->setNamespace("http://indexdata.com/irspy/1.0", "irspy", 0);
+# $node->setNamespace($ZOOM::IRSpy::Utils::IRSPY_NS, "irspy", 0);
# $node->appendWellBalancedChunk($frag);
#
# Instead I have to go the long way round, hence this method. I have
@@ -120,8 +153,13 @@ sub _half_decent_appendWellBalancedChunk {
my($node, $frag) = @_;
if (1) {
- $frag =~ s,>, xmlns:irspy="http://indexdata.com/irspy/1.0">,;
- $node->appendWellBalancedChunk($frag);
+ $frag =~ s,>, xmlns:irspy="$ZOOM::IRSpy::Utils::IRSPY_NS">,;
+ eval {
+ $node->appendWellBalancedChunk($frag);
+ }; if ($@) {
+ print STDERR "died while trying to appendWellBalancedChunk(), probably due to bad XML:\n$frag";
+ die $@;
+ }
return;
}