Mercurial > hg > orthanc-databases

changeset 622:218e145da8a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup
author Alain Mazy <am@orthanc.team>
date Wed, 18 Dec 2024 14:57:00 +0100
parents f00417b34bbb
children c704484ae9ae a0c2f38a7dea
files Framework/Plugins/IndexBackend.cpp MySQL/Plugins/MySQLIndex.cpp MySQL/Plugins/MySQLIndex.h Odbc/Plugins/OdbcIndex.cpp Odbc/Plugins/OdbcIndex.h SQLite/Plugins/SQLiteIndex.cpp
diffstat 6 files changed, 19 insertions(+), 69 deletions(-) [+]
line wrap: on
line diff
--- 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 
--- 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
 }
--- 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
   };
 }
--- 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
 }
--- 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
   };
 }
--- 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