comparison Framework/PullMode/PullJob.cpp @ 8:4c3437217518

fix for compatibility with simplified OrthancPluginCppWrapper
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 05 Dec 2018 09:16:51 +0100
parents 5e6de82bb10f
children 7e207ade2f1a
comparison
equal deleted inserted replaced
7:151e29acbb13 8:4c3437217518
44 { 44 {
45 } 45 }
46 46
47 virtual StateUpdate* Step() 47 virtual StateUpdate* Step()
48 { 48 {
49 area_->Commit(job_.context_); 49 area_->Commit();
50 return StateUpdate::Success(); 50 return StateUpdate::Success();
51 } 51 }
52 52
53 virtual void Stop(OrthancPluginJobStopReason reason) 53 virtual void Stop(OrthancPluginJobStopReason reason)
54 { 54 {
91 PullBucketsState(const PullJob& job, 91 PullBucketsState(const PullJob& job,
92 JobInfo& info, 92 JobInfo& info,
93 const TransferScheduler& scheduler) : 93 const TransferScheduler& scheduler) :
94 job_(job), 94 job_(job),
95 info_(info), 95 info_(info),
96 queue_(job.context_),
97 area_(new DownloadArea(scheduler)) 96 area_(new DownloadArea(scheduler))
98 { 97 {
99 const std::string baseUrl = job.peers_.GetPeerUrl(job.query_.GetPeer()); 98 const std::string baseUrl = job.peers_.GetPeerUrl(job.query_.GetPeer());
100 99
101 std::vector<TransferBucket> buckets; 100 std::vector<TransferBucket> buckets;
227 { 226 {
228 return StateUpdate::Next(new LookupInstancesState(*this, info)); 227 return StateUpdate::Next(new LookupInstancesState(*this, info));
229 } 228 }
230 229
231 230
232 PullJob::PullJob(OrthancPluginContext* context, 231 PullJob::PullJob(const TransferQuery& query,
233 const TransferQuery& query,
234 size_t threadsCount, 232 size_t threadsCount,
235 size_t targetBucketSize) : 233 size_t targetBucketSize) :
236 StatefulOrthancJob(JOB_TYPE_PULL), 234 StatefulOrthancJob(JOB_TYPE_PULL),
237 context_(context),
238 query_(query), 235 query_(query),
239 threadsCount_(threadsCount), 236 threadsCount_(threadsCount),
240 targetBucketSize_(targetBucketSize), 237 targetBucketSize_(targetBucketSize)
241 peers_(context)
242 { 238 {
243 if (!peers_.LookupName(peerIndex_, query_.GetPeer())) 239 if (!peers_.LookupName(peerIndex_, query_.GetPeer()))
244 { 240 {
245 LOG(ERROR) << "Unknown Orthanc peer: " << query_.GetPeer(); 241 LOG(ERROR) << "Unknown Orthanc peer: " << query_.GetPeer();
246 throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource); 242 throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource);