Mercurial > hg > orthanc
diff OrthancServer/ServerJobs/DicomModalityStoreJob.cpp @ 3735:77183afbf55e storage-commitment
simplification
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 10 Mar 2020 13:59:14 +0100 |
parents | 4fc24b69446a |
children | f29843323daf |
line wrap: on
line diff
--- a/OrthancServer/ServerJobs/DicomModalityStoreJob.cpp Tue Mar 10 13:22:02 2020 +0100 +++ b/OrthancServer/ServerJobs/DicomModalityStoreJob.cpp Tue Mar 10 13:59:14 2020 +0100 @@ -102,8 +102,10 @@ assert(IsStarted()); OpenConnection(); - - connection_->RequestStorageCommitment(transactionUid_, sopClassUids_, sopInstanceUids_); + + std::vector<std::string> a(sopClassUids_.begin(), sopClassUids_.end()); + std::vector<std::string> b(sopInstanceUids_.begin(), sopInstanceUids_.end()); + connection_->RequestStorageCommitment(transactionUid_, a, b); } } @@ -125,6 +127,7 @@ moveOriginatorId_(0), // By default, not a C-MOVE storageCommitment_(false) // By default, no storage commitment { + ResetStorageCommitment(); } @@ -210,19 +213,12 @@ if (storageCommitment_) { transactionUid_ = Toolbox::GenerateDicomPrivateUniqueIdentifier(); - sopClassUids_.reserve(GetInstancesCount()); - sopInstanceUids_.reserve(GetInstancesCount()); + sopClassUids_.clear(); + sopInstanceUids_.clear(); } } - void DicomModalityStoreJob::Start() - { - SetOfInstancesJob::Start(); - ResetStorageCommitment(); - } - - void DicomModalityStoreJob::Reset() { SetOfInstancesJob::Reset(); @@ -240,6 +236,7 @@ void DicomModalityStoreJob::EnableStorageCommitment(bool enabled) { storageCommitment_ = enabled; + ResetStorageCommitment(); }