orthanc: OrthancServer/OrthancMoveRequestHandler.cpp comparison

Fix issue #128 (Asynchronous C-MOVE: invalid number of remaining sub-operations)

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 23 Jan 2019 09:32:59 +0100
parents	ac72032d69a2
children	8ea7c4546c3a

comparison

equal deleted inserted replaced

-:0c2b719c3796
+:8a9eb767280c
 {
 private:
 ServerContext&                        context_;
 std::auto_ptr<DicomModalityStoreJob>  job_;
 size_t                                position_;
+size_t                                countInstances_;
 public:
 AsynchronousMove(ServerContext& context,
 const std::string& targetAet,
 const std::string& publicId,
 }
 std::list<std::string> tmp;
 context_.GetIndex().GetChildInstances(tmp, publicId);
+countInstances_ = tmp.size();
 job_->Reserve(tmp.size());
 for (std::list<std::string>::iterator it = tmp.begin(); it != tmp.end(); ++it)
 {
 job_->AddInstance(*it);
 }
 }
 virtual unsigned int GetSubOperationCount() const
 {
-return 1;
+return countInstances_;
 }
 virtual Status DoNext()
 {
+if (position_ >= countInstances_)
+{
+return Status_Failure;
+}
 if (position_ == 0)
 {
 context_.GetJobsEngine().GetRegistry().Submit(job_.release(), 0 /* priority */);
-return Status_Success;
+}
-}
-else
+position_ ++;
-{
+return Status_Success;
-return Status_Failure;
-}
 }
 };
 }

Mercurial > hg > orthanc