Merge branch 'master' of newgeom:newgeom.git

[modules/shaper.git] / src / Config / Config_XMLReader.cpp

diff --git a/src/Config/Config_XMLReader.cpp b/src/Config/Config_XMLReader.cpp
index 0261f2551600b54fd7dec93cd03f81247c6763f6..e86579ede4618d8373d487497c83a4cdc106edab 100644 (file)
--- a/src/Config/Config_XMLReader.cpp
+++ b/src/Config/Config_XMLReader.cpp
@@ -6,10 +6,12 @@
  */
 
 #include <Config_XMLReader.h>
+#include <Config_Keywords.h>
+#include <Config_Common.h>
 
-#include <Event_Loop.h>
-#include <libxml\parser.h>
-#include <libxml\tree.h>
+#include <Events_Loop.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
 
 /*
 #ifdef WIN32
@@ -58,21 +60,24 @@ void Config_XMLReader::readAll()
 
 /*
  * Allows to customize reader's behavior for a node. Virtual.
- * The default implementation does nothing. (In debug mode prints
+ * The default impl does nothing. (In debug mode prints
  * some info)
  */
-void Config_XMLReader::processNode(xmlNodePtr aNode)
+void Config_XMLReader::processNode(xmlNodePtr theNode)
 {
-#ifdef _DEBUG
-  std::cout << "Config_XMLReader::processNode: "
-  << aNode->name << " content: "
-  << aNode->content << std::endl;
-#endif
+  if (isNode(theNode, NODE_SOURCE, NULL)) {
+    std::string aSourceFile = getProperty(theNode, SOURCE_FILE);
+    Config_XMLReader aSourceReader = Config_XMLReader(aSourceFile);
+    readRecursively(aSourceReader.findRoot());
+    #ifdef _DEBUG
+    std::cout << "Config_XMLReader::sourced node: " << aSourceFile << std::endl;
+    #endif
+  }
 }
 
 /*
  * Defines which nodes should be processed recursively. Virtual.
- * The default implementation is to read all nodes.
+ * The default impl is to read all nodes.
  */
 bool Config_XMLReader::processChildren(xmlNodePtr aNode)
 {
@@ -92,7 +97,6 @@ xmlNodePtr Config_XMLReader::findRoot()
 #endif
     return NULL;
   }
-
   xmlNodePtr aRoot = xmlDocGetRootElement(myXmlDoc);
 #ifdef _DEBUG
   if(aRoot == NULL) {
@@ -141,48 +145,3 @@ std::string Config_XMLReader::getProperty(xmlNodePtr theNode, const char* name)
   return result;
 }
 
-/*
- * Returns true if theNode is XML node with a given name.
- */
-bool Config_XMLReader::isNode(xmlNodePtr theNode, const char* theNodeName, ...)
-{
-  bool result = false;
-  const xmlChar* aName = theNode->name;
-  if (!aName || theNode->type != XML_ELEMENT_NODE) {
-    return false;
-  }
-  if (!xmlStrcmp(aName, (const xmlChar *) theNodeName)) {
-    return true;
-  }
-  va_list args; // define argument list variable
-  va_start(args, theNodeName); // init list; point to last defined argument
-  while(true) {
-    char *anArg = va_arg (args, char*); // get next argument
-    if (anArg == NULL)
-      break;
-    if (!xmlStrcmp(aName, (const xmlChar *) anArg)) {
-      va_end(args); // cleanup the system stack
-      return true;
-    }
-  }
-  va_end(args); // cleanup the system stack
-  return false;
-}
-
-/*
- * Every xml node has child. Even if there is no explicit
- * child nodes libxml gives the "Text node" as child.
- *
- * This method checks if real child nodes exist in the
- * given node.
- */
-bool Config_XMLReader::hasChild(xmlNodePtr theNode)
-{
-  xmlNodePtr aNode = theNode->children;
-  for(; aNode; aNode = aNode->next) {
-    if (aNode->type != XML_ELEMENT_NODE) {
-      return true;
-    }
-  }
-  return false;
-}