Issue #608: Usage of OCCT in interface -- Wrap classes by SWIG

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

diff --git a/src/Config/Config_ModuleReader.cpp b/src/Config/Config_ModuleReader.cpp
index 526b9965f51aebc1b97b482991fa5d2a1fa2da66..d298a412c0b4282a6c4151049791aaa62fb4480e 100644 (file)
--- a/src/Config/Config_ModuleReader.cpp
+++ b/src/Config/Config_ModuleReader.cpp
@@ -7,6 +7,8 @@
  *      Author: sbh
  */
 
+#include <pyconfig.h>
+
 #include <Config_Keywords.h>
 #include <Config_Common.h>
 #include <Config_ModuleReader.h>
@@ -31,18 +33,12 @@
 #endif
 
 std::map<std::string, Config_ModuleReader::PluginType> Config_ModuleReader::myPluginTypes;
+std::set<std::string> Config_ModuleReader::myDependencyModules;
 
 Config_ModuleReader::Config_ModuleReader(const char* theEventGenerated)
     : Config_XMLReader(PLUGIN_FILE),
       myEventGenerated(theEventGenerated)
 {
-  myHaveSalome = false;
-  char* anEnv = getenv("SALOME_ROOT_DIR");
-  std::string value = normalize(anEnv);
-  if (!value.empty()) {
-    myHaveSalome = true;
-  }
-
 }
 
 Config_ModuleReader::~Config_ModuleReader()
@@ -54,7 +50,12 @@ const std::map<std::string, std::string>& Config_ModuleReader::featuresInFiles()
   return myFeaturesInFiles;
 }
 
-/*
+const std::set<std::string>& Config_ModuleReader::modulePluginFiles() const
+{
+  return myPluginFiles;
+}
+
+/*!
  * Get module name from plugins.xml
  * (property "module")
  */
@@ -64,16 +65,13 @@ std::string Config_ModuleReader::getModuleName()
   return getProperty(aRoot, PLUGINS_MODULE);
 }
 
-/*
- *
- */
 void Config_ModuleReader::processNode(xmlNodePtr theNode)
 {
   if (isNode(theNode, NODE_PLUGIN, NULL)) {
-    bool isAvailable = isAvaliableOnThisPlatform(getProperty(theNode, PLUGIN_PLATFORM));
-    if (!isAvailable)
+    if (!hasRequiredModules(theNode))
       return;
     std::string aPluginConf = getProperty(theNode, PLUGIN_CONFIG);
+    if (!aPluginConf.empty()) myPluginFiles.insert(aPluginConf);
     std::string aPluginLibrary = getProperty(theNode, PLUGIN_LIBRARY);
     std::string aPluginScript = getProperty(theNode, PLUGIN_SCRIPT);
     std::string aPluginName = addPlugin(aPluginLibrary, aPluginScript, aPluginConf);
@@ -91,6 +89,18 @@ bool Config_ModuleReader::processChildren(xmlNodePtr theNode)
   return isNode(theNode, NODE_PLUGINS, NULL);
 }
 
+bool Config_ModuleReader::hasRequiredModules(xmlNodePtr theNode) const
+{
+  std::string aRequiredModule = normalize(getProperty(theNode, PLUGIN_DEPENDENCY));
+  if(aRequiredModule.empty())
+    return true;
+  std::set<std::string>::iterator it = myDependencyModules.begin();
+  for ( ; it != myDependencyModules.end(); it++ ) {
+    if (*it == aRequiredModule) return true;
+  }
+  return false;
+}
+
 std::list<std::string> Config_ModuleReader::importPlugin(const std::string& thePluginLibrary,
                                                          const std::string& thePluginXmlConf)
 {
@@ -124,11 +134,11 @@ std::string Config_ModuleReader::addPlugin(const std::string& aPluginLibrary,
   if(!aPluginName.empty()) {
     myPluginTypes[aPluginName] = aType;
   }
-
+  addDependencyModule(aPluginName);
   return aPluginName;
 }
 
-void Config_ModuleReader::loadPlugin(const std::string thePluginName)
+void Config_ModuleReader::loadPlugin(const std::string& thePluginName)
 {
   PluginType aType = Config_ModuleReader::Binary;
   if(myPluginTypes.find(thePluginName) != myPluginTypes.end()) {
@@ -146,30 +156,7 @@ void Config_ModuleReader::loadPlugin(const std::string thePluginName)
   }
 }
 
-bool Config_ModuleReader::isAvaliableOnThisPlatform(const std::string& thePluginPlatform)
-{
-  bool result = true;
-  PluginPlatform aPlatform = All;
-  std::string aPlatformName = normalize(thePluginPlatform) ;
-  if (aPlatformName == PLUGIN_PLATFORM_SALOME) {
-    aPlatform = Salome;
-  } else if (aPlatformName == PLUGIN_PLATFORM_NEWGEOM) {
-    aPlatform = OpenParts;
-  } else if (!thePluginPlatform.empty()) {
-    Events_Error::send("Unknown platform: " + thePluginPlatform);
-  }
-  if (aPlatform == All) {
-    result = true;
-  } else if (myHaveSalome) {
-    result = aPlatform == Salome;
-  } else {
-    result = aPlatform == OpenParts;
-  }
-  return result;
-
-}
-
-void Config_ModuleReader::loadScript(const std::string theFileName)
+void Config_ModuleReader::loadScript(const std::string& theFileName)
 {
   /* aquire python thread */
   PyGILState_STATE gstate = PyGILState_Ensure();
@@ -199,23 +186,40 @@ void Config_ModuleReader::loadScript(const std::string theFileName)
   PyGILState_Release(gstate);
 }
 
-void Config_ModuleReader::loadLibrary(const std::string theLibName)
+void Config_ModuleReader::loadLibrary(const std::string& theLibName)
 {
   std::string aFileName = library(theLibName);
   if (aFileName.empty())
     return;
 
-#ifdef WIN32
+  #ifdef WIN32
   HINSTANCE aModLib = ::LoadLibrary(aFileName.c_str());
-#else
+  #else
   void* aModLib = dlopen( aFileName.c_str(), RTLD_LAZY | RTLD_GLOBAL );
-#endif
+  #endif
   if(!aModLib && theLibName != "DFBrowser") { // don't show error for internal debugging tool
     std::string anErrorMsg = "Failed to load " + aFileName;
-    #ifndef WIN32
+    #ifdef WIN32
+    DWORD   dwLastError = ::GetLastError();
+    LPSTR messageBuffer = NULL;
+    size_t size = ::FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                                 FORMAT_MESSAGE_FROM_SYSTEM | 
+                                 FORMAT_MESSAGE_IGNORE_INSERTS,
+                                 NULL, 
+                                 dwLastError, 
+                                 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), 
+                                 (LPSTR)&messageBuffer, 0, NULL);
+    anErrorMsg += ": " +  std::string(messageBuffer, size);
+    #else
     anErrorMsg += ": " + std::string(dlerror());
     #endif
+    std::cerr << anErrorMsg << std::endl;
     Events_Error::send(anErrorMsg);
   }
 }
 
+void Config_ModuleReader::addDependencyModule(const std::string& theModuleName)
+{
+  myDependencyModules.insert(normalize(theModuleName));
+}
+