Mercurial > hg > orthanc
diff OrthancServer/Sources/Database/StatelessDatabaseOperations.h @ 5044:6fed78e13233
Refactored DicomMap to handle sequences when needed
| author | Alain Mazy <am@osimis.io> |
|---|---|
| date | Tue, 28 Jun 2022 17:45:09 +0200 |
| parents | ec5c203a97ea |
| children | e95fadefeb72 |
line wrap: on
line diff
--- a/OrthancServer/Sources/Database/StatelessDatabaseOperations.h Mon Jun 27 15:22:19 2022 +0200 +++ b/OrthancServer/Sources/Database/StatelessDatabaseOperations.h Tue Jun 28 17:45:09 2022 +0200 @@ -23,7 +23,6 @@ #pragma once #include "../../../OrthancFramework/Sources/DicomFormat/DicomMap.h" -#include "../../../OrthancFramework/Sources/DicomFormat/DicomSequencesMap.h" #include "IDatabaseWrapper.h" #include "../DicomInstanceOrigin.h" @@ -41,8 +40,7 @@ struct ExpandedResource : public boost::noncopyable { std::string id_; - DicomMap tags_; // all tags from DB (only leaf tags, not sequences !) - DicomSequencesMap sequences_; // the requested sequences (from MainDicomTags or RequestedTags) + DicomMap tags_; // all main tags and main sequences from DB std::string mainDicomTagsSignature_; std::string parentId_; std::list<std::string> childrenIds_; @@ -652,7 +650,6 @@ StoreStatus Store(std::map<MetadataType, std::string>& instanceMetadata, const DicomMap& dicomSummary, - const DicomSequencesMap& sequencesToStore, const Attachments& attachments, const MetadataMap& metadata, const DicomInstanceOrigin& origin,