X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2FZOOM%2FIRSpy%2FRecord.pm;h=a0738c8219cd8a257743e8cae27318243b4ffbe6;hb=0ba80bae01b5b0fc932c7372bf6592b855c3a1e1;hp=33699483337d6c402ca21c1d69fbb07fbf94cfc7;hpb=8c2e3dd4ca37ae405e0a5e5bb3a3d4f01abd0c87;p=irspy-moved-to-github.git
diff --git a/lib/ZOOM/IRSpy/Record.pm b/lib/ZOOM/IRSpy/Record.pm
index 3369948..a0738c8 100644
--- a/lib/ZOOM/IRSpy/Record.pm
+++ b/lib/ZOOM/IRSpy/Record.pm
@@ -1,4 +1,4 @@
-# $Id: Record.pm,v 1.7 2006-07-24 15:25:51 mike Exp $
+# $Id: Record.pm,v 1.21 2006-11-30 12:01:23 mike Exp $
package ZOOM::IRSpy::Record;
@@ -8,7 +8,7 @@ use warnings;
use XML::LibXML;
use XML::LibXML::XPathContext;
-
+use ZOOM::IRSpy::Utils qw(xml_encode isodate);
=head1 NAME
@@ -26,7 +26,7 @@ I<## To follow>
sub new {
my $class = shift();
- my($target, $zeerex) = @_;
+ my($irspy, $target, $zeerex) = @_;
if (!defined $zeerex) {
$zeerex = _empty_zeerex_record($target);
@@ -34,6 +34,7 @@ sub new {
my $parser = new XML::LibXML();
return bless {
+ irspy => $irspy,
target => $target,
parser => $parser,
zeerex => $parser->parse_string($zeerex)->documentElement(),
@@ -47,12 +48,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__
@@ -63,25 +67,43 @@ sub append_entry {
my $this = shift();
my($xpath, $frag) = @_;
- print STDERR "this=$this, xpath='$xpath', frag='$frag'\n";
+ #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);
$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) {
- ZOOM::Log::log("irspy", "no matches for '$xpath': can't append");
- return;
- } elsif (@nodes > 1) {
- ZOOM::Log::log("irspy", scalar(@nodes),
- " matches for '$xpath': using first");
+ # Make the node that we're inserting into, if possible. A
+ # 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,
+ "<$xpath>$xpath>");
+ @nodes = $xc->findnodes($xpath);
+ die("still no matches for '$xpath' after creating: can't append")
+ if @nodes == 0;
}
- my $node = $nodes[0];
- # $node ISA XML::LibXML::ElementXML::LibXML::Element
- $this->_half_decent_appendWellBalancedChunk($node, $frag);
- #print STDERR "POST: zeerex='$root' = \n", $root->toString(), "\n";
+ $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);
}
@@ -101,7 +123,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
@@ -115,7 +137,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;
}
@@ -132,7 +154,7 @@ sub _half_decent_appendWellBalancedChunk {
die "mismatched XML start/end <$open>...<$close>"
if $close ne $tag;
print STDERR "tag='$tag', attrs=[$attrs], content='$content'\n";
- die "### no code yet to make DOM node";
+ die "## no code yet to make DOM node";
}