bump version 1.0.5

* simplify get_channel_overview(...) by removing full group info
* add build-timestamp to version/help message of CLI binary
* simplify/unify group/channel/submatrix/localcolumn overview of CLI
binary

lib/tdm_datatype.hpp

@@ -14,6 +14,7 @@ typedef unsigned short int eUInt16Usi;
 typedef unsigned int eUInt32Usi;
 typedef float eFloat32Usi;
 typedef double eFloat64Usi;
+typedef char eStringUsi;
 
 class tdmdatatype
 {
@@ -26,12 +27,13 @@ protected:
   eUInt32Usi uint32_;   // 4
   eFloat32Usi float32_; // 5
   eFloat64Usi float64_; // 6
-  short int dtidx_;     // \in \{0,...,6\}
+  eStringUsi string_;   // 7
+  short int dtidx_;     // \in \{0,...,7\}
 
 public:
   tdmdatatype(): sint16_(0), sint32_(0),
                  uint8_(0), uint16_(0), uint32_(0),
-                 float32_(0.0), float64_(0.0),
+                 float32_(0.0), float64_(0.0), string_(0),
                  dtidx_(0) { };
   // every supported datatype gets its own constructor
   tdmdatatype(eInt16Usi num): sint16_(num), dtidx_(0) {};
@@ -41,6 +43,7 @@ public:
   tdmdatatype(eUInt32Usi num): uint32_(num), dtidx_(4) {};
   tdmdatatype(eFloat32Usi num): float32_(num), dtidx_(5) {};
   tdmdatatype(eFloat64Usi num): float64_(num), dtidx_(6) {};
+  tdmdatatype(eStringUsi num): string_(num), dtidx_(7) {};
 
   // identify type
   short int& dtype() { return dtidx_; }
@@ -55,6 +58,7 @@ public:
     this->uint32_ = num.uint32_;
     this->float32_ = num.float32_;
     this->float64_ = num.float64_;
+    this->string_ = num.string_;
     this->dtidx_ = num.dtidx_;
   }
 
@@ -70,6 +74,7 @@ public:
       this->uint32_ = num.uint32_;
       this->float32_ = num.float32_;
       this->float64_ = num.float64_;
+      this->string_ = num.string_;
       this->dtidx_ = num.dtidx_;
     }
 
@@ -119,6 +124,12 @@ public:
     this->dtidx_ = 6;
     return *this;
   }
+  tdmdatatype& operator=(const eStringUsi &num)
+  {
+    this->string_ = num;
+    this->dtidx_ = 7;
+    return *this;
+  }
 
   // obtain number as double
   double as_double()
@@ -131,6 +142,7 @@ public:
     else if ( dtidx_ == 4 ) num = (double)uint32_;
     else if ( dtidx_ == 5 ) num = (double)float32_;
     else if ( dtidx_ == 6 ) num = (double)float64_;
+    else if ( dtidx_ == 7 ) num = (double)(int)string_;
     return num;
   }
 
@@ -144,6 +156,7 @@ public:
     else if ( num.dtidx_ == 4 ) out<<num.uint32_;
     else if ( num.dtidx_ == 5 ) out<<num.float32_;
     else if ( num.dtidx_ == 6 ) out<<num.float64_;
+    else if ( num.dtidx_ == 7 ) out<<num.string_;
     return out;
   }
 
@@ -332,7 +345,7 @@ const std::vector<tdm_datatype> tdm_datatypes = {
   {"eFloat32Usi","DT_FLOAT",3,"float_sequence",4,"32 bit float"},
   {"eFloat64Usi","DT_DOUBLE",7,"double_sequence",8,"64 bit double"},
 
-  // {"eStringUsi","DT_STRING",1,"string_sequence",0,"text"}
+  {"eStringUsi","DT_STRING",1,"string_sequence",1,"text"}
 
 };
 

lib/tdm_termite.cpp

