Mercurial > hg > orthanc
annotate OrthancServer/ServerJobs/DicomMoveScuJob.cpp @ 3870:09798f2b985f transcoding
added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Wed, 29 Apr 2020 12:26:51 +0200 |
parents | 138d0dde41b5 |
children | 2effa961f67f |
rev | line source |
---|---|
2867 | 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:
3303
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
2867 | 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 "DicomMoveScuJob.h" | |
35 | |
36 #include "../../Core/SerializationToolbox.h" | |
3095
beeeb6096f27
removing dependencies upon ServerContext
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
37 #include "../ServerContext.h" |
2867 | 38 |
3303
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
39 static const char* const LOCAL_AET = "LocalAet"; |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
40 static const char* const TARGET_AET = "TargetAet"; |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
41 static const char* const REMOTE = "Remote"; |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
42 static const char* const QUERY = "Query"; |
3870
09798f2b985f
added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve
Alain Mazy <alain@mazy.be>
parents:
3843
diff
changeset
|
43 static const char* const TIMEOUT = "Timeout"; |
3303
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
44 |
2867 | 45 namespace Orthanc |
46 { | |
47 class DicomMoveScuJob::Command : public SetOfCommandsJob::ICommand | |
48 { | |
49 private: | |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
50 DicomMoveScuJob& that_; |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
51 std::unique_ptr<DicomMap> findAnswer_; |
2867 | 52 |
53 public: | |
54 Command(DicomMoveScuJob& that, | |
55 const DicomMap& findAnswer) : | |
56 that_(that), | |
57 findAnswer_(findAnswer.Clone()) | |
58 { | |
59 } | |
60 | |
3658
2d90dd30858c
providing job ID to the IJob::Step() methods
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
61 virtual bool Execute(const std::string& jobId) ORTHANC_OVERRIDE |
2867 | 62 { |
63 that_.Retrieve(*findAnswer_); | |
64 return true; | |
65 } | |
66 | |
3763
5ff5d5a0fd28
adding missing ORTHANC_OVERRIDE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
67 virtual void Serialize(Json::Value& target) const ORTHANC_OVERRIDE |
2867 | 68 { |
69 findAnswer_->Serialize(target); | |
70 } | |
71 }; | |
72 | |
73 | |
74 class DicomMoveScuJob::Unserializer : | |
75 public SetOfCommandsJob::ICommandUnserializer | |
76 { | |
77 private: | |
78 DicomMoveScuJob& that_; | |
79 | |
80 public: | |
81 Unserializer(DicomMoveScuJob& that) : | |
82 that_(that) | |
83 { | |
84 } | |
85 | |
86 virtual ICommand* Unserialize(const Json::Value& source) const | |
87 { | |
88 DicomMap findAnswer; | |
89 findAnswer.Unserialize(source); | |
90 return new Command(that_, findAnswer); | |
91 } | |
92 }; | |
93 | |
94 | |
95 | |
96 void DicomMoveScuJob::Retrieve(const DicomMap& findAnswer) | |
97 { | |
98 if (connection_.get() == NULL) | |
99 { | |
3843
138d0dde41b5
end of replacements of DicomUserConnection by DicomControlUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3763
diff
changeset
|
100 connection_.reset(new DicomControlUserConnection(localAet_, remote_)); |
2867 | 101 } |
102 | |
3870
09798f2b985f
added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve
Alain Mazy <alain@mazy.be>
parents:
3843
diff
changeset
|
103 if (timeout_ > -1) |
09798f2b985f
added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve
Alain Mazy <alain@mazy.be>
parents:
3843
diff
changeset
|
104 { |
09798f2b985f
added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve
Alain Mazy <alain@mazy.be>
parents:
3843
diff
changeset
|
105 connection_->SetTimeout(timeout_); |
09798f2b985f
added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve
Alain Mazy <alain@mazy.be>
parents:
3843
diff
changeset
|
106 } |
09798f2b985f
added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve
Alain Mazy <alain@mazy.be>
parents:
3843
diff
changeset
|
107 |
2867 | 108 connection_->Move(targetAet_, findAnswer); |
109 } | |
3303
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
110 |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
111 |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
112 static void AddTagIfString(Json::Value& target, |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
113 const DicomMap& answer, |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
114 const DicomTag& tag) |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
115 { |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
116 const DicomValue* value = answer.TestAndGetValue(tag); |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
117 if (value != NULL && |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
118 !value->IsNull() && |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
119 !value->IsBinary()) |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
120 { |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
121 target[tag.Format()] = value->GetContent(); |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
122 } |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
123 } |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
124 |
2867 | 125 |
126 void DicomMoveScuJob::AddFindAnswer(const DicomMap& answer) | |
127 { | |
3303
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
128 assert(query_.type() == Json::arrayValue); |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
129 |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
130 // Copy the identifiers tags, if they exist |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
131 Json::Value item = Json::objectValue; |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
132 AddTagIfString(item, answer, DICOM_TAG_QUERY_RETRIEVE_LEVEL); |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
133 AddTagIfString(item, answer, DICOM_TAG_PATIENT_ID); |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
134 AddTagIfString(item, answer, DICOM_TAG_STUDY_INSTANCE_UID); |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
135 AddTagIfString(item, answer, DICOM_TAG_SERIES_INSTANCE_UID); |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
136 AddTagIfString(item, answer, DICOM_TAG_SOP_INSTANCE_UID); |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
137 AddTagIfString(item, answer, DICOM_TAG_ACCESSION_NUMBER); |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
138 query_.append(item); |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
139 |
2867 | 140 AddCommand(new Command(*this, answer)); |
141 } | |
142 | |
143 | |
144 void DicomMoveScuJob::AddFindAnswer(QueryRetrieveHandler& query, | |
145 size_t i) | |
146 { | |
147 DicomMap answer; | |
148 query.GetAnswer(answer, i); | |
149 AddFindAnswer(answer); | |
150 } | |
151 | |
152 | |
153 void DicomMoveScuJob::SetLocalAet(const std::string& aet) | |
154 { | |
155 if (IsStarted()) | |
156 { | |
157 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
158 } | |
159 else | |
160 { | |
161 localAet_ = aet; | |
162 } | |
163 } | |
164 | |
165 | |
166 void DicomMoveScuJob::SetTargetAet(const std::string& aet) | |
167 { | |
168 if (IsStarted()) | |
169 { | |
170 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
171 } | |
172 else | |
173 { | |
174 targetAet_ = aet; | |
175 } | |
176 } | |
177 | |
178 | |
179 void DicomMoveScuJob::SetRemoteModality(const RemoteModalityParameters& remote) | |
180 { | |
181 if (IsStarted()) | |
182 { | |
183 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
184 } | |
185 else | |
186 { | |
187 remote_ = remote; | |
188 } | |
189 } | |
190 | |
191 | |
192 void DicomMoveScuJob::Stop(JobStopReason reason) | |
193 { | |
194 connection_.reset(); | |
195 } | |
196 | |
197 | |
198 void DicomMoveScuJob::GetPublicContent(Json::Value& value) | |
199 { | |
200 SetOfCommandsJob::GetPublicContent(value); | |
201 | |
202 value["LocalAet"] = localAet_; | |
203 value["RemoteAet"] = remote_.GetApplicationEntityTitle(); | |
3303
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
204 value["Query"] = query_; |
2867 | 205 } |
206 | |
207 | |
208 DicomMoveScuJob::DicomMoveScuJob(ServerContext& context, | |
209 const Json::Value& serialized) : | |
210 SetOfCommandsJob(new Unserializer(*this), serialized), | |
3303
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
211 context_(context), |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
212 query_(Json::arrayValue) |
2867 | 213 { |
214 localAet_ = SerializationToolbox::ReadString(serialized, LOCAL_AET); | |
215 targetAet_ = SerializationToolbox::ReadString(serialized, TARGET_AET); | |
216 remote_ = RemoteModalityParameters(serialized[REMOTE]); | |
3303
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
217 |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
218 if (serialized.isMember(QUERY) && |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
219 serialized[QUERY].type() == Json::arrayValue) |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
220 { |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
221 query_ = serialized[QUERY]; |
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
222 } |
3870
09798f2b985f
added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve
Alain Mazy <alain@mazy.be>
parents:
3843
diff
changeset
|
223 |
09798f2b985f
added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve
Alain Mazy <alain@mazy.be>
parents:
3843
diff
changeset
|
224 // New in Orthanc in 1.7.0 |
09798f2b985f
added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve
Alain Mazy <alain@mazy.be>
parents:
3843
diff
changeset
|
225 timeout_ = SerializationToolbox::ReadInteger(serialized, TIMEOUT, -1); |
2867 | 226 } |
227 | |
228 | |
229 bool DicomMoveScuJob::Serialize(Json::Value& target) | |
230 { | |
231 if (!SetOfCommandsJob::Serialize(target)) | |
232 { | |
233 return false; | |
234 } | |
235 else | |
236 { | |
237 target[LOCAL_AET] = localAet_; | |
238 target[TARGET_AET] = targetAet_; | |
3303
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
239 target[QUERY] = query_; |
3870
09798f2b985f
added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve
Alain Mazy <alain@mazy.be>
parents:
3843
diff
changeset
|
240 target[TIMEOUT] = timeout_; |
2871
6eebc2eb3168
refactoring serialization of RemoteModalityParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2867
diff
changeset
|
241 remote_.Serialize(target[REMOTE], true /* force advanced format */); |
2867 | 242 return true; |
243 } | |
244 } | |
245 } |