Mercurial > hg > orthanc
comparison Core/JobsEngine/JobsRegistry.cpp @ 2656:a6d3e45eeff5 jobs
SerializationToolbox
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 05 Jun 2018 18:25:23 +0200 |
parents | c196d76cb8fa |
children | 228e2783ce83 |
comparison
equal
deleted
inserted
replaced
2655:c196d76cb8fa | 2656:a6d3e45eeff5 |
---|---|
35 #include "JobsRegistry.h" | 35 #include "JobsRegistry.h" |
36 | 36 |
37 #include "../Logging.h" | 37 #include "../Logging.h" |
38 #include "../OrthancException.h" | 38 #include "../OrthancException.h" |
39 #include "../Toolbox.h" | 39 #include "../Toolbox.h" |
40 #include "../SerializationToolbox.h" | |
40 | 41 |
41 namespace Orthanc | 42 namespace Orthanc |
42 { | 43 { |
43 class JobsRegistry::JobHandler : public boost::noncopyable | 44 class JobsRegistry::JobHandler : public boost::noncopyable |
44 { | 45 { |
263 const Json::Value& serialized) : | 264 const Json::Value& serialized) : |
264 lastStateChangeTime_(boost::posix_time::microsec_clock::universal_time()), | 265 lastStateChangeTime_(boost::posix_time::microsec_clock::universal_time()), |
265 pauseScheduled_(false), | 266 pauseScheduled_(false), |
266 cancelScheduled_(false) | 267 cancelScheduled_(false) |
267 { | 268 { |
268 id_ = StringToJobState(IJobUnserializer::ReadString(serialized, "ID")); | 269 id_ = StringToJobState(SerializationToolbox::ReadString(serialized, "ID")); |
269 state_ = StringToJobState(IJobUnserializer::ReadString(serialized, "State")); | 270 state_ = StringToJobState(SerializationToolbox::ReadString(serialized, "State")); |
270 priority_ = IJobUnserializer::ReadInteger(serialized, "Priority"); | 271 priority_ = SerializationToolbox::ReadInteger(serialized, "Priority"); |
271 creationTime_ = boost::posix_time::from_iso_string | 272 creationTime_ = boost::posix_time::from_iso_string |
272 (IJobUnserializer::ReadString(serialized, "CreationTime")); | 273 (SerializationToolbox::ReadString(serialized, "CreationTime")); |
273 runtime_ = boost::posix_time::milliseconds(IJobUnserializer::ReadInteger(serialized, "Runtime")); | 274 runtime_ = boost::posix_time::milliseconds(SerializationToolbox::ReadInteger(serialized, "Runtime")); |
274 | 275 |
275 retryTime_ = creationTime_; | 276 retryTime_ = creationTime_; |
276 | 277 |
277 if (state_ == JobState_Retry || | 278 if (state_ == JobState_Retry || |
278 state_ == JobState_Running) | 279 state_ == JobState_Running) |