Mercurial > hg > orthanc

comparison OrthancServer/ServerJobs/Operations/ModifyInstanceOperation.cpp @ 2656:a6d3e45eeff5 jobs

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SerializationToolbox
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 05 Jun 2018 18:25:23 +0200
parents c196d76cb8fa
children a21b244efb37
comparison
equal deleted inserted replaced
2655:c196d76cb8fa 2656:a6d3e45eeff5
35 #include "ModifyInstanceOperation.h" 35 #include "ModifyInstanceOperation.h"
36 36
37 #include "DicomInstanceOperationValue.h" 37 #include "DicomInstanceOperationValue.h"
38 38
39 #include "../../../Core/Logging.h" 39 #include "../../../Core/Logging.h"
40 #include "../../../Core/SerializationToolbox.h"
40 41
41 namespace Orthanc 42 namespace Orthanc
42 { 43 {
43 ModifyInstanceOperation::ModifyInstanceOperation(ServerContext& context, 44 ModifyInstanceOperation::ModifyInstanceOperation(ServerContext& context,
44 RequestOrigin origin, 45 RequestOrigin origin,
136 137
137 ModifyInstanceOperation::ModifyInstanceOperation(ServerContext& context, 138 ModifyInstanceOperation::ModifyInstanceOperation(ServerContext& context,
138 const Json::Value& serialized) : 139 const Json::Value& serialized) :
139 context_(context) 140 context_(context)
140 { 141 {
141 if (IJobUnserializer::ReadString(serialized, "Type") != "ModifyInstance" || 142 if (SerializationToolbox::ReadString(serialized, "Type") != "ModifyInstance" ||
142 !serialized.isMember("Modification")) 143 !serialized.isMember("Modification"))
143 { 144 {
144 throw OrthancException(ErrorCode_BadFileFormat); 145 throw OrthancException(ErrorCode_BadFileFormat);
145 } 146 }
146 147
147 origin_ = StringToRequestOrigin(IJobUnserializer::ReadString(serialized, "Origin")); 148 origin_ = StringToRequestOrigin(SerializationToolbox::ReadString(serialized, "Origin"));
148 149
149 modification_.reset(new DicomModification(serialized["Modification"])); 150 modification_.reset(new DicomModification(serialized["Modification"]));
150 } 151 }
151 } 152 }
152 153