Mercurial > hg > orthanc

diff OrthancServer/Sources/Database/StatelessDatabaseOperations.h @ 5614:4640b7ae9a11 find-refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moving normalization of constraints into FindRequest
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 09 May 2024 11:59:56 +0200
parents 3f24eb4013d8
children 824a5fb0774e
line wrap: on
line diff
--- a/OrthancServer/Sources/Database/StatelessDatabaseOperations.h	Thu May 09 11:32:06 2024 +0200
+++ b/OrthancServer/Sources/Database/StatelessDatabaseOperations.h	Thu May 09 11:59:56 2024 +0200
@@ -24,8 +24,9 @@
 
 #include "../../../OrthancFramework/Sources/DicomFormat/DicomMap.h"
 
+#include "../DicomInstanceOrigin.h"
 #include "IDatabaseWrapper.h"
-#include "../DicomInstanceOrigin.h"
+#include "MainDicomTagsRegistry.h"
 
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/shared_mutex.hpp>
@@ -393,17 +394,15 @@
       }
 
       void ExecuteFind(FindResponse& response,
-                       const FindRequest& request, 
-                       const std::vector<DatabaseConstraint>& normalized)
+                       const FindRequest& request)
       {
-        transaction_.ExecuteFind(response, request, normalized);
+        transaction_.ExecuteFind(response, request);
       }
 
       void ExecuteFind(std::list<std::string>& identifiers,
-                       const FindRequest& request,
-                       const std::vector<DatabaseConstraint>& normalized)
+                       const FindRequest& request)
       {
-        transaction_.ExecuteFind(identifiers, request, normalized);
+        transaction_.ExecuteFind(identifiers, request);
       }
 
       void ExecuteExpand(FindResponse& response,
@@ -579,7 +578,6 @@
     
 
   private:
-    class MainDicomTagsRegistry;
     class Transaction;
 
     IDatabaseWrapper&                            db_;
@@ -594,9 +592,6 @@
                          const DatabaseLookup& source,
                          ResourceType level) const;
 
-    void NormalizeLookup(std::vector<DatabaseConstraint>& target,
-                         const FindRequest& findRequest) const;
-
     void ApplyInternal(IReadOnlyOperations* readOperations,
                        IReadWriteOperations* writeOperations);