Support of additional environment-defined path to plugins. Also make plugins.xml...

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

diff --git a/src/Config/Config_XMLReader.cpp b/src/Config/Config_XMLReader.cpp
index 6b29a5851b9d3c50d3bc1f249e461be338806b72..0ab7ce325ab49fb54694def552a30ed183b7d54d 100644 (file)
--- a/src/Config/Config_XMLReader.cpp
+++ b/src/Config/Config_XMLReader.cpp
@@ -30,6 +30,7 @@
 #include <libxml/tree.h>
 
 #include <fstream>
+#include <sstream>
 
 #ifdef WIN32
 #pragma warning(disable : 4996) // for getenv
@@ -46,26 +47,12 @@
 #endif
 
 Config_XMLReader::Config_XMLReader(const std::string& theXmlFileName)
-    : myXmlDoc(NULL)
+    : myXmlDoc(NULL), myRootFileName(theXmlFileName)
 {
-  std::string prefix = "";
-  Config_Prop* aProp = Config_PropManager::findProp("Plugins", "default_path");
-  if (aProp)
-    prefix = aProp->value();
-  /*
-   * 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)
-   */
-  if (prefix.empty())
-    prefix = pluginConfigFile();
-
-  myDocumentPath = prefix + FSEP + theXmlFileName;
-  std::ifstream aTestFile(myDocumentPath);
-  if (!aTestFile)
-    Events_InfoMessage("Config_XMLReader", "Unable to open %1").arg(myDocumentPath).send();
-  aTestFile.close();
+  myDocumentPath = findConfigFile(theXmlFileName);
+  if (myDocumentPath.empty()) {
+    Events_InfoMessage("Config_XMLReader", "Unable to open %1").arg(theXmlFileName).send();
+  }
 }
 
 Config_XMLReader::~Config_XMLReader()
@@ -89,13 +76,84 @@ std::string Config_XMLReader::pluginConfigFile()
   return aValue;
 }
 
+std::string Config_XMLReader::findConfigFile(const std::string theFileName, const int theFindIndex)
+{
+  int aResultIndex = 0;
+  for(int aSolution = 0; aSolution < 12; aSolution++) {
+    std::string aFileName;
+    if (aSolution == 0) {
+      Config_Prop* aProp = Config_PropManager::findProp("Plugins", "default_path");
+      if (!aProp)
+        continue;
+      aFileName = aProp->value();
+    } else {
+      std::ostringstream anEnvName;
+      if (aSolution == 1)
+        anEnvName<<"SHAPER_ROOT_DIR";
+      else if (aSolution == 2)
+        anEnvName<<"OPENPARTS_ROOT_DIR";
+      else
+        anEnvName<<"OPENPARTS_PLUGINS_DIR";
+
+      char* anEnv = getenv(anEnvName.str().c_str());
+      if (!anEnv)
+        continue;
+      if (aSolution > 2) { // there may be several paths separated by ";" symbol
+        std::string anEnvPart = anEnv;
+        size_t aPosStart = 0, aPosEnd;
+        for(int aSubNum = 0; aSubNum < aSolution - 3; aSubNum++) {
+          aPosStart++;
+          aPosStart = anEnvPart.find(';', aPosStart);
+          if (aPosStart == std::string::npos)
+            break;
+        }
+        if (aPosStart == std::string::npos)
+          break;
+        if (aPosStart != 0)
+          aPosStart++;
+        aPosEnd = anEnvPart.find(';', aPosStart);
+        aFileName = anEnvPart.substr(aPosStart,
+          aPosEnd == std::string::npos ? aPosEnd : aPosEnd - aPosStart) + FSEP;
+      } else {
+        aFileName = std::string(anEnv) + FSEP;
+      }
+      if (aSolution == 1)
+        aFileName += std::string("share") + FSEP + "salome" + FSEP + "resources" + FSEP + "shaper";
+      else if (aSolution == 2)
+        aFileName += "plugins";
+    }
+
+    aFileName += FSEP + theFileName;
+    std::ifstream aTestFile(aFileName);
+    if (aTestFile) {
+      if (aResultIndex == theFindIndex)
+        return aFileName;
+      aResultIndex++;
+      if (aSolution == 1) // don't allow SHAPER and OpenParts paths treated simultaneously
+        aSolution++;
+    }
+  }
+  return ""; // no files found
+}
+
 void Config_XMLReader::readAll()
 {
-  // to load external modules dependencies (like GEOm for Connector Feature
+  // to load external modules dependencies (like GEOM for Connector Feature)
   Config_ModuleReader::loadScript("salome.shaper.initConfig", false);
 
-  xmlNodePtr aRoot = findRoot();
-  readRecursively(aRoot);
+  for(int aSolution = 0; true; aSolution++) {
+    std::string aFoundFile = findConfigFile(myRootFileName, aSolution);
+    if (aFoundFile.empty()) {
+      break; // no more solutions
+    }
+
+    if (myXmlDoc != NULL) { // clear the previous XML document - now the new one will be opened
+      xmlFreeDoc(myXmlDoc);
+      myXmlDoc = NULL;
+    }
+    xmlNodePtr aRoot = findRoot(aFoundFile);
+    readRecursively(aRoot);
+  }
 }
 
 void Config_XMLReader::processNode(xmlNodePtr theNode)
@@ -120,14 +178,15 @@ bool Config_XMLReader::processChildren(xmlNodePtr aNode)
   return true;
 }
 
-xmlNodePtr Config_XMLReader::findRoot()
+xmlNodePtr Config_XMLReader::findRoot(const std::string theDocumentPath)
 {
+  std::string aDocPath = theDocumentPath.empty() ? myDocumentPath : theDocumentPath;
   if (myXmlDoc == NULL) {
-    myXmlDoc = xmlParseFile(myDocumentPath.c_str());
+    myXmlDoc = xmlParseFile(aDocPath.c_str());
   }
   if (myXmlDoc == NULL) {
 #ifdef _DEBUG
-    std::cout << "Config_XMLReader::import: " << "Document " << myDocumentPath
+    std::cout << "Config_XMLReader::import: " << "Document " << aDocPath
     << " is not parsed successfully." << std::endl;
 #endif
     return NULL;