Mercurial > hg > orthanc

diff OrthancServer/Sources/ResourceFinder.h @ 5713:d851a54e49b7 find-refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed "includeAllMetadata_" member from ResourceFinder
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 13 Jul 2024 00:03:42 +0200
parents 476b1db52110
children 2b05428843d2
line wrap: on
line diff
--- a/OrthancServer/Sources/ResourceFinder.h	Fri Jul 12 18:41:44 2024 +0200
+++ b/OrthancServer/Sources/ResourceFinder.h	Sat Jul 13 00:03:42 2024 +0200
@@ -74,7 +74,6 @@
     std::set<DicomTag>               requestedInstanceTags_;
     std::set<DicomTag>               requestedTagsFromFileStorage_;
     std::set<DicomTag>               requestedComputedTags_;
-    bool                             includeAllMetadata_;   // Same as: ExpandResourceFlags_IncludeAllMetadata
 
     bool IsRequestedComputedTag(const DicomTag& tag) const
     {
@@ -126,11 +125,6 @@
 
     void SetDatabaseLookup(const DatabaseLookup& lookup);
 
-    void SetIncludeAllMetadata(bool include)
-    {
-      includeAllMetadata_ = include;
-    }
-
     void AddRequestedTag(const DicomTag& tag);
 
     void AddRequestedTags(const std::set<DicomTag>& tags);
@@ -165,10 +159,12 @@
       request_.SetRetrieveAttachments(retrieve);
     }
 
+    // NB: "index" is only used in this method to fill the "IsStable" information
     void Expand(Json::Value& target,
                 const FindResponse::Resource& resource,
                 ServerIndex& index,
-                DicomToJsonFormat format) const;
+                DicomToJsonFormat format,
+                bool includeAllMetadata /* Same as: ExpandResourceFlags_IncludeAllMetadata */) const;
 
     void Execute(FindResponse& target,
                  ServerIndex& index) const;
@@ -178,10 +174,12 @@
 
     void Execute(Json::Value& target,
                  ServerContext& context,
-                 DicomToJsonFormat format) const;
+                 DicomToJsonFormat format,
+                 bool includeAllMetadata) const;
 
     bool ExecuteOneResource(Json::Value& target,
                             ServerContext& context,
-                            DicomToJsonFormat format) const;
+                            DicomToJsonFormat format,
+                            bool includeAllMetadata) const;
   };
 }