comparison OrthancServer/OrthancMoveRequestHandler.cpp @ 3863:9973d10bc5c4 transcoding

switch to DicomStoreUserConnection in Lua routing, C-MOVE handler and straight C-STORE
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 27 Apr 2020 18:16:20 +0200
parents 4fc24b69446a
children 2effa961f67f
comparison
equal deleted inserted replaced
3862:594263db316a 3863:9973d10bc5c4
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 connection_.reset(new DicomStoreUserConnection(localAet_, remote_));
117 } 117 }
118 118
119 std::string sopClassUid, sopInstanceUid; // Unused 119 std::string sopClassUid, sopInstanceUid; // Unused
120 connection_->Store(sopClassUid, sopInstanceUid, dicom, originatorAet_, originatorId_); 120
121 const void* data = dicom.empty() ? NULL : dicom.c_str();
122 connection_->Store(sopClassUid, sopInstanceUid, data, dicom.size(),
123 originatorAet_, originatorId_);
121 124
122 return Status_Success; 125 return Status_Success;
123 } 126 }
124 }; 127 };
125 128