X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FUtils.pm;h=973ff39946d6d30f68d05e5954062758299eacf5;hb=896e4566c5f976965a803a55488e2a50691f2552;hp=7fa27dc76c2b1d2618483bd08cc2f7bc7b754bf1;hpb=86850fba8c3ad72fa3f43514e4cee96d631da98f;p=irspy-moved-to-github.git
diff --git a/lib/ZOOM/IRSpy/Utils.pm b/lib/ZOOM/IRSpy/Utils.pm
index 7fa27dc..973ff39 100644
--- a/lib/ZOOM/IRSpy/Utils.pm
+++ b/lib/ZOOM/IRSpy/Utils.pm
@@ -1,4 +1,4 @@
-# $Id: Utils.pm,v 1.6 2006-11-07 17:18:29 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,
@@ -122,10 +122,33 @@ 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];
+ 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";
+ 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/
$&/sg;