X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FConfig%2FConfig_XMLReader.cpp;h=3b206f3ce7a5717fa0a27b3d2613d30f0ecd7b10;hb=53df1b33d7d3787a433f8e4f3936eed28850c48b;hp=fd625fc3f0f070d23d6072449107440923127b77;hpb=c38397a5dd4d35001147a9dfbf649771c6f22229;p=modules%2Fshaper.git

diff --git a/src/Config/Config_XMLReader.cpp b/src/Config/Config_XMLReader.cpp
index fd625fc3f..3b206f3ce 100644
--- a/src/Config/Config_XMLReader.cpp
+++ b/src/Config/Config_XMLReader.cpp
@@ -6,54 +6,49 @@
  */
 
 #include <Config_XMLReader.h>
+#include <Config_Keywords.h>
+#include <Config_Common.h>
+#include <Config_ValidatorMessage.h>
 
-#include <Event_Loop.hxx>
-#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>
 #endif
 
-
 Config_XMLReader::Config_XMLReader(const std::string& theXmlFileName)
+    : myXmlDoc(NULL)
 {
-  std::string prefix;
-  //Get path to *.xml files (typically ./bin/../plugins/)
-#ifdef WIN32
-  HMODULE hModule = GetModuleHandleW(NULL);
-  WCHAR wchar_path[MAX_PATH];
-  GetModuleFileNameW(hModule, wchar_path, MAX_PATH);
-  char char_path[MAX_PATH];
-  char DefChar = ' ';
-  WideCharToMultiByte(CP_ACP, 0, wchar_path, -1, char_path, MAX_PATH, &DefChar, NULL);
-  prefix = std::string(char_path);
-  //chop "bin\XGUI.exe"
-  unsigned found = prefix.rfind("bin");
-  if(found != std::string::npos)
-    prefix.replace(found, prefix.length(), "plugins\\");
-#else
-  //TODO(sbh): Find full path to binary on linux
-  prefix = "../plugins/";
-#endif
+  std::string prefix = "";
+  /*
+   * Get path to *.xml files (typically ./bin/../plugins/)
+
+   * the problem: application may be launched using python executable,
+   * to use environment variable (at least for the current moment)
+   */
+  char* anEnv = getenv("NEW_GEOM_CONFIG_FILE");
+  if (anEnv) {
+    prefix = std::string(anEnv) + "/";
+  }
 
-  m_DocumentPath = prefix + theXmlFileName;
+  myDocumentPath = prefix + theXmlFileName;
 }
 
-
 Config_XMLReader::~Config_XMLReader()
 {
+  xmlFreeDoc(myXmlDoc);
 }
 
 /*
- * Read all nodes (recursively if processChildren() is true
- * for a node). For each read node the processNode will be
- * called.
+ * Read all nodes in associated xml file,
+ * recursively if processChildren(xmlNode) is true for the xmlNode.
+ * For each read node the processNode will be called.
  */
 void Config_XMLReader::readAll()
 {
@@ -63,44 +58,53 @@ 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
+  } else if (isNode(theNode, NODE_VALIDATOR, NULL)) {
+    processValidator(theNode);
+  }
 }
 
 /*
  * Defines which nodes should be processed recursively. Virtual.
- * The default implementation to read all nodes.
+ * The default impl is to read all nodes.
  */
 bool Config_XMLReader::processChildren(xmlNodePtr aNode)
 {
   return true;
 }
 
+/*
+ *
+ */
 xmlNodePtr Config_XMLReader::findRoot()
 {
-  xmlDocPtr aDoc;
-  aDoc = xmlParseFile(m_DocumentPath.c_str());
-  if(aDoc == NULL) {
-    #ifdef _DEBUG
-    std::cout << "Config_XMLReader::import: " << "Document " << m_DocumentPath
-              << " is not parsed successfully." << std::endl;
-    #endif
+  if (myXmlDoc == NULL) {
+    myXmlDoc = xmlParseFile(myDocumentPath.c_str());
+  }
+  if (myXmlDoc == NULL) {
+#ifdef _DEBUG
+    std::cout << "Config_XMLReader::import: " << "Document " << myDocumentPath
+    << " is not parsed successfully." << std::endl;
+#endif
     return NULL;
   }
-  xmlNodePtr aRoot = xmlDocGetRootElement(aDoc);
-  #ifdef _DEBUG
+  xmlNodePtr aRoot = xmlDocGetRootElement(myXmlDoc);
+#ifdef _DEBUG
   if(aRoot == NULL) {
     std::cout << "Config_XMLReader::import: " << "Error: empty document";
   }
-  #endif
+#endif
   return aRoot;
 }
 
@@ -111,16 +115,17 @@ xmlNodePtr Config_XMLReader::findRoot()
  */
 void Config_XMLReader::readRecursively(xmlNodePtr theParent)
 {
-  static Event_ID aFeatureEvent = Event_Loop::EventByName("Feature");
-
-  if(!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)) {
+    if (processChildren(aNode)) {
       readRecursively(aNode);
-      Config_FeatureMessage aMessage(aFeatureEvent, this);
     }
   }
 }
@@ -136,40 +141,33 @@ xmlNodePtr Config_XMLReader::node(void* 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::getProperty(xmlNodePtr theNode, const char* theName)
 {
   std::string result = "";
-  char* aPropChars = (char*) xmlGetProp(theNode, BAD_CAST name);
-  if(!aPropChars || aPropChars[0] == 0)
+  char* aPropChars = (char*) xmlGetProp(theNode, BAD_CAST theName);
+  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();
+  boost::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);
 }