Mercurial > hg > orthanc
annotate OrthancServer/ServerJobs/DicomModalityStoreJob.cpp @ 3507:69e49fc044f8
Fix generation of "SOP Instance UID" on split and merge
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 28 Aug 2019 16:54:00 +0200 |
| parents | beeeb6096f27 |
| children | 94f4a18a79cc |
| 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 | |
|
3060
4e43e67f8ecf
preparing for 2019
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2871
diff
changeset
|
5 * Copyright (C) 2017-2019 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 | |
| 37 #include "../../Core/Logging.h" | |
|
2664
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
38 #include "../../Core/SerializationToolbox.h" |
|
3095
beeeb6096f27
removing dependencies upon ServerContext
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
39 #include "../ServerContext.h" |
|
beeeb6096f27
removing dependencies upon ServerContext
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
40 |
| 2603 | 41 |
| 42 namespace Orthanc | |
| 43 { | |
| 44 void DicomModalityStoreJob::OpenConnection() | |
| 45 { | |
| 46 if (connection_.get() == NULL) | |
| 47 { | |
| 48 connection_.reset(new DicomUserConnection); | |
| 49 connection_->SetLocalApplicationEntityTitle(localAet_); | |
| 50 connection_->SetRemoteModality(remote_); | |
| 51 } | |
| 52 } | |
| 53 | |
| 54 | |
| 55 bool DicomModalityStoreJob::HandleInstance(const std::string& instance) | |
| 56 { | |
|
2640
c691fcf66071
ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
57 assert(IsStarted()); |
| 2603 | 58 OpenConnection(); |
| 59 | |
| 60 LOG(INFO) << "Sending instance " << instance << " to modality \"" | |
| 61 << remote_.GetApplicationEntityTitle() << "\""; | |
| 62 | |
| 63 std::string dicom; | |
|
2624
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
64 |
|
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
65 try |
|
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
66 { |
|
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
67 context_.ReadDicom(dicom, instance); |
|
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
68 } |
|
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
69 catch (OrthancException& e) |
|
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
70 { |
|
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
71 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
|
72 return false; |
|
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
73 } |
| 2603 | 74 |
| 75 if (HasMoveOriginator()) | |
| 76 { | |
| 77 connection_->Store(dicom, moveOriginatorAet_, moveOriginatorId_); | |
| 78 } | |
| 79 else | |
| 80 { | |
| 81 connection_->Store(dicom); | |
| 82 } | |
| 83 | |
| 84 //boost::this_thread::sleep(boost::posix_time::milliseconds(500)); | |
| 85 | |
| 86 return true; | |
| 87 } | |
| 88 | |
| 89 | |
|
2842
ff0ed5ea9e4e
trailing step in SetOfInstancesJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2812
diff
changeset
|
90 bool DicomModalityStoreJob::HandleTrailingStep() |
|
ff0ed5ea9e4e
trailing step in SetOfInstancesJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2812
diff
changeset
|
91 { |
|
ff0ed5ea9e4e
trailing step in SetOfInstancesJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2812
diff
changeset
|
92 throw OrthancException(ErrorCode_InternalError); |
|
ff0ed5ea9e4e
trailing step in SetOfInstancesJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2812
diff
changeset
|
93 } |
|
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 |
| 2603 | 96 DicomModalityStoreJob::DicomModalityStoreJob(ServerContext& context) : |
| 97 context_(context), | |
| 98 localAet_("ORTHANC"), | |
| 99 moveOriginatorId_(0) // By default, not a C-MOVE | |
| 100 { | |
| 101 } | |
| 102 | |
| 103 | |
| 104 void DicomModalityStoreJob::SetLocalAet(const std::string& aet) | |
| 105 { | |
| 106 if (IsStarted()) | |
| 107 { | |
| 108 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 109 } | |
| 110 else | |
| 111 { | |
| 112 localAet_ = aet; | |
| 113 } | |
| 114 } | |
| 115 | |
| 116 | |
| 117 void DicomModalityStoreJob::SetRemoteModality(const RemoteModalityParameters& remote) | |
| 118 { | |
| 119 if (IsStarted()) | |
| 120 { | |
| 121 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 122 } | |
| 123 else | |
| 124 { | |
| 125 remote_ = remote; | |
| 126 } | |
| 127 } | |
| 128 | |
| 129 | |
| 130 const std::string& DicomModalityStoreJob::GetMoveOriginatorAet() const | |
| 131 { | |
| 132 if (HasMoveOriginator()) | |
| 133 { | |
| 134 return moveOriginatorAet_; | |
| 135 } | |
| 136 else | |
| 137 { | |
| 138 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 139 } | |
| 140 } | |
| 141 | |
| 142 | |
| 143 uint16_t DicomModalityStoreJob::GetMoveOriginatorId() const | |
| 144 { | |
| 145 if (HasMoveOriginator()) | |
| 146 { | |
| 147 return moveOriginatorId_; | |
| 148 } | |
| 149 else | |
| 150 { | |
| 151 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 152 } | |
| 153 } | |
| 154 | |
| 155 | |
| 156 void DicomModalityStoreJob::SetMoveOriginator(const std::string& aet, | |
| 157 int id) | |
| 158 { | |
| 159 if (IsStarted()) | |
| 160 { | |
| 161 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 162 } | |
| 163 else if (id < 0 || | |
| 164 id >= 65536) | |
| 165 { | |
| 166 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 167 } | |
| 168 else | |
| 169 { | |
| 170 moveOriginatorId_ = static_cast<uint16_t>(id); | |
| 171 moveOriginatorAet_ = aet; | |
| 172 } | |
| 173 } | |
| 174 | |
|
2812
ea7aea6f6a95
improved naming of methods in IJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2811
diff
changeset
|
175 void DicomModalityStoreJob::Stop(JobStopReason reason) // For pausing jobs |
| 2603 | 176 { |
| 177 connection_.reset(NULL); | |
| 178 } | |
| 179 | |
| 180 | |
| 181 void DicomModalityStoreJob::GetPublicContent(Json::Value& value) | |
| 182 { | |
|
2640
c691fcf66071
ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
183 SetOfInstancesJob::GetPublicContent(value); |
|
c691fcf66071
ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
184 |
| 2603 | 185 value["LocalAet"] = localAet_; |
| 186 value["RemoteAet"] = remote_.GetApplicationEntityTitle(); | |
| 187 | |
| 188 if (HasMoveOriginator()) | |
| 189 { | |
| 190 value["MoveOriginatorAET"] = GetMoveOriginatorAet(); | |
| 191 value["MoveOriginatorID"] = GetMoveOriginatorId(); | |
| 192 } | |
| 193 } | |
|
2664
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
194 |
|
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 static const char* LOCAL_AET = "LocalAet"; |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
197 static const char* REMOTE = "Remote"; |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
198 static const char* MOVE_ORIGINATOR_AET = "MoveOriginatorAet"; |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
199 static const char* MOVE_ORIGINATOR_ID = "MoveOriginatorId"; |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
200 |
|
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 DicomModalityStoreJob::DicomModalityStoreJob(ServerContext& context, |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
203 const Json::Value& serialized) : |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
204 SetOfInstancesJob(serialized), |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
205 context_(context) |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
206 { |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
207 localAet_ = SerializationToolbox::ReadString(serialized, LOCAL_AET); |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
208 remote_ = RemoteModalityParameters(serialized[REMOTE]); |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
209 moveOriginatorAet_ = SerializationToolbox::ReadString(serialized, MOVE_ORIGINATOR_AET); |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
210 moveOriginatorId_ = static_cast<uint16_t> |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
211 (SerializationToolbox::ReadUnsignedInteger(serialized, MOVE_ORIGINATOR_ID)); |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
212 } |
|
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 bool DicomModalityStoreJob::Serialize(Json::Value& target) |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
216 { |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
217 if (!SetOfInstancesJob::Serialize(target)) |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
218 { |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
219 return false; |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
220 } |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
221 else |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
222 { |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
223 target[LOCAL_AET] = localAet_; |
|
2871
6eebc2eb3168
refactoring serialization of RemoteModalityParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2860
diff
changeset
|
224 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
|
225 target[MOVE_ORIGINATOR_AET] = moveOriginatorAet_; |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
226 target[MOVE_ORIGINATOR_ID] = moveOriginatorId_; |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
227 return true; |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
228 } |
|
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2640
diff
changeset
|
229 } |
| 2603 | 230 } |