diff OrthancServer/Sources/Database/StatelessDatabaseOperations.h @ 5039:28db9663fc2d

DicomSequencesMap + fix unit tests
author Alain Mazy <am@osimis.io>
date Mon, 27 Jun 2022 10:48:46 +0200
parents 877bc3b96476
children ec5c203a97ea
line wrap: on
line diff
--- a/OrthancServer/Sources/Database/StatelessDatabaseOperations.h	Fri Jun 24 16:44:38 2022 +0200
+++ b/OrthancServer/Sources/Database/StatelessDatabaseOperations.h	Mon Jun 27 10:48:46 2022 +0200
@@ -46,9 +46,15 @@
   {
     std::map<DicomTag, Json::Value>     sequences_;
 
-    void FromJson(const Json::Value& serialized);
+    void Deserialize(const Json::Value& serialized);
+    void Serialize(Json::Value& target, const std::set<DicomTag>& tags) const;
     void FromDicomAsJson(const Json::Value& dicomAsJson, const std::set<DicomTag>& tags);
     void ToJson(Json::Value& target, DicomToJsonFormat format) const;
+
+    size_t GetSize() const
+    {
+      return sequences_.size();
+    }
   };
 
   struct ExpandedResource : public boost::noncopyable
@@ -665,7 +671,7 @@
 
     StoreStatus Store(std::map<MetadataType, std::string>& instanceMetadata,
                       const DicomMap& dicomSummary,
-                      const std::map<DicomTag, Json::Value>& sequencesToStore,
+                      const DicomSequencesMap& sequencesToStore,
                       const Attachments& attachments,
                       const MetadataMap& metadata,
                       const DicomInstanceOrigin& origin,