X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FRecord.pm;h=165f62e525c6ed7304515a7b596c57c32e6ec253;hp=33699483337d6c402ca21c1d69fbb07fbf94cfc7;hb=4172edcd817f7b978a772fe2b8365e4f1ee8f3bb;hpb=8c2e3dd4ca37ae405e0a5e5bb3a3d4f01abd0c87 diff --git a/lib/ZOOM/IRSpy/Record.pm b/lib/ZOOM/IRSpy/Record.pm index 3369948..165f62e 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.10 2006-07-25 16:53:28 mike Exp $ package ZOOM::IRSpy::Record; @@ -63,7 +63,7 @@ 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/"); @@ -71,17 +71,22 @@ sub append_entry { 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>"); + @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"; + ZOOM::Log::log("irspy", + scalar(@nodes), " matches for '$xpath': using first") + if @nodes > 1; + + $this->_half_decent_appendWellBalancedChunk($nodes[0], $frag); } @@ -132,7 +137,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"; }