Commit 3a5950ae authored by Pavel Vainerman's avatar Pavel Vainerman

Configuration: исправил ошибку со static переменными (конфигураций может быть…

Configuration: исправил ошибку со static переменными (конфигураций может быть много..а это не учитывалось).
parent 96c30553
...@@ -210,11 +210,11 @@ namespace UniSetTypes ...@@ -210,11 +210,11 @@ namespace UniSetTypes
std::string secServices; std::string secServices;
// xml // xml
static xmlNode* xmlSensorsSec; xmlNode* xmlSensorsSec;
static xmlNode* xmlObjectsSec; xmlNode* xmlObjectsSec;
static xmlNode* xmlControllersSec; xmlNode* xmlControllersSec;
static xmlNode* xmlServicesSec; xmlNode* xmlServicesSec;
static xmlNode* xmlNodesSec; xmlNode* xmlNodesSec;
ObjectId localDBServer; ObjectId localDBServer;
ObjectId localNode; ObjectId localNode;
......
...@@ -161,6 +161,13 @@ void Configuration::initConfiguration( int argc, const char* const* argv ) ...@@ -161,6 +161,13 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
// PassiveTimer pt(UniSetTimer::WaitUpTime); // PassiveTimer pt(UniSetTimer::WaitUpTime);
ulogsys << "*** configure from file: " << fileConfName << endl; ulogsys << "*** configure from file: " << fileConfName << endl;
// -------------------------------------------------------------------------
xmlSensorsSec = 0;
xmlObjectsSec = 0;
xmlControllersSec = 0;
xmlServicesSec = 0;
xmlNodesSec = 0;
// -------------------------------------------------------------------------
char curdir[FILENAME_MAX]; char curdir[FILENAME_MAX];
getcwd(curdir,FILENAME_MAX); getcwd(curdir,FILENAME_MAX);
...@@ -881,12 +888,6 @@ UniSetTypes::ObjectId Configuration::getNodeID( const std::string& name ) ...@@ -881,12 +888,6 @@ UniSetTypes::ObjectId Configuration::getNodeID( const std::string& name )
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
xmlNode* Configuration::xmlSensorsSec = 0;
xmlNode* Configuration::xmlObjectsSec = 0;
xmlNode* Configuration::xmlControllersSec = 0;
xmlNode* Configuration::xmlServicesSec = 0;
xmlNode* Configuration::xmlNodesSec = 0;
// -------------------------------------------------------------------------
xmlNode* Configuration::getXMLSensorsSection() xmlNode* Configuration::getXMLSensorsSection()
{ {
if( xmlSensorsSec ) if( xmlSensorsSec )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment