From 028deaa2cea926d281d8252853266149c04aa23c Mon Sep 17 00:00:00 2001
From: Mario Fink <knif.oiram@gmail.com>
Date: Tue, 19 Oct 2021 13:48:02 +0200
Subject: [PATCH] * deal with any extra quotes in xunit,xname,yunit,yname =>
 issue #13 * rename CLI binary to lowercase version * IMCtermite.pyx: rename
 boolean data flag * insert some double quotes in sampleA.raw for testing *
 version 2.0.1

---
 lib/imc_channel.hpp   |  27 +++++++++++++++++++++++----
 makefile              |   2 +-
 python/IMCtermite.pyx |   4 ++--
 samples/sampleA.raw   | Bin 10151 -> 10154 bytes
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/lib/imc_channel.hpp b/lib/imc_channel.hpp
index 8f0461a..4cae368 100644
--- a/lib/imc_channel.hpp
+++ b/lib/imc_channel.hpp
@@ -455,12 +455,12 @@ namespace imc
              <<"\",\"trigger-time\":\""<<std::put_time(std::localtime(&att),"%FT%T")
              <<"\",\"language-code\":\""<<language_code_
              <<"\",\"codepage\":\""<<codepage_
-             <<"\",\"yname\":\""<<yname_
-             <<"\",\"yunit\":\""<<yunit_
+             <<"\",\"yname\":\""<<prepjsonstr(yname_)
+             <<"\",\"yunit\":\""<<prepjsonstr(yunit_)
              <<"\",\"significantbits\":\""<<signbits_
              <<"\",\"addtime\":\""<<addtime_
-             <<"\",\"xname\":\""<<xname_
-             <<"\",\"xunit\":\""<<xunit_
+             <<"\",\"xname\":\""<<prepjsonstr(xname_)
+             <<"\",\"xunit\":\""<<prepjsonstr(xunit_)
              <<"\",\"xstepwidth\":\""<<xstepwidth_
              <<"\",\"xoffset\":\""<<xoffset_
              <<"\",\"group\":{"<<"\"index\":\""<<group_index_
@@ -477,6 +477,25 @@ namespace imc
       return ss.str();
     }
 
+    // prepare string value for usage in JSON dump
+    std::string prepjsonstr(std::string value)
+    {
+      std::stringstream ss;
+      ss<<quoted(value);
+      return strip_quotes(ss.str());
+    }
+
+    // remove any leading or trailing double quotes
+    std::string strip_quotes(std::string astring)
+    {
+      // head
+      if ( astring.front() == '"' ) astring.erase(astring.begin()+0);
+      // tail
+      if ( astring.back() == '"' ) astring.erase(astring.end()-1);
+
+      return astring;
+    }
+
     // print channel
     void print(std::string filename, const char sep = ',', int width = 25, int yprec = 9)
     {
diff --git a/makefile b/makefile
index 868587a..b94056c 100644
--- a/makefile
+++ b/makefile
@@ -3,7 +3,7 @@
 SHELL := /bin/bash
 
 # name of executable and CLI tool
-EXE = IMCtermite
+EXE = imctermite
 
 # directory names
 SRC = src/
diff --git a/python/IMCtermite.pyx b/python/IMCtermite.pyx
index f4ab185..a764189 100644
--- a/python/IMCtermite.pyx
+++ b/python/IMCtermite.pyx
@@ -20,8 +20,8 @@ cdef class imctermite:
     self.cppimc.set_file(rawfile)
 
   # get JSON list of channels
-  def get_channels(self, bool data):
-    chnlst = self.cppimc.get_channels(True,data)
+  def get_channels(self, bool include_data):
+    chnlst = self.cppimc.get_channels(True,include_data)
     chnlstjn = [jn.loads(chn.decode(errors="ignore")) for chn in chnlst]
     return chnlstjn
 
diff --git a/samples/sampleA.raw b/samples/sampleA.raw
index 842e1b598b54117e8992d8bccc2bb679ea58aa8c..164c207ca2ce16a8ceb9e56c883ab215883b8b70 100644
GIT binary patch
delta 27
icmZ4Pzsi4uEF+`QWI0AlHl^I8#3H55(TqN7j9dV8o(EI_

delta 23
ecmZ4GzubR=EF+`AWI0AlmfWPoqRp|4K5773GzS9!