diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2015-03-14 23:10:13 +0100 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2015-03-14 23:10:13 +0100 |
commit | 2a7ffd694cfa3493ef1b83a69878322b8ca97670 (patch) | |
tree | 85e2156bbda0c9d6b9bf282afa17162f2ae03910 /apps/sample-convert.cpp | |
parent | efa1825dd6d16e7901e9620c31796b27b6c84ee9 (diff) | |
download | ble-toys-2a7ffd694cfa3493ef1b83a69878322b8ca97670.tar.gz ble-toys-2a7ffd694cfa3493ef1b83a69878322b8ca97670.tar.bz2 ble-toys-2a7ffd694cfa3493ef1b83a69878322b8ca97670.tar.xz ble-toys-2a7ffd694cfa3493ef1b83a69878322b8ca97670.zip |
o Updating to new API.
Diffstat (limited to 'apps/sample-convert.cpp')
-rw-r--r-- | apps/sample-convert.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/sample-convert.cpp b/apps/sample-convert.cpp index 249b737..b3e5c02 100644 --- a/apps/sample-convert.cpp +++ b/apps/sample-convert.cpp @@ -35,6 +35,7 @@ public: auto desc = execution.desc; auto vm = execution.vm; + KeyDictionary dict; shared_ptr<SampleOutputStream> output; istream *inputStream; @@ -60,22 +61,22 @@ public: } if (output_format == "plain") { - output = make_shared<CsvSampleOutputStream>(move(outputStream)); + output = make_shared<CsvSampleOutputStream>(dict, move(outputStream)); } else if (output_format == "json") { - output = make_shared<JsonSampleOutputStream>(move(outputStream)); + output = make_shared<JsonSampleOutputStream>(dict, move(outputStream)); } else if (output_format == "sql") { if (table_name.size() == 0) { cerr << "Missing option: table-name" << endl; return EXIT_FAILURE; } - output = make_shared<SqlSampleOutputStream>(move(outputStream), table_name); + output = make_shared<SqlSampleOutputStream>(dict, move(outputStream), table_name); } else { cerr << "Unsupported output format: " << output_format << endl; return EXIT_FAILURE; } - auto input = make_shared<CsvSampleParser>(output); + auto input = make_shared<CsvSampleParser>(dict, output); char data[100]; while (!inputStream->eof()) { |