Mercurial > hg > orthanc

changeset 2670:c5646f766b3e jobs

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
serialize jobs as an object
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 09 Jun 2018 14:23:54 +0200
parents eaf10085ffa1
children 06c0a6b8a871
files Core/JobsEngine/JobsRegistry.cpp
diffstat 1 files changed, 11 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Core/JobsEngine/JobsRegistry.cpp	Sat Jun 09 14:15:32 2018 +0200
+++ b/Core/JobsEngine/JobsRegistry.cpp	Sat Jun 09 14:23:54 2018 +0200
@@ -41,7 +41,6 @@
 
 namespace Orthanc
 {
-  static const char* ID = "ID";
   static const char* STATE = "State";
   static const char* TYPE = "Type";
   static const char* PRIORITY = "Priority";
@@ -284,7 +283,6 @@
 
       if (ok)
       {
-        target[ID] = id_;
         target[STATE] = EnumerationToString(state_);
         target[PRIORITY] = priority_;
         target[CREATION_TIME] = boost::posix_time::to_iso_string(creationTime_);
@@ -300,11 +298,12 @@
     }
 
     JobHandler(IJobUnserializer& unserializer,
-               const Json::Value& serialized) :
+               const Json::Value& serialized,
+               const std::string& id) :
+      id_(id),
       pauseScheduled_(false),
       cancelScheduled_(false)
     {
-      id_ = SerializationToolbox::ReadString(serialized, ID);
       state_ = StringToJobState(SerializationToolbox::ReadString(serialized, STATE));
       priority_ = SerializationToolbox::ReadInteger(serialized, PRIORITY);
       creationTime_ = boost::posix_time::from_iso_string
@@ -1231,7 +1230,7 @@
     target = Json::objectValue;
     target[TYPE] = JOBS_REGISTRY;
     target[MAX_COMPLETED_JOBS] = static_cast<unsigned int>(maxCompletedJobs_);
-    target[JOBS] = Json::arrayValue;
+    target[JOBS] = Json::objectValue;
     
     for (JobsIndex::const_iterator it = jobsIndex_.begin(); 
          it != jobsIndex_.end(); ++it)
@@ -1239,7 +1238,7 @@
       Json::Value v;
       if (it->second->Serialize(v))
       {
-        target[JOBS].append(v);
+        target[JOBS][it->first] = v;
       }
     }
   }
@@ -1250,16 +1249,19 @@
   {
     if (SerializationToolbox::ReadString(s, TYPE) != JOBS_REGISTRY ||
         !s.isMember(JOBS) ||
-        s[JOBS].type() != Json::arrayValue)
+        s[JOBS].type() != Json::objectValue)
     {
       throw OrthancException(ErrorCode_BadFileFormat);
     }
 
     maxCompletedJobs_ = SerializationToolbox::ReadUnsignedInteger(s, MAX_COMPLETED_JOBS);
 
-    for (Json::Value::ArrayIndex i = 0; i < s[JOBS].size(); i++)
+    Json::Value::Members members = s[JOBS].getMemberNames();
+
+    for (Json::Value::Members::const_iterator it = members.begin();
+         it != members.end(); ++it)
     {
-      std::auto_ptr<JobHandler> job(new JobHandler(unserializer, s[JOBS][i]));
+      std::auto_ptr<JobHandler> job(new JobHandler(unserializer, s[JOBS][*it], *it));
       
       std::string id;
       SubmitInternal(id, job.release(), true);