From 896e4566c5f976965a803a55488e2a50691f2552 Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Wed, 8 Nov 2006 17:41:27 +0000 Subject: [PATCH] irspy_xpath_context() may now take a textual XML record instead of a DOM tree. dom_add_element() now correctly inserts a new _element_ with specified value, rather than just inserting the value itself. Slightly changed debugging output for modify_xml_document() and dom_add_element(). --- lib/ZOOM/IRSpy/Utils.pm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/ZOOM/IRSpy/Utils.pm b/lib/ZOOM/IRSpy/Utils.pm index e232045..973ff39 100644 --- a/lib/ZOOM/IRSpy/Utils.pm +++ b/lib/ZOOM/IRSpy/Utils.pm @@ -1,4 +1,4 @@ -# $Id: Utils.pm,v 1.7 2006-11-07 17:45:37 mike Exp $ +# $Id: Utils.pm,v 1.8 2006-11-08 17:41:27 mike Exp $ package ZOOM::IRSpy::Utils; @@ -37,9 +37,9 @@ sub xml_encode { sub irspy_xpath_context { - my($zoom_record) = @_; + my($record) = @_; - my $xml = $zoom_record->render(); + my $xml = ref $record ? $record->render() : $record; my $parser = new XML::LibXML(); my $doc = $parser->parse_string($xml); my $root = $doc->getDocumentElement(); @@ -102,7 +102,7 @@ sub modify_xml_document { next if !$value; # No need to create a new empty node my($ppath, $element) = $xpath =~ /(.*)\/(.*)/; dom_add_element($xc, $ppath, $element, $value, @addAfter); - print "Add $key ($xpath) = '$value'
\n"; + print "New $key ($xpath) = '$value'
\n"; $nchanges++; } } @@ -114,7 +114,7 @@ sub modify_xml_document { sub dom_add_element { my($xc, $ppath, $element, $value, @addAfter) = @_; - print "Adding '$value' at '$ppath' after (", join(", ", map { "'$_'" } @addAfter), ")
\n"; + print "Adding $element='$value' at '$ppath' after (", join(", ", map { "'$_'" } @addAfter), ")
\n"; my @nodes = $xc->findnodes($ppath); if (@nodes == 0) { # Oh dear, the parent node doesn't exist. We could make it, @@ -125,12 +125,13 @@ sub dom_add_element { warn scalar(@nodes), " nodes match parent '$ppath'" if @nodes > 1; my $node = $nodes[0]; - my $new = new XML::LibXML::Text($value); + my $new = new XML::LibXML::Element($element); + $new->appendText($value); foreach my $predecessor (reverse @addAfter) { my($child) = $xc->findnodes($predecessor, $node); if (defined $child) { $node->insertAfter($new, $child); - print "Added after '$predecessor'\n"; + print "Added after '$predecessor'
\n"; return; } } @@ -142,10 +143,10 @@ sub dom_add_element { my @children = $node->childNodes(); if (@children) { $node->insertBefore($new, $children[0]); - print "Added new first child\n"; + print "Added new first child
\n"; } else { $node->appendChild($new); - print "Added new only child\n"; + print "Added new only child
\n"; } if (0) { -- 1.7.10.4