X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FRecord.pm;h=c5b6c1bab63ac6965c9a5fb33b2f5d95dcd154e6;hb=00450608fbb1abc4bd5e75d269ff0c87f87b9b48;hp=7659e4ada7e49badcad4db7459ea150c977d5d96;hpb=7e30dd5f86e43b3e2f19b33d713d413168c7fd6b;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy/Record.pm b/lib/ZOOM/IRSpy/Record.pm
index 7659e4a..c5b6c1b 100644
--- a/lib/ZOOM/IRSpy/Record.pm
+++ b/lib/ZOOM/IRSpy/Record.pm
@@ -1,4 +1,3 @@
-# $Id: Record.pm,v 1.24 2007-04-27 14:04:40 mike Exp $
 
 package ZOOM::IRSpy::Record;
 ### I don't think there's any reason for this to be separate from
@@ -8,9 +7,10 @@ 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
 
@@ -36,14 +36,21 @@ sub new {
 
     ### 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) = @_;
@@ -72,8 +79,7 @@ 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 => $ZOOM::IRSpy::Utils::IRSPY_NS);
 
@@ -83,7 +89,7 @@ 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")
@@ -97,6 +103,12 @@ sub append_entry {
     $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";
@@ -142,7 +154,12 @@ sub _half_decent_appendWellBalancedChunk {
 
     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;
     }