X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FUtils.pm;h=973ff39946d6d30f68d05e5954062758299eacf5;hp=e232045bcd770bfc37f1cd7dc78010e82059ab1f;hb=896e4566c5f976965a803a55488e2a50691f2552;hpb=1a2177d0d492794e7feed3b5fed35cbb2212786e
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) {