-# $Id: Utils.pm,v 1.10 2006-11-13 16:47:57 mike Exp $
+# $Id: Utils.pm,v 1.13 2006-11-14 16:04:36 mike Exp $
package ZOOM::IRSpy::Utils;
sub irspy_namespace {
my($prefix) = @_;
+ use Carp;
+ confess "irspy_namespace(undef)" if !defined $prefix;
my $uri = $_namespaces{$prefix};
die "irspy_namespace(): no URI for namespace prefix '$prefix'"
if !defined $uri;
} else {
next if !$value; # No need to create a new empty node
- my($ppath, $element) = $xpath =~ /(.*)\/(.*)/;
- dom_add_element($xc, $ppath, $element, $value, @addAfter);
+ my($ppath, $selector) = $xpath =~ /(.*)\/(.*)/;
+ dom_add_node($xc, $ppath, $selector, $value, @addAfter);
#print "New $key ($xpath) = '$value'<br/>\n";
$nchanges++;
}
}
-sub dom_add_element {
- my($xc, $ppath, $element, $value, @addAfter) = @_;
+sub dom_add_node {
+ my($xc, $ppath, $selector, $value, @addAfter) = @_;
- #print "Adding $element='$value' at '$ppath' after (", join(", ", map { "'$_'" } @addAfter), ")<br/>\n";
- my @nodes = $xc->findnodes($ppath);
- if (@nodes == 0) {
- # Oh dear, the parent node doesn't exist. We could make it,
- # but for now let's not and say we did.
- ###
- warn "no parent node '$ppath': not adding '$element'='$value'";
+ #print "Adding $selector='$value' at '$ppath' after (", join(", ", map { "'$_'" } @addAfter), ")<br/>\n";
+ my $node = find_or_make_node($xc, $ppath, 0);
+ die "couldn't find or make node '$node'" if !defined $node;
+
+ my $is_attr = ($selector =~ s/^@//);
+ my(undef, $prefix, $simpleSel) = $selector =~ /((.*?):)?(.*)/;
+ #warn "selector='$selector', prefix='$prefix', simpleSel='$simpleSel'";
+ if ($is_attr) {
+ if (defined $prefix) {
+ ### This seems to no-op (thank, DOM!) but I have have no
+ # idea, and it's not needed for IRSpy, so I am not going
+ # to debug it now.
+ $node->setAttributeNS(irspy_namespace($prefix),
+ $simpleSel, $value);
+ } else {
+ $node->setAttribute($simpleSel, $value);
+ }
return;
}
- warn scalar(@nodes), " nodes match parent '$ppath'" if @nodes > 1;
- my $node = $nodes[0];
- my(undef, $prefix, $nsElem) = $element =~ /((.*?):)?(.*)/;
- my $new = new XML::LibXML::Element($nsElem);
+ my $new = new XML::LibXML::Element($simpleSel);
$new->setNamespace(irspy_namespace($prefix), $prefix)
- if $prefix ne "";
+ if defined $prefix;
$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'<br/>\n";
+ #warn "Added after '$predecessor'";
return;
}
}
my @children = $node->childNodes();
if (@children) {
$node->insertBefore($new, $children[0]);
- #print "Added new first child<br/>\n";
+ #warn "Added new first child";
} else {
$node->appendChild($new);
- #print "Added new only child<br/>\n";
+ #warn "Added new only child";
}
if (0) {
}
+sub find_or_make_node {
+ my($xc, $path, $recursion_level) = @_;
+
+ die "deep recursion in find_or_make_node($path)"
+ if $recursion_level == 10;
+ $path = "." if $path eq "";
+
+ my @nodes = $xc->findnodes($path);
+ if (@nodes == 0) {
+ # Oh dear, the parent node doesn't exist. We could make it,
+ my(undef, $ppath, $element) = $path =~ /((.*)\/)?(.*)/;
+ $ppath = "" if !defined $ppath;
+ #warn "path='$path', ppath='$ppath', element='$element'";
+ #warn "no node '$path': making it";
+ my $parent = find_or_make_node($xc, $ppath, $recursion_level-1);
+
+ my(undef, $prefix, $nsElem) = $element =~ /((.*?):)?(.*)/;
+ #warn "element='$element', prefix='$prefix', nsElem='$nsElem'";
+ my $new = new XML::LibXML::Element($nsElem);
+ if (defined $prefix) {
+ #warn "setNamespace($prefix)";
+ $new->setNamespace(irspy_namespace($prefix), $prefix);
+ }
+
+ $parent->appendChild($new);
+ return $new;
+ }
+ warn scalar(@nodes), " nodes match parent '$path'" if @nodes > 1;
+ return $nodes[0];
+}
+
+
sub inheritance_tree {
my($type, $level) = @_;
$level = 0 if !defined $level;