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

ignore case in class and name

Browse Source
This commit is contained in:
john30
2014-12-29 22:31:22 +01:00
parent 98fb32cbfc
commit df85caf71f
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/message.cpp
+21 -8
View File
@@ -24,6 +24,8 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <cstring> #include <cstring>
#include <algorithm>
#include <locale>
using namespace std; using namespace std;
@@ -345,6 +347,13 @@ bool Message::isLessPollWeight(const Message* other)
} }
string strtolower(const string& str)
{
string ret(str);
transform(ret.begin(), ret.end(), ret.begin(), ::tolower);
return ret;
}
result_t MessageMap::add(Message* message) result_t MessageMap::add(Message* message)
{ {
unsigned long long key = message->getKey(); unsigned long long key = message->getKey();
@@ -354,8 +363,8 @@ result_t MessageMap::add(Message* message)
} }
bool isPassive = message->isPassive(); bool isPassive = message->isPassive();
bool isSet = message->isSet(); bool isSet = message->isSet();
string clazz = message->getClass(); string clazz = strtolower(message->getClass());
string name = message->getName(); string name = strtolower(message->getName());
string nameKey = string(isPassive ? "P" : (isSet ? "W" : "R")) + clazz + FIELD_SEPARATOR + name; string nameKey = string(isPassive ? "P" : (isSet ? "W" : "R")) + clazz + FIELD_SEPARATOR + name;
map<string, Message*>::iterator nameIt = m_messagesByName.find(nameKey); map<string, Message*>::iterator nameIt = m_messagesByName.find(nameKey);
if (nameIt != m_messagesByName.end()) { if (nameIt != m_messagesByName.end()) {
@@ -417,12 +426,14 @@ result_t MessageMap::addFromFile(vector<string>::iterator& begin, const vector<s
Message* MessageMap::find(const string& clazz, const string& name, const bool isSet, const bool isPassive) Message* MessageMap::find(const string& clazz, const string& name, const bool isSet, const bool isPassive)
{ {
string lclass = strtolower(clazz);
string lname = strtolower(name);
for (int i=0; i<2; i++) { for (int i=0; i<2; i++) {
string key; string key;
if (i==0) if (i==0)
key = string(isPassive ? "P" : (isSet ? "W" : "R")) + clazz + FIELD_SEPARATOR + name; key = string(isPassive ? "P" : (isSet ? "W" : "R")) + lclass + FIELD_SEPARATOR + lname;
else if (clazz.length() == 0) else if (clazz.length() == 0)
key = string(isPassive ? "-P" : (isSet ? "-W" : "-R")) + name; // second try: without class key = string(isPassive ? "-P" : (isSet ? "-W" : "-R")) + lname; // second try: without class
else else
continue; // not allowed without class continue; // not allowed without class
map<string, Message*>::iterator it = m_messagesByName.find(key); map<string, Message*>::iterator it = m_messagesByName.find(key);
@@ -438,6 +449,8 @@ deque<Message*> MessageMap::findAll(const string& clazz, const string& name, con
{ {
deque<Message*> ret; deque<Message*> ret;
string lclass = strtolower(clazz);
string lname = strtolower(name);
bool checkClass = clazz.length() > 0; bool checkClass = clazz.length() > 0;
bool checkName = name.length() > 0; bool checkName = name.length() > 0;
bool checkPb = pb >= 0; bool checkPb = pb >= 0;
@@ -446,13 +459,13 @@ deque<Message*> MessageMap::findAll(const string& clazz, const string& name, con
continue; continue;
Message* message = it->second; Message* message = it->second;
if (checkClass == true) { if (checkClass == true) {
string check = message->getClass(); string check = strtolower(message->getClass());
if (completeMatch ? (check != clazz) : (check.find(clazz) == check.npos)) if (completeMatch ? (check != lclass) : (check.find(lclass) == check.npos))
continue; continue;
} }
if (checkName == true) { if (checkName == true) {
string check = message->getName(); string check = strtolower(message->getName());
if (completeMatch ? (check != name) : (check.find(name) == check.npos)) if (completeMatch ? (check != lname) : (check.find(lname) == check.npos))
continue; continue;
} }
if (checkPb == true && message->getId()[0] != pb) if (checkPb == true && message->getId()[0] != pb)
src/lib/ebus/message.h
+1 -1
View File
@@ -384,7 +384,7 @@ private:
/** the number of distinct passive @a Message instances stored in @a m_messagesByKey. */ /** the number of distinct passive @a Message instances stored in @a m_messagesByKey. */
size_t m_passiveMessageCount; size_t m_passiveMessageCount;
/** the known @a Message instances by class and name. */ /** the known @a Message instances by lowercase class and name. */
map<string, Message*> m_messagesByName; map<string, Message*> m_messagesByName;
/** the known @a Message instances by key. */ /** the known @a Message instances by key. */