X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_XMLReader.cpp;h=4cd1149f8db927c8669506b1507e5b22cebbcb33;hb=b5893b0a30fac08134c24de4565cb513a43affa6;hp=184fcdf61fa1656a7b395cf0d8ed6c0095f1b82c;hpb=d04ea21b001b5f33f0e7e9947fea32dcfb159970;p=modules%2Fshaper.git

diff --git a/src/Config/Config_XMLReader.cpp b/src/Config/Config_XMLReader.cpp
index 184fcdf61..4cd1149f8 100644
--- a/src/Config/Config_XMLReader.cpp
+++ b/src/Config/Config_XMLReader.cpp
@@ -11,9 +11,10 @@
 #include <Config_Keywords.h>
 #include <Config_Common.h>
 #include <Config_PropManager.h>
+#include <Config_ModuleReader.h>
 
 #include <Events_Loop.h>
-#include <Events_Error.h>
+#include <Events_InfoMessage.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
@@ -36,7 +37,7 @@
 Config_XMLReader::Config_XMLReader(const std::string& theXmlFileName)
     : myXmlDoc(NULL)
 {
-  std::string prefix = ""; 
+  std::string prefix = "";
   Config_Prop* aProp = Config_PropManager::findProp("Plugins", "default_path");
   if (aProp)
     prefix = aProp->value();
@@ -51,7 +52,8 @@ Config_XMLReader::Config_XMLReader(const std::string& theXmlFileName)
 
   myDocumentPath = prefix + FSEP + theXmlFileName;
   std::ifstream aTestFile(myDocumentPath);
-  if (!aTestFile) Events_Error::send("Unable to open " + myDocumentPath);
+  if (!aTestFile)
+    Events_InfoMessage("Config_XMLReader", "Unable to open %1").arg(myDocumentPath).send();
   aTestFile.close();
 }
 
@@ -78,6 +80,9 @@ std::string Config_XMLReader::pluginConfigFile()
 
 void Config_XMLReader::readAll()
 {
+  // to load external modules dependencies (like GEOm for Connector Feature
+  Config_ModuleReader::loadScript("salome.shaper.initConfig", false);
+
   xmlNodePtr aRoot = findRoot();
   readRecursively(aRoot);
 }
@@ -198,3 +203,8 @@ bool Config_XMLReader::cleanupAttribute(const char* theNodeName, const char* the
   }
   return result;
 }
+
+const char* Config_XMLReader::encoding() const
+{
+  return (const char*) myXmlDoc->encoding;
+}
\ No newline at end of file