# HG changeset patch # User Alain Mazy # Date 1734530220 -3600 # Node ID 218e145da8a38e9519dab8dbef10f9672800f6d1 # Parent f00417b34bbbb1aa6235bdd2d720722e349612e0 cleanup diff -r f00417b34bbb -r 218e145da8a3 Framework/Plugins/IndexBackend.cpp --- a/Framework/Plugins/IndexBackend.cpp Wed Dec 18 12:41:21 2024 +0100 +++ b/Framework/Plugins/IndexBackend.cpp Wed Dec 18 14:57:00 2024 +0100 @@ -3152,7 +3152,6 @@ #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 5) bool IndexBackend::HasFindSupport() const { - // TODO-FIND move to child plugins ? return true; } #endif @@ -3296,9 +3295,6 @@ DatabaseManager& manager, const Orthanc::DatabasePluginMessages::Find_Request& request) { - // TODO-FIND move to child plugins ? - - // If we want the Find to use a read-only transaction, we can not create temporary tables with // the lookup results. So we must use a CTE (Common Table Expression). // However, a CTE can only be used in a single query -> we must unionize all the following diff -r f00417b34bbb -r 218e145da8a3 MySQL/Plugins/MySQLIndex.cpp --- a/MySQL/Plugins/MySQLIndex.cpp Wed Dec 18 12:41:21 2024 +0100 +++ b/MySQL/Plugins/MySQLIndex.cpp Wed Dec 18 14:57:00 2024 +0100 @@ -596,30 +596,4 @@ #endif -#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 5) - bool MySQLIndex::HasFindSupport() const - { - // TODO-FIND - return true; - } -#endif - - -#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 5) - // void MySQLIndex::ExecuteFind(Orthanc::DatabasePluginMessages::TransactionResponse& response, - // DatabaseManager& manager, - // const Orthanc::DatabasePluginMessages::Find_Request& request) - // { - // // TODO-FIND - // throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); - // } - - // void MySQLIndex::ExecuteCount(Orthanc::DatabasePluginMessages::TransactionResponse& response, - // DatabaseManager& manager, - // const Orthanc::DatabasePluginMessages::Find_Request& request) - // { - // // TODO-FIND - // throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); - // } -#endif } diff -r f00417b34bbb -r 218e145da8a3 MySQL/Plugins/MySQLIndex.h --- a/MySQL/Plugins/MySQLIndex.h Wed Dec 18 12:41:21 2024 +0100 +++ b/MySQL/Plugins/MySQLIndex.h Wed Dec 18 14:57:00 2024 +0100 @@ -93,18 +93,5 @@ return true; } -#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 5) - virtual bool HasFindSupport() const ORTHANC_OVERRIDE; -#endif - -#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 5) - // virtual void ExecuteFind(Orthanc::DatabasePluginMessages::TransactionResponse& response, - // DatabaseManager& manager, - // const Orthanc::DatabasePluginMessages::Find_Request& request) ORTHANC_OVERRIDE; - - // virtual void ExecuteCount(Orthanc::DatabasePluginMessages::TransactionResponse& response, - // DatabaseManager& manager, - // const Orthanc::DatabasePluginMessages::Find_Request& request) ORTHANC_OVERRIDE; -#endif }; } diff -r f00417b34bbb -r 218e145da8a3 Odbc/Plugins/OdbcIndex.cpp --- a/Odbc/Plugins/OdbcIndex.cpp Wed Dec 18 12:41:21 2024 +0100 +++ b/Odbc/Plugins/OdbcIndex.cpp Wed Dec 18 14:57:00 2024 +0100 @@ -701,27 +701,23 @@ #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 5) bool OdbcIndex::HasFindSupport() const { - // TODO-FIND return false; } #endif +#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 5) + void SQLiteIndex::ExecuteFind(Orthanc::DatabasePluginMessages::TransactionResponse& response, + DatabaseManager& manager, + const Orthanc::DatabasePluginMessages::Find_Request& request) + { + throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); + } -#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 5) - // void OdbcIndex::ExecuteFind(Orthanc::DatabasePluginMessages::TransactionResponse& response, - // DatabaseManager& manager, - // const Orthanc::DatabasePluginMessages::Find_Request& request) - // { - // // TODO-FIND - // throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); - // } - - // void OdbcIndex::ExecuteCount(Orthanc::DatabasePluginMessages::TransactionResponse& response, - // DatabaseManager& manager, - // const Orthanc::DatabasePluginMessages::Find_Request& request) - // { - // // TODO-FIND - // throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); - // } + void SQLiteIndex::ExecuteCount(Orthanc::DatabasePluginMessages::TransactionResponse& response, + DatabaseManager& manager, + const Orthanc::DatabasePluginMessages::Find_Request& request) + { + throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); + } #endif } diff -r f00417b34bbb -r 218e145da8a3 Odbc/Plugins/OdbcIndex.h --- a/Odbc/Plugins/OdbcIndex.h Wed Dec 18 12:41:21 2024 +0100 +++ b/Odbc/Plugins/OdbcIndex.h Wed Dec 18 14:57:00 2024 +0100 @@ -105,13 +105,13 @@ #endif #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 5) - // virtual void ExecuteFind(Orthanc::DatabasePluginMessages::TransactionResponse& response, - // DatabaseManager& manager, - // const Orthanc::DatabasePluginMessages::Find_Request& request) ORTHANC_OVERRIDE; + virtual void ExecuteFind(Orthanc::DatabasePluginMessages::TransactionResponse& response, + DatabaseManager& manager, + const Orthanc::DatabasePluginMessages::Find_Request& request) ORTHANC_OVERRIDE; - // virtual void ExecuteCount(Orthanc::DatabasePluginMessages::TransactionResponse& response, - // DatabaseManager& manager, - // const Orthanc::DatabasePluginMessages::Find_Request& request) ORTHANC_OVERRIDE; + virtual void ExecuteCount(Orthanc::DatabasePluginMessages::TransactionResponse& response, + DatabaseManager& manager, + const Orthanc::DatabasePluginMessages::Find_Request& request) ORTHANC_OVERRIDE; #endif }; } diff -r f00417b34bbb -r 218e145da8a3 SQLite/Plugins/SQLiteIndex.cpp --- a/SQLite/Plugins/SQLiteIndex.cpp Wed Dec 18 12:41:21 2024 +0100 +++ b/SQLite/Plugins/SQLiteIndex.cpp Wed Dec 18 14:57:00 2024 +0100 @@ -264,7 +264,6 @@ #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 5) bool SQLiteIndex::HasFindSupport() const { - // TODO-FIND return false; } #endif @@ -275,7 +274,6 @@ DatabaseManager& manager, const Orthanc::DatabasePluginMessages::Find_Request& request) { - // TODO-FIND throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); } @@ -283,7 +281,6 @@ DatabaseManager& manager, const Orthanc::DatabasePluginMessages::Find_Request& request) { - // TODO-FIND throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); } #endif