Mercurial > hg > orthanc
diff OrthancServer/ServerIndex.cpp @ 1822:9ed9458aa44f
refactoring
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 25 Nov 2015 10:06:50 +0100 |
parents | 613df4362575 |
children | 0ef4e6e66b56 |
line wrap: on
line diff
--- a/OrthancServer/ServerIndex.cpp Tue Nov 24 17:46:32 2015 +0100 +++ b/OrthancServer/ServerIndex.cpp Wed Nov 25 10:06:50 2015 +0100 @@ -50,6 +50,7 @@ #include "FromDcmtkBridge.h" #include "ServerContext.h" +#include "DicomInstanceToStore.h" #include <boost/lexical_cast.hpp> #include <stdio.h> @@ -593,16 +594,17 @@ StoreStatus ServerIndex::Store(std::map<MetadataType, std::string>& instanceMetadata, - const DicomMap& dicomSummary, - const Attachments& attachments, - const std::string& remoteAet, - const MetadataMap& metadata) + DicomInstanceToStore& instanceToStore, + const Attachments& attachments) { boost::mutex::scoped_lock lock(mutex_); + const DicomMap& dicomSummary = instanceToStore.GetSummary(); + const ServerIndex::MetadataMap& metadata = instanceToStore.GetMetadata(); + instanceMetadata.clear(); - DicomInstanceHasher hasher(dicomSummary); + DicomInstanceHasher hasher(instanceToStore.GetSummary()); try { @@ -766,8 +768,8 @@ db_.SetMetadata(instance, MetadataType_Instance_ReceptionDate, now); instanceMetadata[MetadataType_Instance_ReceptionDate] = now; - db_.SetMetadata(instance, MetadataType_Instance_RemoteAet, remoteAet); - instanceMetadata[MetadataType_Instance_RemoteAet] = remoteAet; + db_.SetMetadata(instance, MetadataType_Instance_RemoteAet, instanceToStore.GetRemoteAet()); + instanceMetadata[MetadataType_Instance_RemoteAet] = instanceToStore.GetRemoteAet(); const DicomValue* value; if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_INSTANCE_NUMBER)) != NULL ||