X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FUtils.pm;h=7fa27dc76c2b1d2618483bd08cc2f7bc7b754bf1;hp=ca111ceeea03ad03984a5eeaee4dbd370f1c2e37;hb=86850fba8c3ad72fa3f43514e4cee96d631da98f;hpb=39c002c7302cee8fbce7b0a8d8a879d3a5f47160

diff --git a/lib/ZOOM/IRSpy/Utils.pm b/lib/ZOOM/IRSpy/Utils.pm
index ca111ce..7fa27dc 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.6 2006-11-07 17:18:29 mike Exp $
 
 package ZOOM::IRSpy::Utils;
 
@@ -71,15 +71,29 @@ sub modify_xml_document {
 		    print "Attr $key: '", $node->getValue(), "' -> '$value' ($xpath)<br/>\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)<br/>\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)<br/>\n";
 	    } else {
 		warn "unexpected node type $node";
 	    }
@@ -112,9 +126,9 @@ sub dom_add_element {
     warn scalar(@nodes), " nodes match parent '$ppath'" if @nodes > 1;
     my $node = $nodes[0];
 
-    if (1) {
+    if (0) {
 	my $text = xml_encode(inheritance_tree($xc));
-	$text =~ s/\n/<br\/>$1/sg;
+	$text =~ s/\n/<br\/>$&/sg;
 	print "<pre>$text</pre>\n";
     }
 }