Mercurial > hg > orthanc
comparison OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp @ 1010:160dfe770618 lua-scripting
refactoring
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 09 Jul 2014 17:05:00 +0200 |
parents | 84b6d7bca6db |
children | 009dce4ea2f6 |
comparison
equal
deleted
inserted
replaced
1009:26642cecd36d | 1010:160dfe770618 |
---|---|
31 | 31 |
32 | 32 |
33 #include "../PrecompiledHeadersServer.h" | 33 #include "../PrecompiledHeadersServer.h" |
34 #include "OrthancRestApi.h" | 34 #include "OrthancRestApi.h" |
35 | 35 |
36 #include "../DicomModification.h" | |
37 #include "../FromDcmtkBridge.h" | 36 #include "../FromDcmtkBridge.h" |
38 | 37 |
39 #include <glog/logging.h> | 38 #include <glog/logging.h> |
40 | 39 |
41 namespace Orthanc | 40 namespace Orthanc |
109 uint64_t seq = context.GetIndex().IncrementGlobalSequence(GlobalProperty_AnonymizationSequence); | 108 uint64_t seq = context.GetIndex().IncrementGlobalSequence(GlobalProperty_AnonymizationSequence); |
110 return "Anonymized" + boost::lexical_cast<std::string>(seq); | 109 return "Anonymized" + boost::lexical_cast<std::string>(seq); |
111 } | 110 } |
112 | 111 |
113 | 112 |
113 | |
114 bool OrthancRestApi::ParseModifyRequest(DicomModification& target, | |
115 const Json::Value& request) | |
116 { | |
117 if (request.isObject()) | |
118 { | |
119 if (request.isMember("RemovePrivateTags")) | |
120 { | |
121 target.SetRemovePrivateTags(true); | |
122 } | |
123 | |
124 if (request.isMember("Remove")) | |
125 { | |
126 ParseListOfTags(target, request["Remove"], TagOperation_Remove); | |
127 } | |
128 | |
129 if (request.isMember("Replace")) | |
130 { | |
131 ParseReplacements(target, request["Replace"]); | |
132 } | |
133 | |
134 return true; | |
135 } | |
136 else | |
137 { | |
138 return false; | |
139 } | |
140 } | |
141 | |
142 | |
114 static bool ParseModifyRequest(DicomModification& target, | 143 static bool ParseModifyRequest(DicomModification& target, |
115 const RestApiPostCall& call) | 144 const RestApiPostCall& call) |
116 { | 145 { |
117 // curl http://localhost:8042/series/95a6e2bf-9296e2cc-bf614e2f-22b391ee-16e010e0/modify -X POST -d '{"Replace":{"InstitutionName":"My own clinic"}}' | 146 // curl http://localhost:8042/series/95a6e2bf-9296e2cc-bf614e2f-22b391ee-16e010e0/modify -X POST -d '{"Replace":{"InstitutionName":"My own clinic"}}' |
118 | 147 |
119 Json::Value request; | 148 Json::Value request; |
120 if (call.ParseJsonRequest(request) && request.isObject()) | 149 if (call.ParseJsonRequest(request)) |
121 { | 150 { |
122 if (request.isMember("RemovePrivateTags")) | 151 return OrthancRestApi::ParseModifyRequest(target, request); |
123 { | |
124 target.SetRemovePrivateTags(true); | |
125 } | |
126 | |
127 if (request.isMember("Remove")) | |
128 { | |
129 ParseListOfTags(target, request["Remove"], TagOperation_Remove); | |
130 } | |
131 | |
132 if (request.isMember("Replace")) | |
133 { | |
134 ParseReplacements(target, request["Replace"]); | |
135 } | |
136 | |
137 return true; | |
138 } | 152 } |
139 else | 153 else |
140 { | 154 { |
141 return false; | 155 return false; |
142 } | 156 } |