Mercurial > hg > orthanc
annotate OrthancServer/ServerJobs/ResourceModificationJob.cpp @ 2860:8b00e4cb4a6b
SetOfCommandsJob
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 05 Oct 2018 16:07:34 +0200 |
parents | ff0ed5ea9e4e |
children | abce036683cd |
rev | line source |
---|---|
2642 | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | |
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
4 * Department, University Hospital of Liege, Belgium | |
5 * Copyright (C) 2017-2018 Osimis S.A., Belgium | |
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 "ResourceModificationJob.h" | |
36 | |
37 #include "../../Core/Logging.h" | |
2664
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
38 #include "../../Core/SerializationToolbox.h" |
2642 | 39 |
40 namespace Orthanc | |
41 { | |
42 ResourceModificationJob::Output::Output(ResourceType level) : | |
43 level_(level), | |
44 isFirst_(true) | |
45 { | |
46 if (level_ != ResourceType_Patient && | |
47 level_ != ResourceType_Study && | |
48 level_ != ResourceType_Series) | |
49 { | |
50 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
51 } | |
52 } | |
53 | |
54 | |
55 void ResourceModificationJob::Output::Update(DicomInstanceHasher& hasher) | |
56 { | |
57 boost::mutex::scoped_lock lock(mutex_); | |
58 | |
59 if (isFirst_) | |
60 { | |
61 switch (level_) | |
62 { | |
63 case ResourceType_Series: | |
64 id_ = hasher.HashSeries(); | |
65 break; | |
66 | |
67 case ResourceType_Study: | |
68 id_ = hasher.HashStudy(); | |
69 break; | |
70 | |
71 case ResourceType_Patient: | |
72 id_ = hasher.HashPatient(); | |
73 break; | |
74 | |
75 default: | |
76 throw OrthancException(ErrorCode_InternalError); | |
77 } | |
78 | |
79 patientId_ = hasher.HashPatient(); | |
80 isFirst_ = false; | |
81 } | |
82 } | |
83 | |
84 | |
85 bool ResourceModificationJob::Output::Format(Json::Value& target) | |
86 { | |
87 boost::mutex::scoped_lock lock(mutex_); | |
88 | |
89 if (isFirst_) | |
90 { | |
91 return false; | |
92 } | |
93 else | |
94 { | |
95 target = Json::objectValue; | |
96 target["Type"] = EnumerationToString(level_); | |
97 target["ID"] = id_; | |
98 target["Path"] = GetBasePath(level_, id_); | |
99 target["PatientID"] = patientId_; | |
100 return true; | |
101 } | |
102 } | |
103 | |
104 | |
105 bool ResourceModificationJob::Output::GetIdentifier(std::string& id) | |
106 { | |
107 boost::mutex::scoped_lock lock(mutex_); | |
108 | |
109 if (isFirst_) | |
110 { | |
111 return false; | |
112 } | |
113 else | |
114 { | |
115 id = id_; | |
116 return true; | |
117 } | |
118 } | |
119 | |
120 | |
121 bool ResourceModificationJob::HandleInstance(const std::string& instance) | |
122 { | |
123 if (modification_.get() == NULL) | |
124 { | |
125 LOG(ERROR) << "No modification was provided for this job"; | |
126 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
127 } | |
128 | |
129 | |
130 LOG(INFO) << "Modifying instance in a job: " << instance; | |
131 | |
2825
8aa6aef11b70
New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2664
diff
changeset
|
132 |
8aa6aef11b70
New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2664
diff
changeset
|
133 /** |
8aa6aef11b70
New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2664
diff
changeset
|
134 * Retrieve the original instance from the DICOM cache. |
8aa6aef11b70
New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2664
diff
changeset
|
135 **/ |
8aa6aef11b70
New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2664
diff
changeset
|
136 |
8aa6aef11b70
New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2664
diff
changeset
|
137 std::auto_ptr<DicomInstanceHasher> originalHasher; |
8aa6aef11b70
New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2664
diff
changeset
|
138 std::auto_ptr<ParsedDicomFile> modified; |
2642 | 139 |
140 try | |
141 { | |
2825
8aa6aef11b70
New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2664
diff
changeset
|
142 ServerContext::DicomCacheLocker locker(context_, instance); |
8aa6aef11b70
New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2664
diff
changeset
|
143 ParsedDicomFile& original = locker.GetDicom(); |
8aa6aef11b70
New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2664
diff
changeset
|
144 |
8aa6aef11b70
New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2664
diff
changeset
|
145 originalHasher.reset(new DicomInstanceHasher(original.GetHasher())); |
8aa6aef11b70
New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2664
diff
changeset
|
146 modified.reset(original.Clone(true)); |
2642 | 147 } |
148 catch (OrthancException&) | |
149 { | |
150 LOG(WARNING) << "An instance was removed after the job was issued: " << instance; | |
151 return false; | |
152 } | |
153 | |
154 | |
155 /** | |
156 * Compute the resulting DICOM instance. | |
157 **/ | |
158 | |
159 modification_->Apply(*modified); | |
160 | |
161 DicomInstanceToStore toStore; | |
162 toStore.SetOrigin(origin_); | |
163 toStore.SetParsedDicomFile(*modified); | |
164 | |
165 | |
166 /** | |
167 * Prepare the metadata information to associate with the | |
168 * resulting DICOM instance (AnonymizedFrom/ModifiedFrom). | |
169 **/ | |
170 | |
171 DicomInstanceHasher modifiedHasher = modified->GetHasher(); | |
172 | |
173 MetadataType metadataType = (isAnonymization_ ? | |
174 MetadataType_AnonymizedFrom : | |
175 MetadataType_ModifiedFrom); | |
176 | |
2825
8aa6aef11b70
New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2664
diff
changeset
|
177 if (originalHasher->HashSeries() != modifiedHasher.HashSeries()) |
2642 | 178 { |
2825
8aa6aef11b70
New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2664
diff
changeset
|
179 toStore.AddMetadata(ResourceType_Series, metadataType, originalHasher->HashSeries()); |
2642 | 180 } |
181 | |
2825
8aa6aef11b70
New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2664
diff
changeset
|
182 if (originalHasher->HashStudy() != modifiedHasher.HashStudy()) |
2642 | 183 { |
2825
8aa6aef11b70
New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2664
diff
changeset
|
184 toStore.AddMetadata(ResourceType_Study, metadataType, originalHasher->HashStudy()); |
2642 | 185 } |
186 | |
2825
8aa6aef11b70
New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2664
diff
changeset
|
187 if (originalHasher->HashPatient() != modifiedHasher.HashPatient()) |
2642 | 188 { |
2825
8aa6aef11b70
New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2664
diff
changeset
|
189 toStore.AddMetadata(ResourceType_Patient, metadataType, originalHasher->HashPatient()); |
2642 | 190 } |
191 | |
2825
8aa6aef11b70
New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2664
diff
changeset
|
192 assert(instance == originalHasher->HashInstance()); |
2642 | 193 toStore.AddMetadata(ResourceType_Instance, metadataType, instance); |
194 | |
195 | |
196 /** | |
197 * Store the resulting DICOM instance into the Orthanc store. | |
198 **/ | |
199 | |
200 std::string modifiedInstance; | |
201 if (context_.Store(modifiedInstance, toStore) != StoreStatus_Success) | |
202 { | |
203 LOG(ERROR) << "Error while storing a modified instance " << instance; | |
204 throw OrthancException(ErrorCode_CannotStoreInstance); | |
205 } | |
206 | |
207 // Sanity checks in debug mode | |
208 assert(modifiedInstance == modifiedHasher.HashInstance()); | |
209 | |
210 | |
211 if (output_.get() != NULL) | |
212 { | |
213 output_->Update(modifiedHasher); | |
214 } | |
215 | |
216 return true; | |
217 } | |
218 | |
219 | |
2842
ff0ed5ea9e4e
trailing step in SetOfInstancesJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2825
diff
changeset
|
220 bool ResourceModificationJob::HandleTrailingStep() |
ff0ed5ea9e4e
trailing step in SetOfInstancesJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2825
diff
changeset
|
221 { |
ff0ed5ea9e4e
trailing step in SetOfInstancesJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2825
diff
changeset
|
222 throw OrthancException(ErrorCode_InternalError); |
ff0ed5ea9e4e
trailing step in SetOfInstancesJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2825
diff
changeset
|
223 } |
ff0ed5ea9e4e
trailing step in SetOfInstancesJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2825
diff
changeset
|
224 |
ff0ed5ea9e4e
trailing step in SetOfInstancesJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2825
diff
changeset
|
225 |
2642 | 226 void ResourceModificationJob::SetModification(DicomModification* modification, |
227 bool isAnonymization) | |
228 { | |
229 if (modification == NULL) | |
230 { | |
231 throw OrthancException(ErrorCode_NullPointer); | |
232 } | |
233 else if (IsStarted()) | |
234 { | |
235 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
236 } | |
237 else | |
238 { | |
239 modification_.reset(modification); | |
240 isAnonymization_ = isAnonymization; | |
241 } | |
242 } | |
243 | |
244 | |
245 void ResourceModificationJob::SetOutput(boost::shared_ptr<Output>& output) | |
246 { | |
247 if (IsStarted()) | |
248 { | |
249 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
250 } | |
251 else | |
252 { | |
253 output_ = output; | |
254 } | |
255 } | |
256 | |
257 | |
258 void ResourceModificationJob::SetOrigin(const DicomInstanceOrigin& origin) | |
259 { | |
260 if (IsStarted()) | |
261 { | |
262 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
263 } | |
264 else | |
265 { | |
266 origin_ = origin; | |
267 } | |
268 } | |
269 | |
270 | |
271 void ResourceModificationJob::SetOrigin(const RestApiCall& call) | |
272 { | |
2664
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
273 SetOrigin(DicomInstanceOrigin::FromRest(call)); |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
274 } |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
275 |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
276 |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
277 const DicomModification& ResourceModificationJob::GetModification() const |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
278 { |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
279 if (modification_.get() == NULL) |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
280 { |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
281 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
282 } |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
283 else |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
284 { |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
285 return *modification_; |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
286 } |
2642 | 287 } |
288 | |
289 | |
290 void ResourceModificationJob::GetPublicContent(Json::Value& value) | |
291 { | |
292 SetOfInstancesJob::GetPublicContent(value); | |
293 | |
294 value["IsAnonymization"] = isAnonymization_; | |
295 } | |
296 | |
2664
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
297 |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
298 static const char* MODIFICATION = "Modification"; |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
299 static const char* ORIGIN = "Origin"; |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
300 static const char* IS_ANONYMIZATION = "IsAnonymization"; |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
301 |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
302 |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
303 ResourceModificationJob::ResourceModificationJob(ServerContext& context, |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
304 const Json::Value& serialized) : |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
305 SetOfInstancesJob(serialized), |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
306 context_(context) |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
307 { |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
308 isAnonymization_ = SerializationToolbox::ReadBoolean(serialized, IS_ANONYMIZATION); |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
309 origin_ = DicomInstanceOrigin(serialized[ORIGIN]); |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
310 modification_.reset(new DicomModification(serialized[MODIFICATION])); |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
311 } |
2642 | 312 |
2663
228e2783ce83
some jobs might not be serializable
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2648
diff
changeset
|
313 bool ResourceModificationJob::Serialize(Json::Value& value) |
2642 | 314 { |
2664
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
315 if (!SetOfInstancesJob::Serialize(value)) |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
316 { |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
317 return false; |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
318 } |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
319 else |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
320 { |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
321 value[IS_ANONYMIZATION] = isAnonymization_; |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
322 origin_.Serialize(value[ORIGIN]); |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
323 |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
324 Json::Value tmp; |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
325 modification_->Serialize(tmp); |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
326 value[MODIFICATION] = tmp; |
2642 | 327 |
2664
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
328 return true; |
a21b244efb37
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
329 } |
2642 | 330 } |
331 } |