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

renamed _types to _templates

Browse Source
This commit is contained in:
john30
2014-12-18 21:00:10 +01:00
parent 0cf45451d5
commit 11cec1d47b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/baseloop.cpp
+2 -2
View File
@@ -110,7 +110,7 @@ result_t BaseLoop::loadMessages()
L.log(bas, trace, "path to ebus configuration files: %s", path.c_str()); L.log(bas, trace, "path to ebus configuration files: %s", path.c_str());
m_messages->clear(); m_messages->clear();
m_templates->clear(); m_templates->clear();
result_t result = m_templates->readFromFile(path+"/_types.csv"); result_t result = m_templates->readFromFile(path+"/_templates.csv");
if (result == RESULT_OK) if (result == RESULT_OK)
L.log(bas, trace, "read templates"); L.log(bas, trace, "read templates");
else else
@@ -152,7 +152,7 @@ result_t BaseLoop::readConfigFiles(const string path, const string extension)
string fn = d->d_name; string fn = d->d_name;
if (fn.find(extension, (fn.length() - extension.length())) != string::npos if (fn.find(extension, (fn.length() - extension.length())) != string::npos
&& fn != "_types" + extension) { && fn != "_templates" + extension) {
const string p = path + "/" + d->d_name; const string p = path + "/" + d->d_name;
result_t result = m_messages->readFromFile(p, m_templates); result_t result = m_messages->readFromFile(p, m_templates);
if (result != RESULT_OK) if (result != RESULT_OK)
src/lib/ebus/test/test_message.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ int main()
//{"","no;25","10feb505042700190023","",""}, //{"","no;25","10feb505042700190023","",""},
}; };
DataFieldTemplates* templates = new DataFieldTemplates(); DataFieldTemplates* templates = new DataFieldTemplates();
result_t result = templates->readFromFile("_types.csv"); result_t result = templates->readFromFile("_templates.csv");
if (result == RESULT_OK) if (result == RESULT_OK)
cout << "read templates OK" << endl; cout << "read templates OK" << endl;
else else