Boost has been removed from code

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

diff --git a/src/Config/Config_XMLReader.cpp b/src/Config/Config_XMLReader.cpp
index 6abf8ea7b04359857add3f1488cecdc19cb2d683..44c806ce919faebbb6e70e7121e6ee6eecf0cd4c 100644 (file)
--- a/src/Config/Config_XMLReader.cpp
+++ b/src/Config/Config_XMLReader.cpp
@@ -6,17 +6,17 @@
  */
 
 #include <Config_XMLReader.h>
+#include <Config_Keywords.h>
+#include <Config_Common.h>
+#include <Config_ValidatorMessage.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
-//For GetModuleFileNameW
-#include <windows.h>
+#pragma warning(disable : 4996) // for getenv
 #endif
-*/
 
 #ifdef _DEBUG
 #include <iostream>
@@ -58,21 +58,26 @@ 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)
 {
+  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::processNode: "
-  << aNode->name << " content: "
-  << aNode->content << std::endl;
+    std::cout << "Config_XMLReader::sourced node: " << aSourceFile << std::endl;
 #endif
+  } else if (isNode(theNode, NODE_VALIDATOR, NULL)) {
+    processValidator(theNode);
+  }
 }
 
 /*
  * 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)
 {
@@ -84,7 +89,9 @@ bool Config_XMLReader::processChildren(xmlNodePtr aNode)
  */
 xmlNodePtr Config_XMLReader::findRoot()
 {
-  myXmlDoc = xmlParseFile(myDocumentPath.c_str());
+  if (myXmlDoc == NULL) {
+    myXmlDoc = xmlParseFile(myDocumentPath.c_str());
+  }
   if (myXmlDoc == NULL) {
 #ifdef _DEBUG
     std::cout << "Config_XMLReader::import: " << "Document " << myDocumentPath
@@ -92,7 +99,6 @@ xmlNodePtr Config_XMLReader::findRoot()
 #endif
     return NULL;
   }
-
   xmlNodePtr aRoot = xmlDocGetRootElement(myXmlDoc);
 #ifdef _DEBUG
   if(aRoot == NULL) {
@@ -112,7 +118,11 @@ void Config_XMLReader::readRecursively(xmlNodePtr theParent)
   if (!theParent)
     return;
   xmlNodePtr aNode = theParent->xmlChildrenNode;
-  for(; aNode; aNode = aNode->next) {
+  for (; aNode; aNode = aNode->next) {
+    //Still no text processing in features...
+    if (!isElementNode(aNode)) {
+      continue;
+    }
     processNode(aNode);
     if (processChildren(aNode)) {
       readRecursively(aNode);
@@ -128,43 +138,33 @@ xmlNodePtr Config_XMLReader::node(void* theNode)
   return static_cast<xmlNodePtr>(theNode);
 }
 
-/*
- * Returns named property for a given node as std::string.
- */
-std::string Config_XMLReader::getProperty(xmlNodePtr theNode, const char* name)
+std::string Config_XMLReader::getNodeName(xmlNodePtr theNode)
 {
   std::string result = "";
-  char* aPropChars = (char*) xmlGetProp(theNode, BAD_CAST name);
+  char* aPropChars = (char*) theNode->name;
   if (!aPropChars || aPropChars[0] == 0)
     return result;
   result = std::string(aPropChars);
   return result;
 }
 
-/*
- * Returns true if theNode is XML node with a given name.
- */
-bool Config_XMLReader::isNode(xmlNodePtr theNode, const char* theNodeName, ...)
+void Config_XMLReader::processValidator(xmlNodePtr theNode)
 {
-  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;
-    }
+  Events_ID aValidatoEvent = Events_Loop::eventByName(EVENT_VALIDATOR_LOADED);
+  Events_Loop* aEvLoop = Events_Loop::loop();
+  std::shared_ptr<Config_ValidatorMessage> 
+    aMessage(new Config_ValidatorMessage(aValidatoEvent, this));
+  std::string aValidatorId;
+  std::list<std::string> aValidatorParameters;
+  getValidatorInfo(theNode, aValidatorId, aValidatorParameters);
+  aMessage->setValidatorId(aValidatorId);
+  aMessage->setValidatorParameters(aValidatorParameters);
+  xmlNodePtr aFeatureOrWdgNode = theNode->parent;
+  if (isNode(aFeatureOrWdgNode, NODE_FEATURE, NULL)) {
+    aMessage->setFeatureId(getProperty(aFeatureOrWdgNode, _ID));
+  } else {
+    aMessage->setAttributeId(getProperty(aFeatureOrWdgNode, _ID));
+    aMessage->setFeatureId(myCurrentFeature);
   }
-  va_end(args); // cleanup the system stack
-  return false;
+  aEvLoop->send(aMessage);
 }