X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FRecord.pm;h=e80fe122f393c37f8b641a2bcf31ec89eac1e4c9;hb=9b3b58e46da3867cabcc6a6c54442ea2e6431f9a;hp=4ba8bb669fcddcefdad7c8bad41d4fd76cfc6f43;hpb=8fee192b06cc9df71bc4acc086be42f19cff2244;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy/Record.pm b/lib/ZOOM/IRSpy/Record.pm
index 4ba8bb6..e80fe12 100644
--- a/lib/ZOOM/IRSpy/Record.pm
+++ b/lib/ZOOM/IRSpy/Record.pm
@@ -1,4 +1,4 @@
-# $Id: Record.pm,v 1.25 2007-05-04 12:09:24 mike Exp $
+# $Id: Record.pm,v 1.28 2007-12-12 08:49:58 mike Exp $
 
 package ZOOM::IRSpy::Record;
 ### I don't think there's any reason for this to be separate from
@@ -8,6 +8,7 @@ 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);
@@ -36,12 +37,17 @@ 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(),
     }, $class;
+
+    #Scalar::Util::weaken($this->{irspy});
+    #Scalar::Util::weaken($this->{parser});
+
+    return $this;
 }
 
 
@@ -82,7 +88,8 @@ 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($xc, "<$xpath></$xpath>");
+	$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;
@@ -146,7 +153,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;
     }