@@ -445,9 +445,14 @@ void tdm_termite::process_localcolumns(bool showlog, pugi::xml_document& xml_doc
     {
       locc.values_ = vl.at(0);
     }
+    else if ( vl.size() == 0 )
+    {
+      //std::cerr<<"localcolumn ("<<locc.id_<<","<<locc.name_<<") misses any value-ids"<<"\n";
+      locc.values_ = "none";
+    }
     else
     {
-      throw std::logic_error("localcolumn with out/multiple values id(s)");
+      throw std::logic_error("localcolumn with multiple values id(s)");
     }
 
     // add external id referring to block in <usi:include>
@@ -460,7 +465,7 @@ void tdm_termite::process_localcolumns(bool showlog, pugi::xml_document& xml_doc
       {
         throw std::runtime_error(std::string("measurement_quantity: ")
                                  + locc.measurement_quantity_
-                                 + std::string(" is ambiguous") );
+                                 + std::string(" is missing/ambiguous") );
       }
       std::string dt = tdmchannels_.at(locc.measurement_quantity_).datatype_;
       std::string sequence_type;
@@ -482,8 +487,10 @@ void tdm_termite::process_localcolumns(bool showlog, pugi::xml_document& xml_doc
 
       if ( locc.external_id_.empty() )
       {
-        throw std::logic_error( std::string("no external id found for ")
+        //throw std::logic_error( std::string("no external id found for ")
-                              + sequence_type + std::string(" with ") + locc.values_ );
+        //                      + sequence_type + std::string(" with ") + locc.values_ );
+        //std::cerr<<"no external id found for "<<sequence_type<<" with "<<locc.values_<<"\n";
+        locc.external_id_ = "none";
       }
     }
 
@@ -508,8 +515,8 @@ std::string tdm_termite::get_channel_overview(format chformatter)
 
   // compose header
   chformatter.set_header(true);
-  tdm_channelgroup grp;
+  //tdm_channelgroup grp;
-  channels_summary += grp.get_info(chformatter);
+  //channels_summary += grp.get_info(chformatter);
   tdm_channel chn;
   channels_summary += chn.get_info(chformatter);
   std::string rule; // = std::string("#");
@@ -526,8 +533,9 @@ std::string tdm_termite::get_channel_overview(format chformatter)
                                                    it!=tdmchannels_.end(); ++it)
   {
     // get corresponding group
-    tdm_channelgroup grp = tdmchannelgroups_.at(it->second.group_);
+    // tdm_channelgroup grp = tdmchannelgroups_.at(it->second.group_);
-    channels_summary += grp.get_info(chformatter);
+    // channels_summary += grp.get_info(chformatter);
+
     // ...and actual channel
     channels_summary += it->second.get_info(chformatter);
     channels_summary += std::string("\n");
@@ -619,7 +627,7 @@ std::vector<tdmdatatype> tdm_termite::get_channel(std::string& id)
     // retrieve full channel info
     tdm_channel chn = tdmchannels_.at(id);
 
-    // extract (first) "localcolumn" for channel
+    // extract (first) "localcolumn" for channel TODO there should only be a single!! local_column!!
     if ( chn.local_columns_.size() != 1 )
     {
       throw std::runtime_error(std::string("invalid local_columns_ of channel: ") + id);
@@ -636,8 +644,28 @@ std::vector<tdmdatatype> tdm_termite::get_channel(std::string& id)
     }
 
     // use "values" id to map to external block
+    if ( loccol.external_id_ == "none" )
+    {
+      //throw std::runtime_error(std::string("missing external_id in local_column ")+loccol.id_);
+      //std::cerr<<"missing external_id in local_column "<<loccol.id_<<"\n";
+      return std::vector<tdmdatatype>(0);
+    }
     block blk = tdx_blocks_.at(loccol.external_id_);
 
+    // find corresponding submatrix
+    if ( submatrices_.count(loccol.submatrix_) != 1 )
+    {
+      throw std::runtime_error(std::string("no associated submatrix for localcolumn found: ") + loccol.id_);
+    }
+    submatrix subm = submatrices_.at(loccol.submatrix_);
+    if ( subm.number_of_rows_ != blk.length_ )
+    {
+      std::stringstream ss;
+      ss<<"number of rows in submatrix "<<subm.id_<<" ("<<subm.number_of_rows_<<") "
+        <<" does not agree with length of associated block "<<blk.id_<<" ("<<blk.length_<<")";
+      throw std::runtime_error(ss.str());
+    }
+
     // declare vector of appropriate length
     std::vector<tdmdatatype> datavec(blk.length_);
 
@@ -691,6 +719,10 @@ std::vector<tdmdatatype> tdm_termite::get_channel(std::string& id)
     {
       this->convert_data_to_type<eFloat64Usi>(tdxblk,datavec);
     }
+    else if ( blk.value_type_ == std::string("eStringUsi") )
+    {
+      this->convert_data_to_type<eStringUsi>(tdxblk,datavec);
+    }
     else
     {
       throw std::runtime_error(std::string("unsupported/unknown datatype") + blk.value_type_);
@@ -987,6 +1019,10 @@ void tdm_termite::check_datatype_consistency()
     {
       if ( el.size_ != sizeof(eFloat64Usi) ) throw std::logic_error("invalid representation of eFloat64Usi");
     }
+    else if ( el.name_ == "eStringUsi" )
+    {
+      if ( el.size_ != sizeof(eStringUsi) ) throw std::logic_error("invalid representation of eStringUsi");
+    }
     else
     {
       throw std::logic_error("missing datatype validation");

makefile

@@ -23,8 +23,11 @@ LIB := $(foreach dir,$(shell ls $(LIBB)),-I $(LIBB)$(dir))
 GTAG := $(shell git tag | tail -n1)
 GTAGV := $(shell git tag | tail -n1 | tr -d 'v')
 GHSH := $(shell git rev-parse HEAD | head -c8)
-PIPYVS := $(shell grep "version" pip/setup.py | tr -d 'version=",# ')
+PIPYVS := $(shell grep "version" pip/setup.py | tr -d 'version=,\#\" ')
-PICGVS := $(shell grep "version" pip/setup.cfg | tr -d 'version=",# ')
+PICGVS := $(shell grep "version" pip/setup.cfg | tr -d 'version=,\#\" ')
+
+# current timestamp
+TMS = $(shell date +%Y%m%dT%H%M%S)
 
 # define install location
 INST := /usr/local/bin
@@ -63,10 +66,12 @@ main.o : src/main.cpp lib/$(SRC).hpp $(HPP)
 	@if [ $(OST) = "Linux" ]; then\
 		sed -i 's/TAGSTRING/$(GTAG)/g' $<.cpp; \
 		sed -i 's/HASHSTRING/$(GHSH)/g' $<.cpp; \
+		sed -i 's/TIMESTAMPSTRING/$(TMS)/g' $<.cpp; \
 	fi
 	@if [ $(OST) = "Darwin" ]; then\
 		sed -i '' 's/TAGSTRING/$(GTAG)/g' $<.cpp; \
 		sed -i '' 's/HASHSTRING/$(GHSH)/g' $<.cpp; \
+		sed -i '' 's/TIMESTAMPSTRING/$(TMS)/g' $<.cpp; \
 	fi
 	$(CC) -c $(OPT) $(LIB) -I lib/ $<.cpp -o $@
 	@rm $<.cpp

pip/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = TDMtermite-RecordEvolution
-version = 1.0.1
+version = 1.0.5
 author = Record Evolution GmbH
 author_email = mario.fink@record-evolution.de
 maintainer = Record Evolution GmbH

pip/setup.py

@@ -18,7 +18,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="TDMtermite",
-    version="1.0.3",
+    version="1.0.5",
     author="Record Evolution GmbH",
     author_email="mario.fink@record-evolution.de",
     maintainer="Record Evolution GmbH",

src/main.cpp

@@ -11,11 +11,12 @@
 
 const std::string gittag("TAGSTRING");
 const std::string githash("HASHSTRING");
+const std::string timestamp("TIMESTAMPSTRING");
 
 void show_usage()
 {
   std::cout<<"\n"
-           <<"tdmtermite ["<<gittag<<"-g"<<githash<<"] (github.com/RecordEvolution/TDMtermite.git)"
+           <<"tdmtermite ["<<gittag<<"-g"<<githash<<"-"<<timestamp<<"] (https://github.com/RecordEvolution/TDMtermite.git)"
            <<"\n\n"
            <<"Decode TDM/TDX files and dump data as *.csv"
            <<"\n\n"
@@ -78,7 +79,7 @@ optkeys parse_args(int argc, char* argv[], bool showargs = false)
     else if ( std::string(argv[1]) == std::string("--version")
            || std::string(argv[1]) == std::string("-v") )
     {
-      std::cout<<"tdmtermite "<<gittag<<"-g"<<githash<<"\n";
+      std::cout<<"tdmtermite "<<gittag<<"-g"<<githash<<"-"<<timestamp<<"\n";
     }
     else
     {
@@ -284,13 +285,13 @@ int main(int argc, char* argv[])
     if ( showroot ) std::cout<<"\n"<<jack.get_root().get_info()<<"\n";
 
     // get complete channel(-group) overview
-    format grpformatter(26,false,false,' ');
+    format grpformatter(16,false,false,' ');
     if (listgroups) std::cout<<"\n"<<jack.get_overview<tdm_channelgroup>(grpformatter)<<"\n";
-    format chformatter(14,false,false,' ');
+    format chformatter(16,false,false,' ');
     if (listchannels) std::cout<<"\n"<<jack.get_channel_overview(chformatter)<<"\n";
 
     // get complete submatrix/localcolumns overview
-    format formatter(18,false,false,' ');
+    format formatter(16,false,false,' ');
     if (listblocks) std::cout<<jack.get_overview<block>(formatter)<<"\n";
     if (listsubmatrices) std::cout<<jack.get_overview<submatrix>(formatter)<<"\n";
     if (listlocalcolumns) std::cout<<jack.get_overview<localcolumn>(formatter)<<"\n";