diff OrthancServer/Sources/ServerIndex.cpp @ 4505:97d103b57cd1

removed cached dicom summary from DicomInstanceToStore
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 10 Feb 2021 12:07:03 +0100
parents 6f99949b2878
children ac69c9f76c71
line wrap: on
line diff
--- a/OrthancServer/Sources/ServerIndex.cpp	Wed Feb 10 11:29:53 2021 +0100
+++ b/OrthancServer/Sources/ServerIndex.cpp	Wed Feb 10 12:07:03 2021 +0100
@@ -757,6 +757,8 @@
   
   StoreStatus ServerIndex::Store(std::map<MetadataType, std::string>& instanceMetadata,
                                  DicomInstanceToStore& instanceToStore,
+                                 const DicomMap& dicomSummary,
+                                 DicomInstanceHasher& hasher,
                                  const Attachments& attachments,
                                  bool overwrite,
                                  bool hasPixelDataOffset,
@@ -764,7 +766,6 @@
   {
     boost::mutex::scoped_lock lock(mutex_);
 
-    const DicomMap& dicomSummary = instanceToStore.GetSummary();
     const ServerIndex::MetadataMap& metadata = instanceToStore.GetMetadata();
 
     int64_t expectedInstances;
@@ -773,10 +774,10 @@
     
     instanceMetadata.clear();
 
-    const std::string hashPatient = instanceToStore.GetHasher().HashPatient();
-    const std::string hashStudy = instanceToStore.GetHasher().HashStudy();
-    const std::string hashSeries = instanceToStore.GetHasher().HashSeries();
-    const std::string hashInstance = instanceToStore.GetHasher().HashInstance();
+    const std::string hashPatient = hasher.HashPatient();
+    const std::string hashStudy = hasher.HashStudy();
+    const std::string hashSeries = hasher.HashSeries();
+    const std::string hashInstance = hasher.HashInstance();
 
     try
     {