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

pass iterator to FileReader::addFromFile() in order to keep track of the erroneous column, added verbose mode to FileReader

Browse Source
This commit is contained in:
john30
2014-12-18 23:06:31 +01:00
parent 4b7ff1d97f
commit 985d1f4389
5 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/message.cpp
+10 -9
View File
@@ -376,10 +376,11 @@ result_t MessageMap::add(Message* message)
return RESULT_OK;
}
result_t MessageMap::addFromFile(vector<string>& row, DataFieldTemplates* arg, vector< vector<string> >* defaults, const string& filename, unsigned int lineNo)
result_t MessageMap::addFromFile(vector<string>::iterator& begin, const vector<string>::iterator end, DataFieldTemplates* arg, vector< vector<string> >* defaults, const string& filename, unsigned int lineNo)
{
Message* message = NULL;
string types = row[0];
vector<string>::iterator restart = begin;
string types = *restart;
if (types.length() == 0)
types.append("r");
result_t result = RESULT_ERR_EOF;
@@ -387,17 +388,17 @@ result_t MessageMap::addFromFile(vector<string>& row, DataFieldTemplates* arg, v
istringstream stream(types);
string type;
while (getline(stream, type, VALUE_SEPARATOR) != 0) {
row[0] = type;
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, filename, lineNo, result);
continue;
}
*restart = type;
begin = restart;
result = Message::create(begin, end, defaults, arg, message);
if (result != RESULT_OK)
return result;
result = add(message);
if (result != RESULT_OK) {
delete message;
return result;
}
begin = restart;
}
return result;
}