nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for dumpconfig

Browse Source
This commit is contained in:
john30
2016-04-23 11:50:22 +02:00
parent 5ccdb7654f
commit fab8752a01
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/message.cpp
+5 -4
View File
@@ -1096,6 +1096,9 @@ SimpleCondition* SimpleCondition::derive(string valueList)
{ {
if (valueList.empty()) if (valueList.empty())
return NULL; return NULL;
string name = m_condName+valueList;
if (valueList[0]=='=')
valueList.erase(0);
result_t result; result_t result;
if (valueList[0]=='\'') { if (valueList[0]=='\'') {
// strings // strings
@@ -1103,7 +1106,7 @@ SimpleCondition* SimpleCondition::derive(string valueList)
result = splitValues(valueList, values); result = splitValues(valueList, values);
if (result!=RESULT_OK) if (result!=RESULT_OK)
return NULL; return NULL;
return new SimpleStringCondition(m_condName+valueList, m_circuit, m_name, m_dstAddress, m_field, values); return new SimpleStringCondition(name, m_circuit, m_name, m_dstAddress, m_field, values);
} }
// numbers // numbers
if (!isNumeric()) if (!isNumeric())
@@ -1112,7 +1115,7 @@ SimpleCondition* SimpleCondition::derive(string valueList)
result = splitValues(valueList, valueRanges); result = splitValues(valueList, valueRanges);
if (result!=RESULT_OK) if (result!=RESULT_OK)
return NULL; return NULL;
return new SimpleNumericCondition(m_condName+valueList, m_circuit, m_name, m_dstAddress, m_field, valueRanges); return new SimpleNumericCondition(name, m_circuit, m_name, m_dstAddress, m_field, valueRanges);
} }
void SimpleCondition::dump(ostream& output) void SimpleCondition::dump(ostream& output)
@@ -1443,8 +1446,6 @@ result_t MessageMap::readConditions(string& types, const string& filename, Condi
it = m_conditions.find(key.substr(0, pos)); it = m_conditions.find(key.substr(0, pos));
if (it!=m_conditions.end()) { if (it!=m_conditions.end()) {
// derive from another condition // derive from another condition
if (key[pos]=='=')
pos++;
add = it->second->derive(key.substr(pos)); add = it->second->derive(key.substr(pos));
if (add==NULL) { if (add==NULL) {
m_lastError = "derive condition with values "+key.substr(pos)+" failed"; m_lastError = "derive condition with values "+key.substr(pos)+" failed";