diff OrthancServer/Sources/Database/FindRequest.h @ 5725:95a3802ad133 find-refactoring

initial implementation of protobuf for find
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 19 Jul 2024 14:02:22 +0200
parents b1c86368af2b
children e2771185dad6
line wrap: on
line diff
--- a/OrthancServer/Sources/Database/FindRequest.h	Fri Jul 19 10:25:03 2024 +0200
+++ b/OrthancServer/Sources/Database/FindRequest.h	Fri Jul 19 14:02:22 2024 +0200
@@ -233,13 +233,15 @@
     ResourceType                         level_;                // The level of the response (the filtering on tags, labels and metadata also happens at this level)
     OrthancIdentifiers                   orthancIdentifiers_;   // The response must belong to this Orthanc resources hierarchy
     DatabaseConstraints                  dicomTagConstraints_;  // All tags filters (note: the order is not important)
-    std::deque<void*>   /* TODO-FIND */       metadataConstraints_;  // All metadata filters (note: the order is not important)
     bool                                 hasLimits_;
     uint64_t                             limitsSince_;
     uint64_t                             limitsCount_;
     std::set<std::string>                labels_;
     LabelsConstraint                     labelsConstraint_;
+
+    // TODO-FIND
     std::deque<Ordering*>                ordering_;             // The ordering criteria (note: the order is important !)
+    std::deque<void*>   /* TODO-FIND */       metadataConstraints_;  // All metadata filters (note: the order is not important)
 
     bool                                 retrieveMainDicomTags_;
     bool                                 retrieveMetadata_;
@@ -314,9 +316,11 @@
 
     uint64_t GetLimitsCount() const;
 
-    void AddOrdering(const DicomTag& tag, OrderingDirection direction);
+    void AddOrdering(const DicomTag& tag,
+                     OrderingDirection direction);
 
-    void AddOrdering(MetadataType metadataType, OrderingDirection direction);
+    void AddOrdering(MetadataType metadataType,
+                     OrderingDirection direction);
 
     const std::deque<Ordering*>& GetOrdering() const
     {