Merge branch 'master' into cgt/devCEA

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

diff --git a/src/Config/Config_ModuleReader.cpp b/src/Config/Config_ModuleReader.cpp
index 74ab766966a98c590d0079cc2405311950aa781f..9e8549cdb43bd7d7aea303add9f452ed95bf922c 100644 (file)
--- a/src/Config/Config_ModuleReader.cpp
+++ b/src/Config/Config_ModuleReader.cpp
@@ -7,11 +7,13 @@
  *      Author: sbh
  */
 
+#include <pyconfig.h>
+
 #include <Config_Keywords.h>
 #include <Config_Common.h>
 #include <Config_ModuleReader.h>
 #include <Config_FeatureReader.h>
-#include <Events_Error.h>
+#include <Events_InfoMessage.h>
 
 #include <libxml/parser.h>
 #include <libxml/tree.h>
@@ -48,6 +50,11 @@ 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")
@@ -58,12 +65,29 @@ std::string Config_ModuleReader::getModuleName()
   return getProperty(aRoot, PLUGINS_MODULE);
 }
 
+
+void Config_ModuleReader::addFeature(const std::string& theFeatureName,
+                                     const std::string& thePluginConfig)
+{
+  if (myFeaturesInFiles.count(theFeatureName)) {
+    std::string anErrorMsg = "Can not register feature '%1' in plugin '%2'."
+      " There is a feature with the same ID.";
+    Events_InfoMessage("Config_ModuleReader", anErrorMsg)
+      .arg(theFeatureName).arg(thePluginConfig).send();
+    return;
+  }
+
+  myFeaturesInFiles[theFeatureName] = thePluginConfig;
+}
+
 void Config_ModuleReader::processNode(xmlNodePtr theNode)
 {
   if (isNode(theNode, NODE_PLUGIN, NULL)) {
     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);
@@ -71,7 +95,7 @@ void Config_ModuleReader::processNode(xmlNodePtr theNode)
     std::list<std::string> aFeatures = importPlugin(aPluginName, aPluginConf);
     std::list<std::string>::iterator it = aFeatures.begin();
     for (; it != aFeatures.end(); it++) {
-      myFeaturesInFiles[*it] = aPluginConf;
+      addFeature(*it, aPluginConf);
     }
   }
 }
@@ -148,14 +172,14 @@ void Config_ModuleReader::loadPlugin(const std::string& thePluginName)
   }
 }
 
-void Config_ModuleReader::loadScript(const std::string& theFileName)
+void Config_ModuleReader::loadScript(const std::string& theFileName, bool theSendErr)
 {
-  /* aquire python thread */
+  /* acquire python thread */
   PyGILState_STATE gstate = PyGILState_Ensure();
 
   PyObject* module = PyImport_ImportModule(theFileName.c_str());
   if (!module) {
-    std::string anErrorMsg = "An error occured while importing " + theFileName;
+    std::string anErrorMsg = "An error occurred while importing " + theFileName;
     //Get detailed error message:
     if (PyErr_Occurred()) {
       PyObject *pstr, *ptype, *pvalue, *ptraceback;
@@ -171,7 +195,8 @@ void Config_ModuleReader::loadScript(const std::string& theFileName)
       Py_XDECREF(pvalue);
       Py_XDECREF(ptraceback);
     }
-    Events_Error::send(anErrorMsg);
+    if (theSendErr)
+      Events_InfoMessage("Config_ModuleReader", anErrorMsg).send();
   }
 
   /* release python thread */
@@ -184,18 +209,29 @@ void Config_ModuleReader::loadLibrary(const std::string& 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);
+    Events_InfoMessage("Config_ModuleReader", anErrorMsg).send();
   }
 }