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

extraced FileReader to separate .h and added support for quoted CSV

Browse Source
This commit is contained in:
john30
2014-12-13 11:07:18 +01:00
parent 6eab4f86d1
commit cda96e6e3b
6 changed files with 181 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/message.cpp
+3 -3
View File
@@ -369,7 +369,7 @@ result_t MessageMap::add(Message* message)
return RESULT_OK;
}
result_t MessageMap::addFromFile(vector<string>& row, DataFieldTemplates* arg, vector< vector<string> >* defaults)
result_t MessageMap::addFromFile(vector<string>& row, DataFieldTemplates* arg, vector< vector<string> >* defaults, const string& filename, unsigned int lineNo)
{
Message* message = NULL;
string types = row[0];
@@ -384,8 +384,8 @@ result_t MessageMap::addFromFile(vector<string>& row, DataFieldTemplates* arg, v
vector<string>::iterator it = row.begin();
result = Message::create(it, row.end(), defaults, arg, message);
if (result != RESULT_OK) {
printErrorPos(row.begin(), row.end(), it);
return result;
printErrorPos(row.begin(), row.end(), it, filename, lineNo, result);
continue;
}
result = add(message);
if (result != RESULT_OK) {