comparison OrthancServer/Sources/Database/StatelessDatabaseOperations.h @ 4940:304514ce84ee more-tags

tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags'
author Alain Mazy <am@osimis.io>
date Tue, 15 Mar 2022 15:57:21 +0100
parents e8a2e145c80e
children 8fba26292a9f
comparison
equal deleted inserted replaced
4939:e8a2e145c80e 4940:304514ce84ee
62 size_t fileSize_; 62 size_t fileSize_;
63 std::string fileUuid_; 63 std::string fileUuid_;
64 int indexInSeries_; 64 int indexInSeries_;
65 }; 65 };
66 66
67 enum ExpandResourceDbFlags
68 {
69 ExpandResourceDbFlags_None = 0,
70 ExpandResourceDbFlags_IncludeMetadata = (1 << 0),
71 ExpandResourceDbFlags_IncludeChildren = (1 << 1),
72 ExpandResourceDbFlags_IncludeMainDicomTags = (1 << 2),
73
74 ExpandResourceDbFlags_Default = (ExpandResourceDbFlags_IncludeMetadata |
75 ExpandResourceDbFlags_IncludeChildren |
76 ExpandResourceDbFlags_IncludeMainDicomTags)
77 };
67 78
68 class StatelessDatabaseOperations : public boost::noncopyable 79 class StatelessDatabaseOperations : public boost::noncopyable
69 { 80 {
70 public: 81 public:
71 typedef std::list<FileInfo> Attachments; 82 typedef std::list<FileInfo> Attachments;
477 void Apply(IReadWriteOperations& operations); 488 void Apply(IReadWriteOperations& operations);
478 489
479 bool ExpandResource(ExpandedResource& target, 490 bool ExpandResource(ExpandedResource& target,
480 const std::string& publicId, 491 const std::string& publicId,
481 ResourceType level, 492 ResourceType level,
482 const std::set<DicomTag>& requestedTags); 493 const std::set<DicomTag>& requestedTags,
494 ExpandResourceDbFlags expandFlags);
483 495
484 void GetAllMetadata(std::map<MetadataType, std::string>& target, 496 void GetAllMetadata(std::map<MetadataType, std::string>& target,
485 const std::string& publicId, 497 const std::string& publicId,
486 ResourceType level); 498 ResourceType level);
487 499