correct xml import method

HoerTech-gGmbH · Apr 28, 2024 · 8ae7212 · 8ae7212
1 parent ab7d919
commit 8ae7212
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/libtascar/include/tscconfig.h b/libtascar/include/tscconfig.h
@@ -87,6 +87,7 @@ namespace tsccfg {
   std::string node_get_text(tsccfg::node_t& n, const std::string& child = "");
   void node_set_text(tsccfg::node_t& n, const std::string& text);
   void node_import_node(tsccfg::node_t& node, const tsccfg::node_t& src);
+  void node_import_node_before(tsccfg::node_t& node, const tsccfg::node_t& src, const tsccfg::node_t& before);
 
   // double node_xpath_to_number(tsccfg::node_t&,const std::string& path);
 

diff --git a/libtascar/src/session_reader.cc b/libtascar/src/session_reader.cc
@@ -68,7 +68,7 @@ void add_includes(tsccfg::node_t e, const std::string& parentdoc,
                         TASCAR::tscbasename(idocname));
         add_includes(idoc.root(), idocname, lh);
         for(auto& isne : idoc.root.get_children())
-          tsccfg::node_import_node(e, isne);
+          tsccfg::node_import_node_before(e, isne, sne);
         tsccfg::node_remove_child(e, sne);
       }
     } else {

diff --git a/libtascar/src/tscconfig.cc b/libtascar/src/tscconfig.cc
@@ -2347,6 +2347,18 @@ void tsccfg::node_import_node(tsccfg::node_t& node, const tsccfg::node_t& src)
 #endif
 }
 
+void tsccfg::node_import_node_before(tsccfg::node_t& node, const tsccfg::node_t& src, const tsccfg::node_t& before)
+{
+#ifdef USEPUGIXML
+  node.append_copy(src);
+#elif defined(USEXERCESXML)
+  auto impnode(node->getOwnerDocument()->importNode(src, true));
+  node->insertBefore(impnode,before);
+#else
+  node->import_node(src);
+#endif
+}
+
 std::string tsccfg::node_get_attribute_value(const tsccfg::node_t& node,
                                              const std::string& name)
 {