Mercurial > hg > orthanc
annotate OrthancServer/ServerJobs/DicomModalityStoreJob.cpp @ 3749:edabdf07ee83
replacing deprecated std::auto_ptr by boost::movelib in C++ plugin wrapper
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 16 Mar 2020 11:13:30 +0100 |
| parents | 2a170a8f1faf |
| children | 4fc24b69446a |
| rev | line source |
|---|---|
| 2603 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
|
3640
94f4a18a79cc
upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
| 2603 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU General Public License as | |
| 9 * published by the Free Software Foundation, either version 3 of the | |
| 10 * License, or (at your option) any later version. | |
| 11 * | |
| 12 * In addition, as a special exception, the copyright holders of this | |
| 13 * program give permission to link the code of its release with the | |
| 14 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 15 * that use the same license as the "OpenSSL" library), and distribute | |
| 16 * the linked executables. You must obey the GNU General Public License | |
| 17 * in all respects for all of the code used other than "OpenSSL". If you | |
| 18 * modify file(s) with this exception, you may extend this exception to | |
| 19 * your version of the file(s), but you are not obligated to do so. If | |
| 20 * you do not wish to do so, delete this exception statement from your | |
| 21 * version. If you delete this exception statement from all source files | |
| 22 * in the program, then also delete it here. | |
| 23 * | |
| 24 * This program is distributed in the hope that it will be useful, but | |
| 25 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 27 * General Public License for more details. | |
| 28 * | |
| 29 * You should have received a copy of the GNU General Public License | |
| 30 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 31 **/ | |
| 32 | |
| 33 | |
| 34 #include "../PrecompiledHeadersServer.h" | |
| 35 #include "DicomModalityStoreJob.h" | |
| 36 | |
|
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
37 #include "../../Core/Compatibility.h" |
| 2603 | 38 #include "../../Core/Logging.h" |
|
2664
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
39 #include "../../Core/SerializationToolbox.h" |
|
3095
beeeb6096f27
removing dependencies upon ServerContext
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
40 #include "../ServerContext.h" |
|
beeeb6096f27
removing dependencies upon ServerContext
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
41 |
| 2603 | 42 |
| 43 namespace Orthanc | |
| 44 { | |
| 45 void DicomModalityStoreJob::OpenConnection() | |
| 46 { | |
| 47 if (connection_.get() == NULL) | |
| 48 { | |
| 49 connection_.reset(new DicomUserConnection); | |
| 50 connection_->SetLocalApplicationEntityTitle(localAet_); | |
| 51 connection_->SetRemoteModality(remote_); | |
| 52 } | |
| 53 } | |
| 54 | |
| 55 | |
| 56 bool DicomModalityStoreJob::HandleInstance(const std::string& instance) | |
| 57 { | |
|
2640
c691fcf66071
ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
58 assert(IsStarted()); |
| 2603 | 59 OpenConnection(); |
| 60 | |
| 61 LOG(INFO) << "Sending instance " << instance << " to modality \"" | |
| 62 << remote_.GetApplicationEntityTitle() << "\""; | |
| 63 | |
| 64 std::string dicom; | |
|
2624
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
65 |
|
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
66 try |
|
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
67 { |
|
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
68 context_.ReadDicom(dicom, instance); |
|
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
69 } |
|
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
70 catch (OrthancException& e) |
|
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
71 { |
|
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
72 LOG(WARNING) << "An instance was removed after the job was issued: " << instance; |
|
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
73 return false; |
|
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
74 } |
| 2603 | 75 |
| 76 if (HasMoveOriginator()) | |
| 77 { | |
| 78 connection_->Store(dicom, moveOriginatorAet_, moveOriginatorId_); | |
| 79 } | |
| 80 else | |
| 81 { | |
| 82 connection_->Store(dicom); | |
| 83 } | |
| 84 | |
| 85 //boost::this_thread::sleep(boost::posix_time::milliseconds(500)); | |
| 86 | |
| 87 return true; | |
| 88 } | |
| 89 | |
| 90 | |
|
2842
ff0ed5ea9e4e
trailing step in SetOfInstancesJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2812
diff
changeset
|
91 bool DicomModalityStoreJob::HandleTrailingStep() |
|
ff0ed5ea9e4e
trailing step in SetOfInstancesJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2812
diff
changeset
|
92 { |
|
ff0ed5ea9e4e
trailing step in SetOfInstancesJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2812
diff
changeset
|
93 throw OrthancException(ErrorCode_InternalError); |
|
ff0ed5ea9e4e
trailing step in SetOfInstancesJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2812
diff
changeset
|
94 } |
|
ff0ed5ea9e4e
trailing step in SetOfInstancesJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2812
diff
changeset
|
95 |
|
ff0ed5ea9e4e
trailing step in SetOfInstancesJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2812
diff
changeset
|
96 |
| 2603 | 97 DicomModalityStoreJob::DicomModalityStoreJob(ServerContext& context) : |
| 98 context_(context), | |
| 99 localAet_("ORTHANC"), | |
| 100 moveOriginatorId_(0) // By default, not a C-MOVE | |
| 101 { | |
| 102 } | |
| 103 | |
| 104 | |
| 105 void DicomModalityStoreJob::SetLocalAet(const std::string& aet) | |
| 106 { | |
| 107 if (IsStarted()) | |
| 108 { | |
| 109 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 110 } | |
| 111 else | |
| 112 { | |
| 113 localAet_ = aet; | |
| 114 } | |
| 115 } | |
| 116 | |
| 117 | |
| 118 void DicomModalityStoreJob::SetRemoteModality(const RemoteModalityParameters& remote) | |
| 119 { | |
| 120 if (IsStarted()) | |
| 121 { | |
| 122 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 123 } | |
| 124 else | |
| 125 { | |
| 126 remote_ = remote; | |
| 127 } | |
| 128 } | |
| 129 | |
| 130 | |
| 131 const std::string& DicomModalityStoreJob::GetMoveOriginatorAet() const | |
| 132 { | |
| 133 if (HasMoveOriginator()) | |
| 134 { | |
| 135 return moveOriginatorAet_; | |
| 136 } | |
| 137 else | |
| 138 { | |
| 139 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 140 } | |
| 141 } | |
| 142 | |
| 143 | |
| 144 uint16_t DicomModalityStoreJob::GetMoveOriginatorId() const | |
| 145 { | |
| 146 if (HasMoveOriginator()) | |
| 147 { | |
| 148 return moveOriginatorId_; | |
| 149 } | |
| 150 else | |
| 151 { | |
| 152 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 153 } | |
| 154 } | |
| 155 | |
| 156 | |
| 157 void DicomModalityStoreJob::SetMoveOriginator(const std::string& aet, | |
| 158 int id) | |
| 159 { | |
| 160 if (IsStarted()) | |
| 161 { | |
| 162 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 163 } | |
| 164 else if (id < 0 || | |
| 165 id >= 65536) | |
| 166 { | |
| 167 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 168 } | |
| 169 else | |
| 170 { | |
| 171 moveOriginatorId_ = static_cast<uint16_t>(id); | |
| 172 moveOriginatorAet_ = aet; | |
| 173 } | |
| 174 } | |
| 175 | |
|
2812
ea7aea6f6a95
improved naming of methods in IJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2811
diff
changeset
|
176 void DicomModalityStoreJob::Stop(JobStopReason reason) // For pausing jobs |
| 2603 | 177 { |
| 178 connection_.reset(NULL); | |
| 179 } | |
| 180 | |
| 181 | |
| 182 void DicomModalityStoreJob::GetPublicContent(Json::Value& value) | |
| 183 { | |
|
2640
c691fcf66071
ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
184 SetOfInstancesJob::GetPublicContent(value); |
|
c691fcf66071
ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
185 |
| 2603 | 186 value["LocalAet"] = localAet_; |
| 187 value["RemoteAet"] = remote_.GetApplicationEntityTitle(); | |
| 188 | |
| 189 if (HasMoveOriginator()) | |
| 190 { | |
| 191 value["MoveOriginatorAET"] = GetMoveOriginatorAet(); | |
| 192 value["MoveOriginatorID"] = GetMoveOriginatorId(); | |
| 193 } | |
| 194 } | |
|
2664
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
195 |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
196 |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
197 static const char* LOCAL_AET = "LocalAet"; |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
198 static const char* REMOTE = "Remote"; |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
199 static const char* MOVE_ORIGINATOR_AET = "MoveOriginatorAet"; |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
200 static const char* MOVE_ORIGINATOR_ID = "MoveOriginatorId"; |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
201 |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
202 |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
203 DicomModalityStoreJob::DicomModalityStoreJob(ServerContext& context, |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
204 const Json::Value& serialized) : |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
205 SetOfInstancesJob(serialized), |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
206 context_(context) |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
207 { |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
208 localAet_ = SerializationToolbox::ReadString(serialized, LOCAL_AET); |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
209 remote_ = RemoteModalityParameters(serialized[REMOTE]); |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
210 moveOriginatorAet_ = SerializationToolbox::ReadString(serialized, MOVE_ORIGINATOR_AET); |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
211 moveOriginatorId_ = static_cast<uint16_t> |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
212 (SerializationToolbox::ReadUnsignedInteger(serialized, MOVE_ORIGINATOR_ID)); |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
213 } |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
214 |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
215 |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
216 bool DicomModalityStoreJob::Serialize(Json::Value& target) |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
217 { |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
218 if (!SetOfInstancesJob::Serialize(target)) |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
219 { |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
220 return false; |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
221 } |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
222 else |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
223 { |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
224 target[LOCAL_AET] = localAet_; |
|
2871
6eebc2eb3168
refactoring serialization of RemoteModalityParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2860
diff
changeset
|
225 remote_.Serialize(target[REMOTE], true /* force advanced format */); |
|
2664
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
226 target[MOVE_ORIGINATOR_AET] = moveOriginatorAet_; |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
227 target[MOVE_ORIGINATOR_ID] = moveOriginatorId_; |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
228 return true; |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
229 } |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
230 } |
| 2603 | 231 } |