Mercurial > hg > orthanc

comparison OrthancServer/OrthancMoveRequestHandler.cpp @ 2940:4767d36679ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring access to Orthanc configuration
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 29 Nov 2018 11:47:00 +0100
parents 00504dcc996f
children 6896a7c1cbe2
comparison
equal deleted inserted replaced
2939:577786f59252 2940:4767d36679ed
32 32
33 33
34 #include "PrecompiledHeadersServer.h" 34 #include "PrecompiledHeadersServer.h"
35 #include "OrthancMoveRequestHandler.h" 35 #include "OrthancMoveRequestHandler.h"
36 36
37 #include "OrthancInitialization.h" 37 #include "OrthancConfiguration.h"
38 #include "../../Core/DicomParsing/FromDcmtkBridge.h" 38 #include "../../Core/DicomParsing/FromDcmtkBridge.h"
39 #include "../Core/DicomFormat/DicomArray.h" 39 #include "../Core/DicomFormat/DicomArray.h"
40 #include "../Core/Logging.h" 40 #include "../Core/Logging.h"
41 #include "ServerJobs/DicomModalityStoreJob.h" 41 #include "ServerJobs/DicomModalityStoreJob.h"
42 42
79 for (std::list<std::string>::iterator it = tmp.begin(); it != tmp.end(); ++it) 79 for (std::list<std::string>::iterator it = tmp.begin(); it != tmp.end(); ++it)
80 { 80 {
81 instances_.push_back(*it); 81 instances_.push_back(*it);
82 } 82 }
83 83
84 remote_ = Configuration::GetModalityUsingAet(targetAet); 84 {
85 OrthancConfiguration::ReaderLock lock;
86 remote_ = lock.GetConfiguration().GetModalityUsingAet(targetAet);
87 }
85 } 88 }
86 89
87 virtual unsigned int GetSubOperationCount() const 90 virtual unsigned int GetSubOperationCount() const
88 { 91 {
89 return instances_.size(); 92 return instances_.size();
133 LOG(INFO) << "Sending resource " << publicId << " to modality \"" << targetAet << "\""; 136 LOG(INFO) << "Sending resource " << publicId << " to modality \"" << targetAet << "\"";
134 137
135 job_->SetDescription("C-MOVE"); 138 job_->SetDescription("C-MOVE");
136 job_->SetPermissive(true); 139 job_->SetPermissive(true);
137 job_->SetLocalAet(context.GetDefaultLocalApplicationEntityTitle()); 140 job_->SetLocalAet(context.GetDefaultLocalApplicationEntityTitle());
138 job_->SetRemoteModality(Configuration::GetModalityUsingAet(targetAet)); 141
142 {
143 OrthancConfiguration::ReaderLock lock;
144 job_->SetRemoteModality(lock.GetConfiguration().GetModalityUsingAet(targetAet));
145 }
139 146
140 if (originatorId != 0) 147 if (originatorId != 0)
141 { 148 {
142 job_->SetMoveOriginator(originatorAet, originatorId); 149 job_->SetMoveOriginator(originatorAet, originatorId);
143 } 150 }
236 const std::string& targetAet, 243 const std::string& targetAet,
237 const std::string& publicId, 244 const std::string& publicId,
238 const std::string& originatorAet, 245 const std::string& originatorAet,
239 uint16_t originatorId) 246 uint16_t originatorId)
240 { 247 {
241 bool synchronous = Configuration::GetGlobalBoolParameter("SynchronousCMove", true); 248 bool synchronous;
249
250 {
251 OrthancConfiguration::ReaderLock lock;
252 synchronous = lock.GetConfiguration().GetBooleanParameter("SynchronousCMove", true);
253 }
242 254
243 if (synchronous) 255 if (synchronous)
244 { 256 {
245 return new SynchronousMove(context, targetAet, publicId, originatorAet, originatorId); 257 return new SynchronousMove(context, targetAet, publicId, originatorAet, originatorId);
246 } 258 }