From 2a7ffd694cfa3493ef1b83a69878322b8ca97670 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sat, 14 Mar 2015 23:10:13 +0100
Subject: o Updating to new API.

---
 apps/sample-convert.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'apps/sample-convert.cpp')

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()) {
-- 
cgit v1.2.3