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

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
comparison
equal deleted inserted replaced
5709:476b1db52110 5713:d851a54e49b7
72 std::set<DicomTag> requestedStudyTags_; 72 std::set<DicomTag> requestedStudyTags_;
73 std::set<DicomTag> requestedSeriesTags_; 73 std::set<DicomTag> requestedSeriesTags_;
74 std::set<DicomTag> requestedInstanceTags_; 74 std::set<DicomTag> requestedInstanceTags_;
75 std::set<DicomTag> requestedTagsFromFileStorage_; 75 std::set<DicomTag> requestedTagsFromFileStorage_;
76 std::set<DicomTag> requestedComputedTags_; 76 std::set<DicomTag> requestedComputedTags_;
77 bool includeAllMetadata_; // Same as: ExpandResourceFlags_IncludeAllMetadata
78 77
79 bool IsRequestedComputedTag(const DicomTag& tag) const 78 bool IsRequestedComputedTag(const DicomTag& tag) const
80 { 79 {
81 return requestedComputedTags_.find(tag) != requestedComputedTags_.end(); 80 return requestedComputedTags_.find(tag) != requestedComputedTags_.end();
82 } 81 }
124 123
125 void SetLimitsCount(uint64_t count); 124 void SetLimitsCount(uint64_t count);
126 125
127 void SetDatabaseLookup(const DatabaseLookup& lookup); 126 void SetDatabaseLookup(const DatabaseLookup& lookup);
128 127
129 void SetIncludeAllMetadata(bool include)
130 {
131 includeAllMetadata_ = include;
132 }
133
134 void AddRequestedTag(const DicomTag& tag); 128 void AddRequestedTag(const DicomTag& tag);
135 129
136 void AddRequestedTags(const std::set<DicomTag>& tags); 130 void AddRequestedTags(const std::set<DicomTag>& tags);
137 131
138 void SetLabels(const std::set<std::string>& labels) 132 void SetLabels(const std::set<std::string>& labels)
163 void SetRetrieveAttachments(bool retrieve) 157 void SetRetrieveAttachments(bool retrieve)
164 { 158 {
165 request_.SetRetrieveAttachments(retrieve); 159 request_.SetRetrieveAttachments(retrieve);
166 } 160 }
167 161
162 // NB: "index" is only used in this method to fill the "IsStable" information
168 void Expand(Json::Value& target, 163 void Expand(Json::Value& target,
169 const FindResponse::Resource& resource, 164 const FindResponse::Resource& resource,
170 ServerIndex& index, 165 ServerIndex& index,
171 DicomToJsonFormat format) const; 166 DicomToJsonFormat format,
167 bool includeAllMetadata /* Same as: ExpandResourceFlags_IncludeAllMetadata */) const;
172 168
173 void Execute(FindResponse& target, 169 void Execute(FindResponse& target,
174 ServerIndex& index) const; 170 ServerIndex& index) const;
175 171
176 void Execute(IVisitor& visitor, 172 void Execute(IVisitor& visitor,
177 ServerContext& context) const; 173 ServerContext& context) const;
178 174
179 void Execute(Json::Value& target, 175 void Execute(Json::Value& target,
180 ServerContext& context, 176 ServerContext& context,
181 DicomToJsonFormat format) const; 177 DicomToJsonFormat format,
178 bool includeAllMetadata) const;
182 179
183 bool ExecuteOneResource(Json::Value& target, 180 bool ExecuteOneResource(Json::Value& target,
184 ServerContext& context, 181 ServerContext& context,
185 DicomToJsonFormat format) const; 182 DicomToJsonFormat format,
183 bool includeAllMetadata) const;
186 }; 184 };
187 } 185 }