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

fix for extracting ident from filename

Browse Source
This commit is contained in:
john30
2015-11-01 22:39:10 +01:00
parent b453cad15a
commit f913cb0aaa
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/filereader.h
+3 -3
View File
@@ -79,7 +79,7 @@ public:
} }
string line; string line;
size_t lastSep = filename.find_last_of('/'); size_t lastSep = filename.find_last_of('/');
size_t firstDot = filename.find_first_of('.'); size_t firstDot = filename.find_first_of('.', lastSep+1);
string defaultDest = ""; string defaultDest = "";
string defaultCircuit = ""; string defaultCircuit = "";
if (lastSep!=string::npos && firstDot==lastSep+1+2) { // potential destination address, matches "^ZZ." if (lastSep!=string::npos && firstDot==lastSep+1+2) { // potential destination address, matches "^ZZ."
@@ -89,8 +89,8 @@ public:
if (result!=RESULT_OK || !isValidAddress(zz)) if (result!=RESULT_OK || !isValidAddress(zz))
defaultDest = ""; // invalid: not in hex or no master/slave/broadcast address defaultDest = ""; // invalid: not in hex or no master/slave/broadcast address
else { else {
size_t lastDot = filename.find_last_of('.'); size_t lastDot = filename.find_first_of('.', firstDot+1);
if (lastDot>firstDot && lastDot-firstDot<=5) { // potential ident, matches "^ZZ.IDENT." if (lastDot>firstDot && lastDot-firstDot<=6) { // potential ident, matches "^ZZ.IDENT."
defaultCircuit = filename.substr(firstDot+1, lastDot-firstDot-1); defaultCircuit = filename.substr(firstDot+1, lastDot-firstDot-1);
if (defaultCircuit.find_first_of(' ')!=string::npos) if (defaultCircuit.find_first_of(' ')!=string::npos)
defaultCircuit = ""; // invalid: contains spaces defaultCircuit = ""; // invalid: contains spaces