X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FRecord.pm;h=a630356a6296bd4cf4ae80a680d00a90cd8cdb0c;hb=224eb0f854accae079cd291ebafc238bf9859443;hp=165f62e525c6ed7304515a7b596c57c32e6ec253;hpb=5e4c0470edbba608e0a0e30538392625ee7fca7e;p=irspy-moved-to-github.git
diff --git a/lib/ZOOM/IRSpy/Record.pm b/lib/ZOOM/IRSpy/Record.pm
index 165f62e..a630356 100644
--- a/lib/ZOOM/IRSpy/Record.pm
+++ b/lib/ZOOM/IRSpy/Record.pm
@@ -1,6 +1,8 @@
-# $Id: Record.pm,v 1.10 2006-07-25 16:53:28 mike Exp $
+# $Id: Record.pm,v 1.23 2007-03-05 19:42:13 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;
@@ -8,7 +10,7 @@ use warnings;
use XML::LibXML;
use XML::LibXML::XPathContext;
-
+use ZOOM::IRSpy::Utils qw(xml_encode isodate);
=head1 NAME
@@ -26,14 +28,16 @@ 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 {
+ irspy => $irspy,
target => $target,
parser => $parser,
zeerex => $parser->parse_string($zeerex)->documentElement(),
@@ -47,12 +51,15 @@ sub _empty_zeerex_record {
### Doesn't recognise SRU/SRW URLs
my($host, $port, $db) = ZOOM::IRSpy::_parse_target_string($target);
+ my $xhost = xml_encode($host);
+ my $xport = xml_encode($port);
+ my $xdb = xml_encode($db);
return <<__EOT__;
- $host
- $port
- $db
+ $xhost
+ $xport
+ $xdb
__EOT__
@@ -67,7 +74,7 @@ sub append_entry {
my $root = $this->{zeerex}; # XML::LibXML::Element ISA XML::LibXML::Node
my $xc = XML::LibXML::XPathContext->new($root);
$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) {
@@ -82,13 +89,26 @@ sub append_entry {
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 store_result {
+ my ($this, $type, %info) = @_;
+ my $xml = "\n";
+
+ $this->append_entry('irspy:status', $xml);
+}
+
# *sigh*
#
@@ -106,7 +126,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,7 +140,7 @@ sub _half_decent_appendWellBalancedChunk {
my($node, $frag) = @_;
if (1) {
- $frag =~ s,>, xmlns:irspy="http://indexdata.com/irspy/1.0">,;
+ $frag =~ s,>, xmlns:irspy="$ZOOM::IRSpy::Utils::IRSPY_NS">,;
$node->appendWellBalancedChunk($frag);
return;
}