Mercurial > hg > orthanc

comparison OrthancServer/OrthancMoveRequestHandler.cpp @ 3920:82e88ff003d7 c-get

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default -> c-get
author Alain Mazy <alain@mazy.be>
date Tue, 12 May 2020 14:58:24 +0200
parents 8f7ad4989fec
children
comparison
equal deleted inserted replaced
3918:dba48c162b7b 3920:82e88ff003d7
57 std::vector<std::string> instances_; 57 std::vector<std::string> instances_;
58 size_t position_; 58 size_t position_;
59 RemoteModalityParameters remote_; 59 RemoteModalityParameters remote_;
60 std::string originatorAet_; 60 std::string originatorAet_;
61 uint16_t originatorId_; 61 uint16_t originatorId_;
62 std::unique_ptr<DicomUserConnection> connection_; 62 std::unique_ptr<DicomStoreUserConnection> connection_;
63 63
64 public: 64 public:
65 SynchronousMove(ServerContext& context, 65 SynchronousMove(ServerContext& context,
66 const std::string& targetAet, 66 const std::string& targetAet,
67 const std::vector<std::string>& publicIds, 67 const std::vector<std::string>& publicIds,
111 std::string dicom; 111 std::string dicom;
112 context_.ReadDicom(dicom, id); 112 context_.ReadDicom(dicom, id);
113 113
114 if (connection_.get() == NULL) 114 if (connection_.get() == NULL)
115 { 115 {
116 connection_.reset(new DicomUserConnection(localAet_, remote_)); 116 DicomAssociationParameters params(localAet_, remote_);
117 connection_.reset(new DicomStoreUserConnection(params));
117 } 118 }
118 119
119 std::string sopClassUid, sopInstanceUid; // Unused 120 std::string sopClassUid, sopInstanceUid; // Unused
120 connection_->Store(sopClassUid, sopInstanceUid, dicom, originatorAet_, originatorId_); 121
122 const void* data = dicom.empty() ? NULL : dicom.c_str();
123 connection_->Store(sopClassUid, sopInstanceUid, data, dicom.size(),
124 true, originatorAet_, originatorId_);
121 125
122 return Status_Success; 126 return Status_Success;
123 } 127 }
124 }; 128 };
125 129