Mercurial > hg > orthanc
comparison 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 |
comparison
equal
deleted
inserted
replaced
3734:4fc24b69446a | 3735:77183afbf55e |
---|---|
100 LOG(INFO) << "Sending storage commitment request to modality: " | 100 LOG(INFO) << "Sending storage commitment request to modality: " |
101 << remote_.GetApplicationEntityTitle(); | 101 << remote_.GetApplicationEntityTitle(); |
102 | 102 |
103 assert(IsStarted()); | 103 assert(IsStarted()); |
104 OpenConnection(); | 104 OpenConnection(); |
105 | 105 |
106 connection_->RequestStorageCommitment(transactionUid_, sopClassUids_, sopInstanceUids_); | 106 std::vector<std::string> a(sopClassUids_.begin(), sopClassUids_.end()); |
107 std::vector<std::string> b(sopInstanceUids_.begin(), sopInstanceUids_.end()); | |
108 connection_->RequestStorageCommitment(transactionUid_, a, b); | |
107 } | 109 } |
108 } | 110 } |
109 | 111 |
110 //boost::this_thread::sleep(boost::posix_time::milliseconds(500)); | 112 //boost::this_thread::sleep(boost::posix_time::milliseconds(500)); |
111 | 113 |
123 context_(context), | 125 context_(context), |
124 localAet_("ORTHANC"), | 126 localAet_("ORTHANC"), |
125 moveOriginatorId_(0), // By default, not a C-MOVE | 127 moveOriginatorId_(0), // By default, not a C-MOVE |
126 storageCommitment_(false) // By default, no storage commitment | 128 storageCommitment_(false) // By default, no storage commitment |
127 { | 129 { |
130 ResetStorageCommitment(); | |
128 } | 131 } |
129 | 132 |
130 | 133 |
131 void DicomModalityStoreJob::SetLocalAet(const std::string& aet) | 134 void DicomModalityStoreJob::SetLocalAet(const std::string& aet) |
132 { | 135 { |
208 void DicomModalityStoreJob::ResetStorageCommitment() | 211 void DicomModalityStoreJob::ResetStorageCommitment() |
209 { | 212 { |
210 if (storageCommitment_) | 213 if (storageCommitment_) |
211 { | 214 { |
212 transactionUid_ = Toolbox::GenerateDicomPrivateUniqueIdentifier(); | 215 transactionUid_ = Toolbox::GenerateDicomPrivateUniqueIdentifier(); |
213 sopClassUids_.reserve(GetInstancesCount()); | 216 sopClassUids_.clear(); |
214 sopInstanceUids_.reserve(GetInstancesCount()); | 217 sopInstanceUids_.clear(); |
215 } | 218 } |
216 } | 219 } |
217 | 220 |
218 | |
219 void DicomModalityStoreJob::Start() | |
220 { | |
221 SetOfInstancesJob::Start(); | |
222 ResetStorageCommitment(); | |
223 } | |
224 | |
225 | 221 |
226 void DicomModalityStoreJob::Reset() | 222 void DicomModalityStoreJob::Reset() |
227 { | 223 { |
228 SetOfInstancesJob::Reset(); | 224 SetOfInstancesJob::Reset(); |
229 | 225 |
238 | 234 |
239 | 235 |
240 void DicomModalityStoreJob::EnableStorageCommitment(bool enabled) | 236 void DicomModalityStoreJob::EnableStorageCommitment(bool enabled) |
241 { | 237 { |
242 storageCommitment_ = enabled; | 238 storageCommitment_ = enabled; |
239 ResetStorageCommitment(); | |
243 } | 240 } |
244 | 241 |
245 | 242 |
246 void DicomModalityStoreJob::GetPublicContent(Json::Value& value) | 243 void DicomModalityStoreJob::GetPublicContent(Json::Value& value) |
247 { | 244 { |