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

added output of used-defined attributes, use const where appropriate, enhanced http global node, added base class AttributedItem

Browse Source
This commit is contained in:
john30
2017-04-09 16:38:40 +02:00
parent c56b0b518f
commit a19a38266a
20 changed files with 1052 additions and 882 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/test/test_data.cpp
+3 -3
View File
@@ -53,7 +53,7 @@ class TestReader : public MappedFileReader {
TestReader(DataFieldTemplates* templates, bool isSet, bool isMasterDest)
: MappedFileReader::MappedFileReader(true), m_templates(templates), m_isSet(isSet), m_isMasterDest(isMasterDest),
m_fields(NULL) {}
result_t getFieldMap(vector<string>& row, string& errorDescription) override {
result_t getFieldMap(vector<string>& row, string& errorDescription) const override {
if (row.empty()) {
row.push_back("*name");
row.push_back("part");
@@ -84,7 +84,7 @@ class TestReader : public MappedFileReader {
const bool m_isSet;
const bool m_isMasterDest;
public:
DataField* m_fields;
const DataField* m_fields;
};
@@ -509,7 +509,7 @@ int main() {
string errorDescription;
vector<string> row;
templates->readLineFromStream(dummystr, errorDescription, "inline", lineNo, row);
DataField* fields = NULL;
const DataField* fields = NULL;
for (size_t i = 0; i < sizeof(checks) / sizeof(checks[0]); i++) {
string check[5] = checks[i];
istringstream isstr(check[0]);
src/lib/ebus/test/test_filereader.cpp
+1 -1
View File
@@ -82,7 +82,7 @@ class NoopReader : public FileReader {
class TestReader : public MappedFileReader {
public:
TestReader(size_t expectedCols) : MappedFileReader::MappedFileReader(false), m_expectedCols(expectedCols) {}
result_t getFieldMap(vector<string>& row, string& errorDescription) override {
result_t getFieldMap(vector<string>& row, string& errorDescription) const override {
if (row.size() == m_expectedCols) {
cout << "get field map: split OK" << endl;
return RESULT_OK;