From 0093c733b640e07ebeaf204c1ed1279db095aa9f 2019-03-01 12:36:28
From: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Date: 2019-03-01 12:36:28
Subject: [PATCH] Added TimeSeries library

Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>

---

diff --git a/.gitmodules b/.gitmodules
index 4a4e86a..0e994f5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "external/catalogicpp"]
 	path = external/catalogicpp
 	url = https://github.com/jeandet/catalogicpp
+[submodule "external/TimeSeries"]
+	path = external/TimeSeries
+	url = https://github.com/jeandet/TimeSeries
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 565ae0c..033aad4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,16 +33,6 @@ if(PyWrappers)
     endif()
 endif()
 
-find_package(libcatalogs CONFIG QUIET)
-if (NOT catalogs_FOUND)
-    if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/external/libcatalogs/CMakeLists.txt)
-        message("Init submodule libcatalogs")
-        execute_process(COMMAND git submodule init external/libcatalogs WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-        execute_process(COMMAND git submodule update external/libcatalogs WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-    endif()
-    add_subdirectory(external/libcatalogs)
-endif()
-
 find_package(catalogicpp CONFIG QUIET)
 if (NOT catalogicpp_FOUND)
     if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/external/catalogicpp/CMakeLists.txt)
@@ -53,6 +43,16 @@ if (NOT catalogicpp_FOUND)
     add_subdirectory(external/catalogicpp)
 endif()
 
+find_package(TimeSeries CONFIG QUIET)
+if (NOT TimeSeries_FOUND)
+    if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/external/TimeSeries/CMakeLists.txt)
+        message("Init submodule TimeSeries")
+        execute_process(COMMAND git submodule init external/TimeSeries WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+        execute_process(COMMAND git submodule update external/TimeSeries WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+    endif()
+    add_subdirectory(external/TimeSeries)
+endif()
+
 macro(declare_test testname testexe sources libraries)
     add_executable(${testexe} ${sources})
     target_link_libraries(${testexe} ${libraries})
@@ -177,7 +177,6 @@ target_link_libraries(sciqlopcore PUBLIC
 
 if(Catalog)
     target_link_libraries(sciqlopcore PUBLIC
-      catalogs
       CatalogiCpp
     )
 endif()
diff --git a/external/TimeSeries b/external/TimeSeries
new file mode 160000
index 0000000..30fe90f
--- /dev/null
+++ b/external/TimeSeries
@@ -0,0 +1 @@
+Subproject commit 30fe90fd45b3d7d830a7a9e75db6f3e9cdc5bb0b
diff --git a/external/catalogicpp b/external/catalogicpp
index 6547208..515e439 160000
--- a/external/catalogicpp
+++ b/external/catalogicpp
@@ -1 +1 @@
-Subproject commit 6547208a6ef0692c8fa0431e651c919ada111f4e
+Subproject commit 515e439a3023209e04a568b8a6bcafc45415a364
diff --git a/src/pybind11_wrappers/CatalogWrappers.cpp b/src/pybind11_wrappers/CatalogWrappers.cpp
index 5d46bb2..fe63552 100644
--- a/src/pybind11_wrappers/CatalogWrappers.cpp
+++ b/src/pybind11_wrappers/CatalogWrappers.cpp
@@ -10,18 +10,18 @@
 #include <string>
 
 #include <Catalogue/CatalogueController.h>
-#include <DBCatalogue.h>
-#include <DBEvent.h>
-#include <DBEventProduct.h>
+//#include <DBCatalogue.h>
+//#include <DBEvent.h>
+//#include <DBEventProduct.h>
 
 
 namespace py = pybind11;
 
-std::ostream& operator<<(std::ostream& os, const DBEvent& e)
-{
-    os << std::endl;
-    return os;
-}
+//std::ostream& operator<<(std::ostream& os, const DBEvent& e)
+//{
+//    os << std::endl;
+//    return os;
+//}
 
 #define JAVA_LIKE_PROPERTY(name, className)                                                        \
     .def_property("##name", &className::get##name, &className::set##name)