Mercurial > hg > orthanc
comparison Core/JobsEngine/SetOfInstancesJob.cpp @ 3374:d0d6bd633e4c
Reporting of "ParentResources" in "DicomModalityStore" and "DicomModalityStore" jobs
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 14 May 2019 16:38:02 +0200 |
parents | 4e43e67f8ecf |
children | 94f4a18a79cc |
comparison
equal
deleted
inserted
replaced
3371:fe73717105b6 | 3374:d0d6bd633e4c |
---|---|
191 | 191 |
192 failedInstances_.clear(); | 192 failedInstances_.clear(); |
193 } | 193 } |
194 | 194 |
195 | 195 |
196 static const char* KEY_TRAILING_STEP = "TrailingStep"; | |
197 static const char* KEY_FAILED_INSTANCES = "FailedInstances"; | |
198 static const char* KEY_PARENT_RESOURCES = "ParentResources"; | |
199 | |
196 void SetOfInstancesJob::GetPublicContent(Json::Value& target) | 200 void SetOfInstancesJob::GetPublicContent(Json::Value& target) |
197 { | 201 { |
198 SetOfCommandsJob::GetPublicContent(target); | 202 SetOfCommandsJob::GetPublicContent(target); |
199 target["InstancesCount"] = static_cast<uint32_t>(GetInstancesCount()); | 203 target["InstancesCount"] = static_cast<uint32_t>(GetInstancesCount()); |
200 target["FailedInstancesCount"] = static_cast<uint32_t>(failedInstances_.size()); | 204 target["FailedInstancesCount"] = static_cast<uint32_t>(failedInstances_.size()); |
201 } | 205 |
202 | 206 if (!parentResources_.empty()) |
203 | 207 { |
204 | 208 SerializationToolbox::WriteSetOfStrings(target, parentResources_, KEY_PARENT_RESOURCES); |
205 static const char* KEY_TRAILING_STEP = "TrailingStep"; | 209 } |
206 static const char* KEY_FAILED_INSTANCES = "FailedInstances"; | 210 } |
211 | |
207 | 212 |
208 bool SetOfInstancesJob::Serialize(Json::Value& target) | 213 bool SetOfInstancesJob::Serialize(Json::Value& target) |
209 { | 214 { |
210 if (SetOfCommandsJob::Serialize(target)) | 215 if (SetOfCommandsJob::Serialize(target)) |
211 { | 216 { |
212 target[KEY_TRAILING_STEP] = hasTrailingStep_; | 217 target[KEY_TRAILING_STEP] = hasTrailingStep_; |
213 SerializationToolbox::WriteSetOfStrings(target, failedInstances_, KEY_FAILED_INSTANCES); | 218 SerializationToolbox::WriteSetOfStrings(target, failedInstances_, KEY_FAILED_INSTANCES); |
219 SerializationToolbox::WriteSetOfStrings(target, parentResources_, KEY_PARENT_RESOURCES); | |
214 return true; | 220 return true; |
215 } | 221 } |
216 else | 222 else |
217 { | 223 { |
218 return false; | 224 return false; |
223 SetOfInstancesJob::SetOfInstancesJob(const Json::Value& source) : | 229 SetOfInstancesJob::SetOfInstancesJob(const Json::Value& source) : |
224 SetOfCommandsJob(new InstanceUnserializer(*this), source) | 230 SetOfCommandsJob(new InstanceUnserializer(*this), source) |
225 { | 231 { |
226 SerializationToolbox::ReadSetOfStrings(failedInstances_, source, KEY_FAILED_INSTANCES); | 232 SerializationToolbox::ReadSetOfStrings(failedInstances_, source, KEY_FAILED_INSTANCES); |
227 | 233 |
234 if (source.isMember(KEY_PARENT_RESOURCES)) | |
235 { | |
236 // Backward compatibility with Orthanc <= 1.5.6 | |
237 SerializationToolbox::ReadSetOfStrings(parentResources_, source, KEY_PARENT_RESOURCES); | |
238 } | |
239 | |
228 if (source.isMember(KEY_TRAILING_STEP)) | 240 if (source.isMember(KEY_TRAILING_STEP)) |
229 { | 241 { |
230 hasTrailingStep_ = SerializationToolbox::ReadBoolean(source, KEY_TRAILING_STEP); | 242 hasTrailingStep_ = SerializationToolbox::ReadBoolean(source, KEY_TRAILING_STEP); |
231 } | 243 } |
232 else | 244 else |