X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_ModuleReader.cpp;h=21925af599b1b91fca64131371d931ed98ad6443;hb=7bf19255421b34594c7b0a76d0ce28166d0ce895;hp=5b536141da5370dcf4f2882ce10231dcfdd4d42c;hpb=2a0dd5ede9110d423fbd6b038c0445cb819163a9;p=modules%2Fshaper.git

diff --git a/src/Config/Config_ModuleReader.cpp b/src/Config/Config_ModuleReader.cpp
index 5b536141d..21925af59 100644
--- a/src/Config/Config_ModuleReader.cpp
+++ b/src/Config/Config_ModuleReader.cpp
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 /*
  * Config_ModuleReader.cpp
  *
@@ -5,28 +7,32 @@
  *      Author: sbh
  */
 
+#include <Config_Keywords.h>
+#include <Config_Common.h>
 #include <Config_ModuleReader.h>
 #include <Config_FeatureReader.h>
+#include <Events_Error.h>
+
+#include <libxml/parser.h>
+#include <libxml/tree.h>
 
-#include <libxml\parser.h>
-#include <libxml\tree.h>
+// Have to be included before std headers
+#include <Python.h>
 
-#ifdef _DEBUG
+//Necessary for cerr
 #include <iostream>
-#endif
 
-//Hardcoded xml entities
-// * Nodes
-const static char* NODE_PLUGIN = "plugin";
-const static char* NODE_PLUGINS = "plugins";
+#ifdef WIN32
+#include <windows.h>
+#else
+#include <dlfcn.h>
+#endif
 
-// * Properties
-const static char* PLUGINS_MODULE = "module";
-const static char* PLUGIN_CONFIG = "configuration";
-const static char* PLUGIN_LIBRARY = "library";
+std::map<std::string, Config_ModuleReader::PluginType> Config_ModuleReader::myPluginTypes;
 
-Config_ModuleReader::Config_ModuleReader()
-    : Config_XMLReader("plugins.xml"), m_isAutoImport(false)
+Config_ModuleReader::Config_ModuleReader(const char* theEventGenerated)
+    : Config_XMLReader(PLUGIN_FILE),
+      myEventGenerated(theEventGenerated)
 {
 }
 
@@ -34,6 +40,11 @@ Config_ModuleReader::~Config_ModuleReader()
 {
 }
 
+const std::map<std::string, std::string>& Config_ModuleReader::featuresInFiles() const
+{
+  return myFeaturesInFiles;
+}
+
 /*
  * Get module name from plugins.xml
  * (property "module")
@@ -50,10 +61,16 @@ std::string Config_ModuleReader::getModuleName()
 void Config_ModuleReader::processNode(xmlNodePtr theNode)
 {
   if (isNode(theNode, NODE_PLUGIN, NULL)) {
-    std::string aPluginName = getProperty(theNode, PLUGIN_CONFIG);
-    if (m_isAutoImport)
-      importPlugin(aPluginName);
-    m_pluginsList.push_back(aPluginName);
+    std::string aPluginConf = getProperty(theNode, PLUGIN_CONFIG);
+    std::string aPluginLibrary = getProperty(theNode, PLUGIN_LIBRARY);
+    std::string aPluginScript = getProperty(theNode, PLUGIN_SCRIPT);
+    std::string aPluginName = addPlugin(aPluginLibrary, aPluginScript, aPluginConf);
+
+    std::list<std::string> aFeatures = importPlugin(aPluginName, aPluginConf);
+    std::list<std::string>::iterator it = aFeatures.begin();
+    for (; it != aFeatures.end(); it++) {
+      myFeaturesInFiles[*it] = aPluginConf;
+    }
   }
 }
 
@@ -62,18 +79,105 @@ bool Config_ModuleReader::processChildren(xmlNodePtr theNode)
   return isNode(theNode, NODE_PLUGINS, NULL);
 }
 
-void Config_ModuleReader::importPlugin(const std::string& thePluginName)
+std::list<std::string> Config_ModuleReader::importPlugin(const std::string& thePluginLibrary,
+                                                         const std::string& thePluginXmlConf)
 {
-  Config_FeatureReader aReader(thePluginName);
+  if (thePluginXmlConf.empty()) {  //probably a third party library
+    loadLibrary(thePluginLibrary);
+    return std::list<std::string>();
+  }
+
+  Config_FeatureReader aReader = Config_FeatureReader(thePluginXmlConf,
+                                                      thePluginLibrary,
+                                                      myEventGenerated);
   aReader.readAll();
+  return aReader.features();
+}
+
+std::string Config_ModuleReader::addPlugin(const std::string& aPluginLibrary,
+                                           const std::string& aPluginScript,
+                                           const std::string& aPluginConf)
+{
+  PluginType aType = Config_ModuleReader::Binary;
+  std::string aPluginName;
+  if (!aPluginLibrary.empty()) {
+    aPluginName = aPluginLibrary;
+    if (aPluginConf.empty()) {
+      aType = Config_ModuleReader::Intrenal;
+    }
+  } else if (!aPluginScript.empty()) {
+    aPluginName = aPluginScript;
+    aType = Config_ModuleReader::Python;
+  }
+  if(!aPluginName.empty()) {
+    myPluginTypes[aPluginName] = aType;
+
+  }
+  return aPluginName;
+}
+
+void Config_ModuleReader::loadPlugin(const std::string thePluginName)
+{
+  PluginType aType = Config_ModuleReader::Binary;
+  if(myPluginTypes.find(thePluginName) != myPluginTypes.end()) {
+    aType = myPluginTypes.at(thePluginName);
+  }
+  switch (aType) {
+    case Config_ModuleReader::Python:
+      loadScript(thePluginName);
+      break;
+    case Config_ModuleReader::Binary:
+    case Config_ModuleReader::Intrenal:
+    default:
+      loadLibrary(thePluginName);
+      break;
+  }
 }
 
-void Config_ModuleReader::setAutoImport(bool enabled)
+void Config_ModuleReader::loadScript(const std::string theFileName)
 {
-  m_isAutoImport = enabled;
+  /* aquire 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;
+    //Get detailed error message:
+    if (PyErr_Occurred()) {
+      PyObject *ptype, *pvalue, *ptraceback;
+      PyErr_Fetch(&ptype, &pvalue, &ptraceback);
+      std::string aPyError = std::string(PyString_AsString(pvalue));
+      if (!aPyError.empty()) {
+        anErrorMsg += ":\n" + aPyError;
+      }
+      Py_XDECREF(ptype);
+      Py_XDECREF(pvalue);
+      Py_XDECREF(ptraceback);
+    }
+    Events_Error::send(anErrorMsg);
+  }
+
+  /* release python thread */
+  PyGILState_Release(gstate);
 }
 
-const std::list<std::string>& Config_ModuleReader::pluginsList() const
+void Config_ModuleReader::loadLibrary(const std::string theLibName)
 {
-  return m_pluginsList;
+  std::string aFileName = library(theLibName);
+  if (aFileName.empty())
+    return;
+
+#ifdef WIN32
+  HINSTANCE aModLib = ::LoadLibrary(aFileName.c_str());
+#else
+  void* aModLib = dlopen( aFileName.c_str(), RTLD_LAZY | RTLD_GLOBAL );
+#endif
+  if(!aModLib && theLibName != "DFBrowser") { // don't show error for internal debugging tool
+    std::string anErrorMsg = "Failed to load " + aFileName;
+    #ifndef WIN32
+    anErrorMsg += ": " + std::string(dlerror());
+    #endif
+    Events_Error::send(anErrorMsg);
+  }
 }
+