diff --git a/catalogue/CMakeLists.txt b/catalogue/CMakeLists.txt index b1d8591ff0f351a1f482dbd22f6dd1e970dbde9f..b6068408db972cea33460f65ed00738d56a08de7 100644 --- a/catalogue/CMakeLists.txt +++ b/catalogue/CMakeLists.txt @@ -308,6 +308,8 @@ set (SCHEMA_CHECKER_LIB_SRC_FILES add_library (ctaschemachecker SHARED ${SCHEMA_CHECKER_LIB_SRC_FILES}) +install (TARGETS ctaschemachecker DESTINATION usr/${CMAKE_INSTALL_LIBDIR}) + add_executable(cta-catalogue-schema-verify VerifySchemaCmd.cpp VerifySchemaCmdLineArgs.cpp diff --git a/statistics/CMakeLists.txt b/statistics/CMakeLists.txt index 17a75c050466aa49bbb29e4dba11c66f0afb61fa..08508af78b7dfccbf2171c809e614a58ce18d072 100644 --- a/statistics/CMakeLists.txt +++ b/statistics/CMakeLists.txt @@ -72,7 +72,7 @@ add_executable(cta-statistics-save MysqlStatisticsSchema.cpp ) -target_link_libraries (cta-statistics-save ctastatistics ctacatalogue ctaschemachecker) +target_link_libraries (cta-statistics-save ctastatistics) set_property(TARGET cta-statistics-save APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH}) set_property(TARGET cta-statistics-save APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH}) @@ -85,7 +85,7 @@ add_executable(cta-statistics-update StatisticsUpdateCmdMain.cpp ) -target_link_libraries (cta-statistics-update ctacatalogue ctaschemachecker) +target_link_libraries (cta-statistics-update ctastatistics) set_property(TARGET cta-statistics-update APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH}) set_property(TARGET cta-statistics-update APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH}) diff --git a/statistics/StatisticsUpdateCmd.cpp b/statistics/StatisticsUpdateCmd.cpp index 95380d2e67dd5f54c47940efd398534f53e7411c..f0f05e6abcdeaa9d2bae7968b5ec107b1e8e3275 100644 --- a/statistics/StatisticsUpdateCmd.cpp +++ b/statistics/StatisticsUpdateCmd.cpp @@ -64,7 +64,7 @@ int StatisticsUpdateCmd::exceptionThrowingMain(const int argc, char *const *cons std::unique_ptr<cta::catalogue::SchemaChecker> catalogueChecker; catalogueChecker = catalogueCheckerBuilder.build(); - SchemaChecker::Status tapeTableStatus = catalogueChecker->checkTableContainsColumns("TAPE",{"VID"}); + SchemaChecker::Status tapeTableStatus = catalogueChecker->checkTableContainsColumns("TAPE",{"VID","NB_MASTER_FILES","MASTER_DATA_IN_BYTES"}); SchemaChecker::Status tapeFileTableStatus = catalogueChecker->checkTableContainsColumns("TAPE_FILE",{"ARCHIVE_FILE_ID"}); SchemaChecker::Status archiveFileTableStatus = catalogueChecker->checkTableContainsColumns("ARCHIVE_FILE",{"SIZE_IN_BYTES"}); @@ -87,7 +87,7 @@ int StatisticsUpdateCmd::exceptionThrowingMain(const int argc, char *const *cons // printUsage //------------------------------------------------------------------------------ void StatisticsUpdateCmd::printUsage(std::ostream &os) { - StatisticsUpdateCmd::printUsage(os); + StatisticsUpdateCmdLineArgs::printUsage(os); }