Mercurial > hg > orthanc

comparison OrthancServer/ServerJobs/DicomModalityStoreJob.cpp @ 2664:a21b244efb37 jobs

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 07 Jun 2018 21:37:40 +0200
parents c691fcf66071
children 7cfc8d266f41
comparison
equal deleted inserted replaced
2663:228e2783ce83 2664:a21b244efb37
33 33
34 #include "../PrecompiledHeadersServer.h" 34 #include "../PrecompiledHeadersServer.h"
35 #include "DicomModalityStoreJob.h" 35 #include "DicomModalityStoreJob.h"
36 36
37 #include "../../Core/Logging.h" 37 #include "../../Core/Logging.h"
38 #include "../../Core/SerializationToolbox.h"
38 39
39 namespace Orthanc 40 namespace Orthanc
40 { 41 {
41 void DicomModalityStoreJob::OpenConnection() 42 void DicomModalityStoreJob::OpenConnection()
42 { 43 {
180 { 181 {
181 value["MoveOriginatorAET"] = GetMoveOriginatorAet(); 182 value["MoveOriginatorAET"] = GetMoveOriginatorAet();
182 value["MoveOriginatorID"] = GetMoveOriginatorId(); 183 value["MoveOriginatorID"] = GetMoveOriginatorId();
183 } 184 }
184 } 185 }
186
187
188 static const char* LOCAL_AET = "LocalAet";
189 static const char* REMOTE = "Remote";
190 static const char* MOVE_ORIGINATOR_AET = "MoveOriginatorAet";
191 static const char* MOVE_ORIGINATOR_ID = "MoveOriginatorId";
192
193
194 DicomModalityStoreJob::DicomModalityStoreJob(ServerContext& context,
195 const Json::Value& serialized) :
196 SetOfInstancesJob(serialized),
197 context_(context)
198 {
199 localAet_ = SerializationToolbox::ReadString(serialized, LOCAL_AET);
200 remote_ = RemoteModalityParameters(serialized[REMOTE]);
201 moveOriginatorAet_ = SerializationToolbox::ReadString(serialized, MOVE_ORIGINATOR_AET);
202 moveOriginatorId_ = static_cast<uint16_t>
203 (SerializationToolbox::ReadUnsignedInteger(serialized, MOVE_ORIGINATOR_ID));
204 }
205
206
207 bool DicomModalityStoreJob::Serialize(Json::Value& target)
208 {
209 if (!SetOfInstancesJob::Serialize(target))
210 {
211 return false;
212 }
213 else
214 {
215 target[LOCAL_AET] = localAet_;
216 remote_.Serialize(target[REMOTE]);
217 target[MOVE_ORIGINATOR_AET] = moveOriginatorAet_;
218 target[MOVE_ORIGINATOR_ID] = moveOriginatorId_;
219 return true;
220 }
221 }
185 } 222 }