Ticket #2951: template_subsets_fix.diff

binaries/data/mods/public/simulation/templates/special_filter/foundation.xml

@@ -8 +8 @@
     <PopulationBonus>0</PopulationBonus>
   </Cost>
   <Decay merge=""/>
-  <!-- Initialise health to 1 -->
-  <Health>
-    <Initial>1</Initial>
-  </Health>
   <Fogging merge=""/>
   <Footprint merge=""/>
   <!-- Add the Foundation component, to deal with the construction process -->
   <Foundation replace=""/>
-  <Health merge=""/>
+  <!-- Initialise health to 1 -->
+  <Health>
+    <Initial>1</Initial>
+  </Health>
   <Identity merge=""/>
   <!-- Foundations shouldn't initially block unit movement -->
   <Obstruction merge="">

source/simulation2/system/ParamNode.cpp

@@ -87 +87 @@
     } op = INVALID;
     bool replacing = false;
     bool filtering = false;
+    bool merging = false;
     {
         XERO_ITER_ATTR(element, attr)
         {
@@ -108 +109 @@
             {
                 if (m_Childs.find(name) == m_Childs.end())
                     return;
+                merging = true;
             }
             else if (attr.Name == at_op)
             {
@@ -183 +185 @@
         } 
         hasSetValue = true; 
     } 
-    if (!hasSetValue)
+    if (!hasSetValue && !merging)
         node.m_Value = value;
 
     // Recurse through the element's children
@@ -193 +195 @@
         if (filtering)
         {
             std::string childname = xmb.GetElementString(child.GetNodeName()); // TODO: is GetElementString inefficient? (especially if we call it twice)
-            childs[childname] = std::move(node.m_Childs[childname]);
+            if (node.m_Childs.find(childname) != node.m_Childs.end())
+                childs[childname] = std::move(node.m_Childs[childname]);
         }
     }
 
@@ -212 +215 @@
     }
 }
 
-void CParamNode::CopyFilteredChildrenOfChild(const CParamNode& src, const char* name, const std::set<std::string>& permitted)
-{
-    ResetScriptVal();
-
-    ChildrenMap::iterator dstChild = m_Childs.find(name);
-    ChildrenMap::const_iterator srcChild = src.m_Childs.find(name);
-    if (dstChild == m_Childs.end() || srcChild == src.m_Childs.end())
-        return; // error
-
-    ChildrenMap::const_iterator it = srcChild->second.m_Childs.begin();
-    for (; it != srcChild->second.m_Childs.end(); ++it)
-        if (permitted.count(it->first))
-            dstChild->second.m_Childs[it->first] = it->second;
-}
-
 const CParamNode& CParamNode::GetChild(const char* name) const
 {
     ChildrenMap::const_iterator it = m_Childs.find(name);

source/simulation2/system/ParamNode.h

@@ -182 +182 @@
     static PSRETURN LoadXMLString(CParamNode& ret, const char* xml, const wchar_t* sourceIdentifier = NULL);
 
     /**
-     * Finds the childs named @a name from @a src and from @a this, and copies the source child's children
-     * which are in the @a permitted set into this node's child.
-     * Intended for use as a filtered clone of XML files.
-     * @a this and @a src must have childs named @a name.
-     */
-    void CopyFilteredChildrenOfChild(const CParamNode& src, const char* name, const std::set<std::string>& permitted);
-
-    /**
      * Returns the (unique) child node with the given name, or a node with IsOk() == false if there is none.
      */
     const CParamNode& GetChild(const char* name) const;

source/simulation2/tests/test_ParamNode.h

@@ -141 +141 @@
         TS_ASSERT_EQUALS(CParamNode::LoadXMLString(node, "<test> <a><b/></a> <c>toberemoved</c> <d><e/></d> </test>"), PSRETURN_OK);
         TS_ASSERT_EQUALS(CParamNode::LoadXMLString(node, "<test filtered=\"\"> <a/> <d><f/></d> <g/> </test>"), PSRETURN_OK);
         TS_ASSERT_WSTR_EQUALS(node.ToXML(), L"<test><a><b></b></a><d><e></e><f></f></d><g></g></test>");
+
+        CParamNode node2;
+        TS_ASSERT_EQUALS(CParamNode::LoadXMLString(node2, "<test> <a><b>b</b><c>c</c><d>d</d><e>e</e></a> <f/> </test>"), PSRETURN_OK);
+        TS_ASSERT_EQUALS(CParamNode::LoadXMLString(node2, "<test filtered=\"\"> <a filtered=\"\"><b merge=\"\"/><c>c2</c><d/></a> </test>"), PSRETURN_OK);
+        TS_ASSERT_WSTR_EQUALS(node2.ToXML(), L"<test><a><b>b</b><c>c2</c><d></d></a></test>");
     }
 
     void test_overlay_merge()
@@ -151 +156 @@
         TS_ASSERT_WSTR_EQUALS(node.ToXML(), L"<test><a><b>test</b><c>bar</c><d>baz</d></a><x><w>more text</w><y><v>text</v><z>foo</z></y></x></test>");
     }
 
+    void test_overlay_filtered_merge()
+    {
+        CParamNode node;
+        TS_ASSERT_EQUALS(CParamNode::LoadXMLString(node, "<test> <a><b/></a> <c><x/></c> <Health><Max>1200</Max></Health> </test>"), PSRETURN_OK);
+        TS_ASSERT_EQUALS(CParamNode::LoadXMLString(node, "<test filtered=\"\"> <c merge=\"\"/> <d>bar</d> <e merge=\"\"/> <Health><Initial>1</Initial></Health> </test>"), PSRETURN_OK);
+        TS_ASSERT_WSTR_EQUALS(node.ToXML(), L"<test><Health><Initial>1</Initial><Max>1200</Max></Health><c><x></x></c><d>bar</d></test>");
+    }
+
     void test_types()
     {
         CParamNode node;