comparison 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
comparison
equal deleted inserted replaced
2655:c196d76cb8fa 2656:a6d3e45eeff5
33 33
34 #include "../PrecompiledHeaders.h" 34 #include "../PrecompiledHeaders.h"
35 #include "SetOfInstancesJob.h" 35 #include "SetOfInstancesJob.h"
36 36
37 #include "../OrthancException.h" 37 #include "../OrthancException.h"
38 #include "IJobUnserializer.h" 38 #include "../SerializationToolbox.h"
39 39
40 namespace Orthanc 40 namespace Orthanc
41 { 41 {
42 SetOfInstancesJob::SetOfInstancesJob() : 42 SetOfInstancesJob::SetOfInstancesJob() :
43 started_(false), 43 started_(false),
196 value["Type"] = type; 196 value["Type"] = type;
197 197
198 value["Permissive"] = permissive_; 198 value["Permissive"] = permissive_;
199 value["Position"] = static_cast<unsigned int>(position_); 199 value["Position"] = static_cast<unsigned int>(position_);
200 value["Description"] = description_; 200 value["Description"] = description_;
201 201
202 Json::Value v = Json::arrayValue; 202 SerializationToolbox::WriteArrayOfStrings(value, instances_, "Instances");
203 203 SerializationToolbox::WriteSetOfStrings(value, failedInstances_, "FailedInstances");
204 for (size_t i = 0; i < instances_.size(); i++)
205 {
206 v.append(instances_[i]);
207 }
208
209 value["Instances"] = v;
210
211 v = Json::arrayValue;
212
213 for (std::set<std::string>::const_iterator it = failedInstances_.begin();
214 it != failedInstances_.end(); ++it)
215 {
216 v.append(*it);
217 }
218
219 value["FailedInstances"] = v;
220 } 204 }
221 205
222 206
223 SetOfInstancesJob::SetOfInstancesJob(const Json::Value& value) : 207 SetOfInstancesJob::SetOfInstancesJob(const Json::Value& value) :
224 started_(false), 208 started_(false),
225 permissive_(IJobUnserializer::ReadBoolean(value, "Permissive")), 209 permissive_(SerializationToolbox::ReadBoolean(value, "Permissive")),
226 position_(IJobUnserializer::ReadUnsignedInteger(value, "Position")), 210 position_(SerializationToolbox::ReadUnsignedInteger(value, "Position")),
227 description_(IJobUnserializer::ReadString(value, "Description")) 211 description_(SerializationToolbox::ReadString(value, "Description"))
228 { 212 {
229 IJobUnserializer::ReadArrayOfStrings(instances_, value, "Instances"); 213 SerializationToolbox::ReadArrayOfStrings(instances_, value, "Instances");
230 IJobUnserializer::ReadSetOfStrings(failedInstances_, value, "FailedInstances"); 214 SerializationToolbox::ReadSetOfStrings(failedInstances_, value, "FailedInstances");
231 215
232 if (position_ > instances_.size()) 216 if (position_ > instances_.size())
233 { 217 {
234 throw OrthancException(ErrorCode_BadFileFormat); 218 throw OrthancException(ErrorCode_BadFileFormat);
235 } 219 }
236 } 220 }
237
238 } 221 }