Mercurial > hg > orthanc
diff Core/JobsEngine/SetOfInstancesJob.cpp @ 2656:a6d3e45eeff5 jobs
SerializationToolbox
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 05 Jun 2018 18:25:23 +0200 |
parents | c196d76cb8fa |
children | 5eea2f11e8df |
line wrap: on
line diff
--- a/Core/JobsEngine/SetOfInstancesJob.cpp Tue Jun 05 17:57:49 2018 +0200 +++ b/Core/JobsEngine/SetOfInstancesJob.cpp Tue Jun 05 18:25:23 2018 +0200 @@ -35,7 +35,7 @@ #include "SetOfInstancesJob.h" #include "../OrthancException.h" -#include "IJobUnserializer.h" +#include "../SerializationToolbox.h" namespace Orthanc { @@ -198,41 +198,24 @@ value["Permissive"] = permissive_; value["Position"] = static_cast<unsigned int>(position_); value["Description"] = description_; - - Json::Value v = Json::arrayValue; - - for (size_t i = 0; i < instances_.size(); i++) - { - v.append(instances_[i]); - } - value["Instances"] = v; - - v = Json::arrayValue; - - for (std::set<std::string>::const_iterator it = failedInstances_.begin(); - it != failedInstances_.end(); ++it) - { - v.append(*it); - } - - value["FailedInstances"] = v; + SerializationToolbox::WriteArrayOfStrings(value, instances_, "Instances"); + SerializationToolbox::WriteSetOfStrings(value, failedInstances_, "FailedInstances"); } SetOfInstancesJob::SetOfInstancesJob(const Json::Value& value) : started_(false), - permissive_(IJobUnserializer::ReadBoolean(value, "Permissive")), - position_(IJobUnserializer::ReadUnsignedInteger(value, "Position")), - description_(IJobUnserializer::ReadString(value, "Description")) + permissive_(SerializationToolbox::ReadBoolean(value, "Permissive")), + position_(SerializationToolbox::ReadUnsignedInteger(value, "Position")), + description_(SerializationToolbox::ReadString(value, "Description")) { - IJobUnserializer::ReadArrayOfStrings(instances_, value, "Instances"); - IJobUnserializer::ReadSetOfStrings(failedInstances_, value, "FailedInstances"); + SerializationToolbox::ReadArrayOfStrings(instances_, value, "Instances"); + SerializationToolbox::ReadSetOfStrings(failedInstances_, value, "FailedInstances"); if (position_ > instances_.size()) { throw OrthancException(ErrorCode_BadFileFormat); } } - }