X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FUtils.pm;h=e232045bcd770bfc37f1cd7dc78010e82059ab1f;hb=f792544b44ff2be33f76f4b13fa6b36a0f5c5a52;hp=ca111ceeea03ad03984a5eeaee4dbd370f1c2e37;hpb=755ff16a85a9ce6939a747122ff128dfb302e90e;p=irspy-moved-to-github.git
diff --git a/lib/ZOOM/IRSpy/Utils.pm b/lib/ZOOM/IRSpy/Utils.pm
index ca111ce..e232045 100644
--- a/lib/ZOOM/IRSpy/Utils.pm
+++ b/lib/ZOOM/IRSpy/Utils.pm
@@ -1,4 +1,4 @@
-# $Id: Utils.pm,v 1.4 2006-11-01 10:13:26 mike Exp $
+# $Id: Utils.pm,v 1.7 2006-11-07 17:45:37 mike Exp $
package ZOOM::IRSpy::Utils;
@@ -71,15 +71,29 @@ sub modify_xml_document {
print "Attr $key: '", $node->getValue(), "' -> '$value' ($xpath)
\n";
}
} elsif ($node->isa("XML::LibXML::Element")) {
- my $child = $node->firstChild();
- ### Next line fails if data contains a comment ... *sigh*
- die "element child $child is not text"
- if !ref $child || !$child->isa("XML::LibXML::Text");
- if ($value ne $child->getData()) {
- $child->setData($value);
- $nchanges++;
- print "Elem $key: '", $child->getData(), "' -> '$value' ($xpath)
\n";
+ # The contents could be any mixture of text and
+ # comments and maybe even other crud such as processing
+ # instructions. The simplest thing is just to throw it all
+ # away and start again, making a single Text node the
+ # canonical representation. But before we do that,
+ # we'll check whether the element is already
+ # canonical, to determine whether our change is a
+ # no-op.
+ my $old = "???";
+ my @children = $node->childNodes();
+ if (@children == 1) {
+ my $child = $node->firstChild();
+ if (ref $child && ref $child eq "XML::LibXML::Text") {
+ $old = $child->getData();
+ next if $value eq $old;
+ }
}
+
+ $node->removeChildNodes();
+ my $child = new XML::LibXML::Text($value);
+ $node->appendChild($child);
+ $nchanges++;
+ print "Elem $key: '$old' -> '$value' ($xpath)
\n";
} else {
warn "unexpected node type $node";
}
@@ -108,13 +122,35 @@ sub dom_add_element {
warn "no parent node '$ppath': not adding '$element'='$value'";
return;
}
-
warn scalar(@nodes), " nodes match parent '$ppath'" if @nodes > 1;
my $node = $nodes[0];
- if (1) {
+ my $new = new XML::LibXML::Text($value);
+ foreach my $predecessor (reverse @addAfter) {
+ my($child) = $xc->findnodes($predecessor, $node);
+ if (defined $child) {
+ $node->insertAfter($new, $child);
+ print "Added after '$predecessor'\n";
+ return;
+ }
+ }
+
+ # Didn't find any of the nodes that are supposed to precede the
+ # new one, so we need to insert the new node as the first of the
+ # parent's children. However *sigh* there is no prependChild()
+ # analogous to appendChild(), so we have to go the long way round.
+ my @children = $node->childNodes();
+ if (@children) {
+ $node->insertBefore($new, $children[0]);
+ print "Added new first child\n";
+ } else {
+ $node->appendChild($new);
+ print "Added new only child\n";
+ }
+
+ if (0) {
my $text = xml_encode(inheritance_tree($xc));
- $text =~ s/\n/
$1/sg;
+ $text =~ s/\n/
$&/sg;
print "
$text\n"; } }