Skip to content

U
uniset2
Commit b7843544 authored by Pavel Vaynerman's avatar Pavel Vaynerman
Browse files
Options

use new interface

parent 8b02829c
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 15 deletions
conf/libuniset.spec
View file @ b7843544
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
Name: libuniset Name: libuniset
Version: 0.97 Version: 0.97
Release: eter21 Release: eter22
Summary: UniSet - library for building distributed industrial control systems Summary: UniSet - library for building distributed industrial control systems
License: GPL License: GPL
Group: Development/C++ Group: Development/C++
......
src/Various/NCRestorer_XML.cc
View file @ b7843544
...@@ -221,10 +221,7 @@ bool NCRestorer_XML::getBaseInfo( UniXML& xml, xmlNode* it, IOController_i::Sens ...@@ -221,10 +221,7 @@ bool NCRestorer_XML::getBaseInfo( UniXML& xml, xmlNode* it, IOController_i::Sens
if( !id.empty() ) if( !id.empty() )
sid = uni_atoi( id ); sid = uni_atoi( id );
else else
{ sid = conf->getSensorID(sname);
sname = conf->getSensorsSection()+"/"+sname;
sid = conf->oind->getIdByName(sname);
}
if( sid == UniSetTypes::DefaultObjectId ) if( sid == UniSetTypes::DefaultObjectId )
{ {
...@@ -235,13 +232,7 @@ bool NCRestorer_XML::getBaseInfo( UniXML& xml, xmlNode* it, IOController_i::Sens ...@@ -235,13 +232,7 @@ bool NCRestorer_XML::getBaseInfo( UniXML& xml, xmlNode* it, IOController_i::Sens
ObjectId snode = conf->getLocalNode(); ObjectId snode = conf->getLocalNode();
string snodename(xml.getProp(it,"node")); string snodename(xml.getProp(it,"node"));
if( !snodename.empty() ) if( !snodename.empty() )
{ snode = conf->getNodeID(snodename);
string virtnode = conf->oind->getVirtualNodeName(snodename);
if( virtnode.empty() )
snodename = conf->oind->mkFullNodeName(snodename,snodename);;
snode = conf->oind->getIdByName(snodename);
}
if( snode == UniSetTypes::DefaultObjectId ) if( snode == UniSetTypes::DefaultObjectId )
{ {
...@@ -437,10 +428,10 @@ bool NCRestorer_XML::getConsumerList( UniXML& xml,xmlNode* node, ...@@ -437,10 +428,10 @@ bool NCRestorer_XML::getConsumerList( UniXML& xml,xmlNode* node,
bool NCRestorer_XML::getThresholdInfo( UniXML& xml,xmlNode* node, bool NCRestorer_XML::getThresholdInfo( UniXML& xml,xmlNode* node,
IONotifyController::ThresholdInfoExt& ti ) IONotifyController::ThresholdInfoExt& ti )
{ {
string sid_name = conf->getSensorsSection()+"/"+xml.getProp(node,"sid"); string sid_name = xml.getProp(node,"sid");
if( !sid_name.empty() ) if( !sid_name.empty() )
{ {
ti.sid = conf->oind->getIdByName(sid_name); ti.sid = conf->getSensorID(sid_name);
if( ti.sid == UniSetTypes::DefaultObjectId ) if( ti.sid == UniSetTypes::DefaultObjectId )
{ {
unideb[Debug::CRIT] << "(NCRestorer_XML:getThresholdInfo): " unideb[Debug::CRIT] << "(NCRestorer_XML:getThresholdInfo): "
...@@ -462,7 +453,7 @@ bool NCRestorer_XML::getThresholdInfo( UniXML& xml,xmlNode* node, ...@@ -462,7 +453,7 @@ bool NCRestorer_XML::getThresholdInfo( UniXML& xml,xmlNode* node,
string sid_name(uit.getProp("sid")); string sid_name(uit.getProp("sid"));
if( !sid_name.empty() ) if( !sid_name.empty() )
{ {
ti.sid = conf->oind->getIdByName(sid_name); ti.sid = conf->getSensorID(sid_name);
if( ti.sid == UniSetTypes::DefaultObjectId ) if( ti.sid == UniSetTypes::DefaultObjectId )
{ {
unideb[Debug::CRIT] << "(NCRestorer_XML:getThresholdInfo): " unideb[Debug::CRIT] << "(NCRestorer_XML:getThresholdInfo): "
......
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