Changeset 875 for trunk/tools

Timestamp:

11/30/08 00:40:01 (16 years ago)

Author:

swagner

Message:

Enhanced ConfigMerger to prevent multiple merges of application and user settings (#409)

File:

• trunk/tools/ConfigMerger/ConfigMerger.cs (modified) (1 diff)

trunk/tools/ConfigMerger/ConfigMerger.cs

@@ -68 +68 @@
       if (source != null) {
         if (destination == null) {
-          XmlNode clone = document.ImportNode(source, true);
-          document.SelectSingleNode(root).AppendChild(clone);
+          XmlNode newNode = document.ImportNode(source, true);
+          document.SelectSingleNode(root).AppendChild(newNode);
         } else {
           foreach (XmlNode node in source.ChildNodes) {
-            XmlNode clone = document.ImportNode(node, true);
-            destination.AppendChild(clone);
+            XmlNode newNode = document.ImportNode(node, true);
+            XmlNode oldNode = destination.SelectSingleNode(BuildXPathString(newNode));
+            if (oldNode != null)
+              destination.ReplaceChild(newNode, oldNode);
+            else
+              destination.AppendChild(newNode);
           }
         }
       }
     }
+
+    private static string BuildXPathString(XmlNode node) {
+      StringBuilder builder = new StringBuilder();
+      builder.Append(node.Name);
+      if (node.Attributes.Count > 0) {
+        XmlAttribute attrib = node.Attributes[0];
+        builder.Append("[");
+        builder.Append("@" + attrib.Name + "='" + attrib.Value + "'");
+        for (int i = 1; i < node.Attributes.Count; i++) {
+          attrib = node.Attributes[i];
+          builder.Append(" and @" + attrib.Name + "='" + attrib.Value + "'");
+        }
+        builder.Append("]");
+      }
+      return builder.ToString();
+    }
   }
 }