From 7b8c27b6afcd01c7ed7bac79d3c1bb3df78d8eed Mon Sep 17 00:00:00 2001
From: Mario Fink <knif.oiram@gmail.com>
Date: Mon, 25 Jan 2021 12:23:31 +0100
Subject: [PATCH] properly collect meta-data

---
 lib/tdm_datamodel.hpp | 32 ++++++++++++++++++++++++++++++++
 lib/tdm_reaper.cpp    | 39 +++++++++++++++++----------------------
 lib/tdm_reaper.hpp    |  3 +++
 src/main.cpp          |  2 +-
 4 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/lib/tdm_datamodel.hpp b/lib/tdm_datamodel.hpp
index cf6ba16..271281c 100644
--- a/lib/tdm_datamodel.hpp
+++ b/lib/tdm_datamodel.hpp
@@ -17,6 +17,38 @@
 
 #include "tdm_format.hpp"
 
+// -------------------------------------------------------------------------- //
+// tdm meta data
+
+struct tdm_meta {
+
+  // usi:documentation
+  std::string docu_expo_, docu_expover_;
+
+  // usi:model
+  std::string model_name_, model_version_;
+  std::string model_include_uri_;
+
+  // usi:include
+  std::string byte_order_;  // little versus big endian
+  std::string file_url_;    // path/URL of corresponding .tdx file
+
+  const std::string get_info() { return get_info(defformat); }
+  const std::string get_info(format& formatter)
+  {
+    formatter.set_columns({ std::make_pair("exporter",docu_expo_),
+                            std::make_pair("exporterVersion",docu_expover_),
+                            std::make_pair("modelName",model_name_),
+                            std::make_pair("modelVersion",model_version_),
+                            std::make_pair("modelnsURI",model_include_uri_),
+                            std::make_pair("byteOrder",byte_order_),
+                            std::make_pair("fileURL",file_url_) } );
+
+    return formatter.get_info();
+  }
+
+};
+
 // -------------------------------------------------------------------------- //
 // block of data
 
diff --git a/lib/tdm_reaper.cpp b/lib/tdm_reaper.cpp
index 68b4a1a..b7c9736 100644
--- a/lib/tdm_reaper.cpp
+++ b/lib/tdm_reaper.cpp
@@ -49,19 +49,25 @@ void tdm_reaper::process_tdm(bool showlog)
 
     if ( showlog )
     {
-      std::cout<<"\nloading "<<tdmfile_<<": "<<xml_result_.description()<<"\n\n";
-      std::cout<<"encoding: "<<(pugi::xml_encoding)xml_result_.encoding<<"\n";
-
-      pugi::xml_node tdmdocu = xml_doc_.child("usi:tdm").child("usi:documentation");
-      std::cout<<tdmdocu.child_value("usi:exporter")<<"\n"
-               <<tdmdocu.child_value("usi:exporterVersion")<<"\n";
-
-      pugi::xml_node tdmmodel = xml_doc_.child("usi:tdm").child("usi:model");
-      std::cout<<tdmmodel.attribute("modelName").value()<<"\n";
-      std::cout<<tdmmodel.child("usi:include").attribute("nsUri").value()
-               <<tdmmodel.child("usi:include").attribute("modelVersion").value()<<"\n";
+      std::cout<<"\nloading "<<tdmfile_<<": "<<xml_result_.description()<<"\n";
+      std::cout<<"encoding: "<<(pugi::xml_encoding)xml_result_.encoding<<"\n\n";
     }
 
+    // collect meta-data
+    pugi::xml_node tdmdocu = xml_doc_.child("usi:tdm").child("usi:documentation");
+    meta_data_.docu_expo_ = tdmdocu.child_value("usi:exporter");
+    meta_data_.docu_expover_ = tdmdocu.child_value("usi:exporterVersion");
+    pugi::xml_node tdmmodel = xml_doc_.child("usi:tdm").child("usi:model");
+    meta_data_.model_name_ = tdmmodel.attribute("modelName").value();
+    meta_data_.model_version_ = tdmmodel.attribute("modelVersion").value();
+    meta_data_.model_include_uri_ = tdmmodel.child("usi:include").attribute("nsUri").value();
+    //
+    pugi::xml_node tdmincl = xml_doc_.child("usi:tdm").child("usi:include");
+    meta_data_.byte_order_ = tdmincl.child("file").attribute("byteOrder").value();
+    meta_data_.file_url_ = tdmincl.child("file").attribute("url").value();
+
+    if ( showlog ) std::cout<<meta_data_.get_info()<<"\n";
+
   } catch (const std::exception& e) {
     throw std::runtime_error(std::string("failed to load tdm file: ") + e.what());
   }
@@ -143,22 +149,11 @@ void tdm_reaper::process_include(bool showlog)
   std::string endianness(tdmincl.child("file").attribute("byteOrder").value());
   endianness_ = endianness.compare("littleEndian") == 0 ? true : false;
 
-  // check referenced .tdx file
-  std::string urltdx(tdmincl.child("file").attribute("url").value());
-
   // obtain machine's endianness
   int num = 1;
   machine_endianness_ = ( *(char*)&num == 1 );
   if ( machine_endianness_ != endianness_ ) throw std::runtime_error("endianness mismatch");
 
-  if ( showlog )
-  {
-    std::cout<<"\n";
-    std::cout<<"endianness:         "<<(endianness_?"little":"big")<<"\n"
-             <<"machine endianness: "<<(machine_endianness_?"little":"big")<<"\n"
-             <<"url:                "<<urltdx<<"\n\n";
-  }
-
   // list block of massdata
   for (pugi::xml_node anode: tdmincl.child("file").children())
   {
diff --git a/lib/tdm_reaper.hpp b/lib/tdm_reaper.hpp
index cd4e347..0764bfe 100644
--- a/lib/tdm_reaper.hpp
+++ b/lib/tdm_reaper.hpp
@@ -40,6 +40,9 @@ class tdm_reaper
   // endianness (true = little, false = big)
   bool endianness_, machine_endianness_;
 
+  // tdm meta-data
+  tdm_meta meta_data_;
+
   // blocks of data in .tdx file
   std::map<std::string,block> tdx_blocks_;
 
diff --git a/src/main.cpp b/src/main.cpp
index fadeb6d..7b24242 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -179,7 +179,7 @@ int main(int argc, char* argv[])
     // declare and initialize tdm_reaper instance
     tdm_reaper jack;
     try {
-      jack.submit_files(cfgopts.at("tdm"),cfgopts.at("tdx"),false);
+      jack.submit_files(cfgopts.at("tdm"),cfgopts.at("tdx"),true);
     } catch (const std::exception& e) {
       throw std::runtime_error( std::string("failed to load/parse tdm/tdx files: ")
                               + e.what() );