From 1aa0ff62a1476b0afd22c5a9f289962c4987f45a Mon Sep 17 00:00:00 2001
From: Robert Jelic <36573031+NoryiE@users.noreply.github.com>
Date: Wed, 5 Mar 2025 09:12:22 +0100
Subject: [PATCH] Children Container fix

---
 src/plugins/xml.lua | 56 +++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/plugins/xml.lua b/src/plugins/xml.lua
index 02f78d7..bcfdec2 100644
--- a/src/plugins/xml.lua
+++ b/src/plugins/xml.lua
@@ -144,29 +144,6 @@ local function createTableFromNode(node, scope)
     return list
 end
 
-local Container = {}
-function Container:loadXML(content, scope)
-    scope = scope or {}
-    local nodes = XMLParser.parseText(content)
-    self:fromXML(nodes, scope)
-end
-
-local baseFromXml
-function Container.setup()
-    baseFromXml = require("elementManager").getElement("BaseElement").fromXML
-end
-
-function Container:fromXML(content, scope)
-    baseFromXml(self, content, scope)
-    for _, node in ipairs(content) do
-        local capitalizedName = node.tag:sub(1,1):upper() .. node.tag:sub(2)
-        if self["add"..capitalizedName] then
-            local element = self["add"..capitalizedName](self)
-            element:fromXML(node, scope)
-        end
-    end
-end
-
 local BaseElement = {}
 function BaseElement:fromXML(node, scope)
     if(node.attributes)then
@@ -206,8 +183,6 @@ function BaseElement:fromXML(node, scope)
                             table.insert(args, convertValue(child.value, scope))
                         elseif (child.tag == "table")then
                             table.insert(args, createTableFromNode(child, scope))
-                        else
-                            errorManager.error("XMLParser: unknown child '" .. child.tag .. "' in element '" .. self:getType() .. "'")
                         end
                     end
                 end
@@ -220,14 +195,41 @@ function BaseElement:fromXML(node, scope)
                     else
                         self[child.tag](self)
                     end
-                else
-                    errorManager.error("XMLParser: method '" .. child.tag .. "' not found in element '" .. self:getType() .. "'")
                 end
             end
         end
     end
 end
 
+local Container = {}
+function Container:loadXML(content, scope)
+    scope = scope or {}
+    local nodes = XMLParser.parseText(content)
+    self:fromXML(nodes, scope)
+    if(nodes)then
+        for _, node in ipairs(nodes) do
+            local capitalizedName = node.tag:sub(1,1):upper() .. node.tag:sub(2)
+            if self["add"..capitalizedName] then
+                local element = self["add"..capitalizedName](self)
+                element:fromXML(node, scope)
+            end
+        end
+    end
+end
+
+function Container:fromXML(nodes, scope)
+    BaseElement.fromXML(self, nodes, scope)
+    if(nodes.children)then
+        for _, node in ipairs(nodes.children) do
+            local capitalizedName = node.tag:sub(1,1):upper() .. node.tag:sub(2)
+            if self["add"..capitalizedName] then
+                local element = self["add"..capitalizedName](self)
+                element:fromXML(node, scope)
+            end
+        end
+    end
+end
+
 return {
     API = XMLParser,
     Container = Container,