Mercurial > hg > orthanc

comparison OrthancServer/Sources/Database/FindRequest.h @ 5596:81a29ad7fb4b find-refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added possibility to retrieve main DICOM tags and metadata at any level
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 07 May 2024 18:44:53 +0200
parents a87f2a56257d
children 4690a0d2b01e
comparison
equal deleted inserted replaced
5595:a87f2a56257d 5596:81a29ad7fb4b
164 uint64_t limitsCount_; 164 uint64_t limitsCount_;
165 std::set<std::string> labels_; 165 std::set<std::string> labels_;
166 LabelsConstraint labelsContraint_; 166 LabelsConstraint labelsContraint_;
167 std::deque<Ordering*> ordering_; // The ordering criteria (note: the order is important !) 167 std::deque<Ordering*> ordering_; // The ordering criteria (note: the order is important !)
168 168
169 bool retrieveMainDicomTags_; 169 bool retrieveMainDicomTagsPatients_;
170 bool retrieveMetadata_; 170 bool retrieveMainDicomTagsStudies_;
171 bool retrieveMainDicomTagsSeries_;
172 bool retrieveMainDicomTagsInstances_;
173 bool retrieveMetadataPatients_;
174 bool retrieveMetadataStudies_;
175 bool retrieveMetadataSeries_;
176 bool retrieveMetadataInstances_;
171 bool retrieveLabels_; 177 bool retrieveLabels_;
172 bool retrieveAttachments_; 178 bool retrieveAttachments_;
173 bool retrieveParentIdentifier_; 179 bool retrieveParentIdentifier_;
174 bool retrieveChildrenIdentifiers_; 180 bool retrieveChildrenIdentifiers_;
175 std::set<MetadataType> retrieveChildrenMetadata_; 181 std::set<MetadataType> retrieveChildrenMetadata_;
182 std::set<FileContentType> retrieveAttachmentOfOneInstance_;
176 183
177 public: 184 public:
178 explicit FindRequest(ResourceType level); 185 explicit FindRequest(ResourceType level);
179 186
180 ~FindRequest(); 187 ~FindRequest();
257 LabelsConstraint GetLabelsConstraint() const 264 LabelsConstraint GetLabelsConstraint() const
258 { 265 {
259 return labelsContraint_; 266 return labelsContraint_;
260 } 267 }
261 268
262 void SetRetrieveMetadata(bool retrieve) 269 void SetRetrieveMainDicomTags(ResourceType level,
263 { 270 bool retrieve);
264 retrieveMetadata_ = retrieve; 271
265 } 272 bool IsRetrieveMainDicomTags(ResourceType level) const;
266 273
267 bool IsRetrieveMainDicomTags() const 274 void SetRetrieveMetadata(ResourceType level,
268 { 275 bool retrieve);
269 return retrieveMainDicomTags_; 276
270 } 277 bool IsRetrieveMetadata(ResourceType level) const;
271
272 void SetRetrieveMainDicomTags(bool retrieve)
273 {
274 retrieveMainDicomTags_ = retrieve;
275 }
276
277 bool IsRetrieveMetadata() const
278 {
279 return retrieveMetadata_;
280 }
281 278
282 void SetRetrieveLabels(bool retrieve) 279 void SetRetrieveLabels(bool retrieve)
283 { 280 {
284 retrieveLabels_ = retrieve; 281 retrieveLabels_ = retrieve;
285 } 282 }
321 } 318 }
322 319
323 const std::set<MetadataType>& GetRetrieveChildrenMetadata() const 320 const std::set<MetadataType>& GetRetrieveChildrenMetadata() const
324 { 321 {
325 return retrieveChildrenMetadata_; 322 return retrieveChildrenMetadata_;
323 }
324
325 void AddRetrieveAttachmentOfOneInstance(FileContentType type);
326
327 const std::set<FileContentType>& GetRetrieveAttachmentOfOneInstance() const
328 {
329 return retrieveAttachmentOfOneInstance_;
326 } 330 }
327 }; 331 };
328 } 332 }