diff --git a/lib/tdm_termite.cpp b/lib/tdm_termite.cpp index cc12196..9b60371 100644 --- a/lib/tdm_termite.cpp +++ b/lib/tdm_termite.cpp @@ -445,6 +445,11 @@ 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 ("<second.group_); - channels_summary += grp.get_info(chformatter); + // tdm_channelgroup grp = tdmchannelgroups_.at(it->second.group_); + // 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 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,6 +644,12 @@ std::vector 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 "<(0); + } block blk = tdx_blocks_.at(loccol.external_id_); // declare vector of appropriate length diff --git a/makefile b/makefile index 82da2ea..f618926 100644 --- a/makefile +++ b/makefile @@ -26,6 +26,9 @@ GHSH := $(shell git rev-parse HEAD | head -c8) PIPYVS := $(shell grep "version" pip/setup.py | 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,6 +66,7 @@ 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; \ diff --git a/src/main.cpp b/src/main.cpp index 0b31a31..79c2d11 100644 --- a/src/main.cpp +++ b/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 ["<(grpformatter)<<"\n"; - format chformatter(14,false,false,' '); + format chformatter(16,false,false,' '); if (listchannels) std::cout<<"\n"<(formatter)<<"\n"; if (listsubmatrices) std::cout<(formatter)<<"\n"; if (listlocalcolumns) std::cout<(formatter)<<"\n";