Mercurial > hg > orthanc

comparison OrthancServer/OrthancMoveRequestHandler.cpp @ 2590:5e2730c8e23c jobs

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
getting rid of ReusableDicomConnection in QueryRetrieveHandler and OrthancMoveRequestHandler
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 15 May 2018 16:28:43 +0200
parents 878b59270859
children 714dcddeb65f
comparison
equal deleted inserted replaced
2589:a3fdfb6979ed 2590:5e2730c8e23c
53 std::vector<std::string> instances_; 53 std::vector<std::string> instances_;
54 size_t position_; 54 size_t position_;
55 RemoteModalityParameters remote_; 55 RemoteModalityParameters remote_;
56 std::string originatorAet_; 56 std::string originatorAet_;
57 uint16_t originatorId_; 57 uint16_t originatorId_;
58 std::auto_ptr<DicomUserConnection> connection_;
58 59
59 public: 60 public:
60 OrthancMoveRequestIterator(ServerContext& context, 61 OrthancMoveRequestIterator(ServerContext& context,
61 const std::string& aet, 62 const std::string& aet,
62 const std::string& publicId, 63 const std::string& publicId,
97 const std::string& id = instances_[position_++]; 98 const std::string& id = instances_[position_++];
98 99
99 std::string dicom; 100 std::string dicom;
100 context_.ReadDicom(dicom, id); 101 context_.ReadDicom(dicom, id);
101 102
102 { 103 if (connection_.get() == NULL)
103 ReusableDicomUserConnection::Locker locker 104 {
104 (context_.GetReusableDicomUserConnection(), localAet_, remote_); 105 connection_.reset(new DicomUserConnection(localAet_, remote_));
105 locker.GetConnection().Store(dicom, originatorAet_, originatorId_); 106 }
106 } 107
108 connection_->Store(dicom, originatorAet_, originatorId_);
107 109
108 return Status_Success; 110 return Status_Success;
109 } 111 }
110 }; 112 };
111 } 113 }