Mercurial > hg > orthanc
annotate Plugins/Samples/Common/OrthancPluginCppWrapper.cpp @ 3434:6503ab9489ba
fix
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 18 Jun 2019 11:37:18 +0200 |
| parents | caa526bb65cc |
| children | dbaf439c8888 |
| rev | line source |
|---|---|
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1 /** |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2 * Orthanc - A Lightweight, RESTful DICOM Store |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
|
3060
4e43e67f8ecf
preparing for 2019
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3039
diff
changeset
|
5 * Copyright (C) 2017-2019 Osimis S.A., Belgium |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
6 * |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
7 * This program is free software: you can redistribute it and/or |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
8 * modify it under the terms of the GNU General Public License as |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
9 * published by the Free Software Foundation, either version 3 of the |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
10 * License, or (at your option) any later version. |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
11 * |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
12 * In addition, as a special exception, the copyright holders of this |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
13 * program give permission to link the code of its release with the |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
15 * that use the same license as the "OpenSSL" library), and distribute |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
16 * the linked executables. You must obey the GNU General Public License |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
17 * in all respects for all of the code used other than "OpenSSL". If you |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
18 * modify file(s) with this exception, you may extend this exception to |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
19 * your version of the file(s), but you are not obligated to do so. If |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
20 * you do not wish to do so, delete this exception statement from your |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
21 * version. If you delete this exception statement from all source files |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
22 * in the program, then also delete it here. |
| 2850 | 23 * |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
24 * This program is distributed in the hope that it will be useful, but |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
25 * WITHOUT ANY WARRANTY; without even the implied warranty of |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
27 * General Public License for more details. |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
28 * |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
29 * You should have received a copy of the GNU General Public License |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
30 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
31 **/ |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
32 |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
33 |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
34 #include "OrthancPluginCppWrapper.h" |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
35 |
| 3394 | 36 #include <boost/algorithm/string/predicate.hpp> |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
37 #include <json/reader.h> |
|
2058
43cd2ab060c7
cont OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2048
diff
changeset
|
38 #include <json/writer.h> |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
39 |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
40 |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
41 namespace OrthancPlugins |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
42 { |
| 3028 | 43 static OrthancPluginContext* globalContext_ = NULL; |
|
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2851
diff
changeset
|
44 |
|
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2851
diff
changeset
|
45 |
| 3028 | 46 void SetGlobalContext(OrthancPluginContext* context) |
|
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2851
diff
changeset
|
47 { |
| 3028 | 48 if (context == NULL) |
| 49 { | |
| 50 ORTHANC_PLUGINS_THROW_EXCEPTION(NullPointer); | |
| 51 } | |
| 52 else if (globalContext_ == NULL) | |
| 53 { | |
| 54 globalContext_ = context; | |
| 55 } | |
| 56 else | |
| 57 { | |
| 58 ORTHANC_PLUGINS_THROW_EXCEPTION(BadSequenceOfCalls); | |
| 59 } | |
| 3026 | 60 } |
| 61 | |
| 62 | |
| 3028 | 63 bool HasGlobalContext() |
| 64 { | |
| 65 return globalContext_ != NULL; | |
| 66 } | |
| 67 | |
| 68 | |
| 69 OrthancPluginContext* GetGlobalContext() | |
| 70 { | |
| 71 if (globalContext_ == NULL) | |
| 72 { | |
| 73 ORTHANC_PLUGINS_THROW_EXCEPTION(BadSequenceOfCalls); | |
| 74 } | |
| 75 else | |
| 76 { | |
| 77 return globalContext_; | |
| 78 } | |
| 79 } | |
|
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2851
diff
changeset
|
80 |
|
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2851
diff
changeset
|
81 |
| 3028 | 82 void MemoryBuffer::Check(OrthancPluginErrorCode code) |
|
2062
40ffd0e8676a
generation of etag in ServeFolders
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2059
diff
changeset
|
83 { |
| 3028 | 84 if (code != OrthancPluginErrorCode_Success) |
| 85 { | |
| 86 // Prevent using garbage information | |
| 87 buffer_.data = NULL; | |
| 88 buffer_.size = 0; | |
| 89 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(code); | |
| 90 } | |
|
2062
40ffd0e8676a
generation of etag in ServeFolders
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2059
diff
changeset
|
91 } |
|
40ffd0e8676a
generation of etag in ServeFolders
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2059
diff
changeset
|
92 |
|
40ffd0e8676a
generation of etag in ServeFolders
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2059
diff
changeset
|
93 |
| 3028 | 94 bool MemoryBuffer::CheckHttp(OrthancPluginErrorCode code) |
|
2264
8e5e0de75839
primitives for HTTP client in plugin C++ wrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2263
diff
changeset
|
95 { |
| 3028 | 96 if (code != OrthancPluginErrorCode_Success) |
| 97 { | |
| 98 // Prevent using garbage information | |
| 99 buffer_.data = NULL; | |
| 100 buffer_.size = 0; | |
| 101 } | |
| 102 | |
| 103 if (code == OrthancPluginErrorCode_Success) | |
| 104 { | |
| 105 return true; | |
| 106 } | |
| 107 else if (code == OrthancPluginErrorCode_UnknownResource || | |
| 108 code == OrthancPluginErrorCode_InexistentItem) | |
| 109 { | |
| 110 return false; | |
| 111 } | |
| 112 else | |
| 113 { | |
| 114 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(code); | |
| 115 } | |
|
2264
8e5e0de75839
primitives for HTTP client in plugin C++ wrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2263
diff
changeset
|
116 } |
|
8e5e0de75839
primitives for HTTP client in plugin C++ wrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2263
diff
changeset
|
117 |
|
8e5e0de75839
primitives for HTTP client in plugin C++ wrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2263
diff
changeset
|
118 |
| 3028 | 119 MemoryBuffer::MemoryBuffer() |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
120 { |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
121 buffer_.data = NULL; |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
122 buffer_.size = 0; |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
123 } |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
124 |
| 3028 | 125 |
| 126 void MemoryBuffer::Clear() | |
| 3026 | 127 { |
| 3028 | 128 if (buffer_.data != NULL) |
| 129 { | |
| 130 OrthancPluginFreeMemoryBuffer(GetGlobalContext(), &buffer_); | |
| 131 buffer_.data = NULL; | |
| 132 buffer_.size = 0; | |
| 133 } | |
| 3026 | 134 } |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
135 |
| 3026 | 136 |
| 3028 | 137 void MemoryBuffer::Assign(OrthancPluginMemoryBuffer& other) |
| 138 { | |
| 139 Clear(); | |
| 140 | |
| 141 buffer_.data = other.data; | |
| 142 buffer_.size = other.size; | |
| 143 | |
| 144 other.data = NULL; | |
| 145 other.size = 0; | |
| 146 } | |
| 3026 | 147 |
| 148 | |
| 3320 | 149 void MemoryBuffer::Swap(MemoryBuffer& other) |
| 150 { | |
| 151 std::swap(buffer_.data, other.buffer_.data); | |
| 152 std::swap(buffer_.size, other.buffer_.size); | |
| 153 } | |
| 154 | |
| 155 | |
| 3028 | 156 OrthancPluginMemoryBuffer MemoryBuffer::Release() |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
157 { |
| 3028 | 158 OrthancPluginMemoryBuffer result = buffer_; |
| 159 | |
| 3026 | 160 buffer_.data = NULL; |
| 161 buffer_.size = 0; | |
| 3028 | 162 |
| 163 return result; | |
| 3026 | 164 } |
| 3028 | 165 |
| 166 | |
| 167 void MemoryBuffer::ToString(std::string& target) const | |
| 168 { | |
| 169 if (buffer_.size == 0) | |
| 170 { | |
| 171 target.clear(); | |
| 172 } | |
| 173 else | |
| 174 { | |
| 175 target.assign(reinterpret_cast<const char*>(buffer_.data), buffer_.size); | |
| 176 } | |
| 177 } | |
| 3026 | 178 |
| 179 | |
| 3028 | 180 void MemoryBuffer::ToJson(Json::Value& target) const |
| 181 { | |
| 182 if (buffer_.data == NULL || | |
| 183 buffer_.size == 0) | |
| 184 { | |
| 185 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
| 186 } | |
| 3026 | 187 |
| 3028 | 188 const char* tmp = reinterpret_cast<const char*>(buffer_.data); |
| 3026 | 189 |
| 3028 | 190 Json::Reader reader; |
| 191 if (!reader.parse(tmp, tmp + buffer_.size, target)) | |
| 192 { | |
| 193 LogError("Cannot convert some memory buffer to JSON"); | |
| 194 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
| 195 } | |
| 196 } | |
| 3026 | 197 |
| 198 | |
| 3028 | 199 bool MemoryBuffer::RestApiGet(const std::string& uri, |
| 200 bool applyPlugins) | |
| 3026 | 201 { |
| 3028 | 202 Clear(); |
| 3026 | 203 |
| 3028 | 204 if (applyPlugins) |
| 205 { | |
| 206 return CheckHttp(OrthancPluginRestApiGetAfterPlugins(GetGlobalContext(), &buffer_, uri.c_str())); | |
| 207 } | |
| 208 else | |
| 209 { | |
| 210 return CheckHttp(OrthancPluginRestApiGet(GetGlobalContext(), &buffer_, uri.c_str())); | |
| 211 } | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
212 } |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
213 |
| 3028 | 214 bool MemoryBuffer::RestApiGet(const std::string& uri, |
| 215 const std::map<std::string, std::string>& httpHeaders, | |
| 216 bool applyPlugins) | |
| 3026 | 217 { |
| 3028 | 218 Clear(); |
| 219 | |
| 220 std::vector<const char*> headersKeys; | |
| 221 std::vector<const char*> headersValues; | |
| 3039 | 222 |
| 223 for (std::map<std::string, std::string>::const_iterator | |
| 224 it = httpHeaders.begin(); it != httpHeaders.end(); it++) | |
| 3028 | 225 { |
| 226 headersKeys.push_back(it->first.c_str()); | |
| 227 headersValues.push_back(it->second.c_str()); | |
| 228 } | |
| 229 | |
| 3039 | 230 return CheckHttp(OrthancPluginRestApiGet2( |
| 231 GetGlobalContext(), &buffer_, uri.c_str(), httpHeaders.size(), | |
| 232 (headersKeys.empty() ? NULL : &headersKeys[0]), | |
| 233 (headersValues.empty() ? NULL : &headersValues[0]), applyPlugins)); | |
| 3026 | 234 } |
| 3028 | 235 |
| 236 bool MemoryBuffer::RestApiPost(const std::string& uri, | |
|
3400
0faae6f6e3c5
fixed some inconsistencies with pointer types in the plugin sdk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3399
diff
changeset
|
237 const void* body, |
| 3028 | 238 size_t bodySize, |
| 239 bool applyPlugins) | |
| 240 { | |
| 241 Clear(); | |
|
3405
408ffcb4038f
reorganizing build instructions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3404
diff
changeset
|
242 |
|
408ffcb4038f
reorganizing build instructions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3404
diff
changeset
|
243 // Cast for compatibility with Orthanc SDK <= 1.5.6 |
|
408ffcb4038f
reorganizing build instructions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3404
diff
changeset
|
244 const char* b = reinterpret_cast<const char*>(body); |
| 3028 | 245 |
| 246 if (applyPlugins) | |
| 247 { | |
|
3405
408ffcb4038f
reorganizing build instructions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3404
diff
changeset
|
248 return CheckHttp(OrthancPluginRestApiPostAfterPlugins(GetGlobalContext(), &buffer_, uri.c_str(), b, bodySize)); |
| 3028 | 249 } |
| 250 else | |
| 251 { | |
|
3405
408ffcb4038f
reorganizing build instructions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3404
diff
changeset
|
252 return CheckHttp(OrthancPluginRestApiPost(GetGlobalContext(), &buffer_, uri.c_str(), b, bodySize)); |
| 3028 | 253 } |
| 254 } | |
| 3026 | 255 |
| 256 | |
| 3028 | 257 bool MemoryBuffer::RestApiPut(const std::string& uri, |
|
3400
0faae6f6e3c5
fixed some inconsistencies with pointer types in the plugin sdk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3399
diff
changeset
|
258 const void* body, |
| 3028 | 259 size_t bodySize, |
| 260 bool applyPlugins) | |
| 261 { | |
| 262 Clear(); | |
| 3026 | 263 |
|
3405
408ffcb4038f
reorganizing build instructions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3404
diff
changeset
|
264 // Cast for compatibility with Orthanc SDK <= 1.5.6 |
|
408ffcb4038f
reorganizing build instructions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3404
diff
changeset
|
265 const char* b = reinterpret_cast<const char*>(body); |
|
408ffcb4038f
reorganizing build instructions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3404
diff
changeset
|
266 |
| 3028 | 267 if (applyPlugins) |
| 268 { | |
|
3405
408ffcb4038f
reorganizing build instructions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3404
diff
changeset
|
269 return CheckHttp(OrthancPluginRestApiPutAfterPlugins(GetGlobalContext(), &buffer_, uri.c_str(), b, bodySize)); |
| 3028 | 270 } |
| 271 else | |
| 272 { | |
|
3405
408ffcb4038f
reorganizing build instructions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3404
diff
changeset
|
273 return CheckHttp(OrthancPluginRestApiPut(GetGlobalContext(), &buffer_, uri.c_str(), b, bodySize)); |
| 3028 | 274 } |
| 3026 | 275 } |
| 3028 | 276 |
| 3026 | 277 |
| 3028 | 278 bool MemoryBuffer::RestApiPost(const std::string& uri, |
| 279 const Json::Value& body, | |
| 280 bool applyPlugins) | |
| 3026 | 281 { |
| 3028 | 282 Json::FastWriter writer; |
| 283 return RestApiPost(uri, writer.write(body), applyPlugins); | |
| 3026 | 284 } |
| 285 | |
| 3028 | 286 |
| 287 bool MemoryBuffer::RestApiPut(const std::string& uri, | |
| 288 const Json::Value& body, | |
| 289 bool applyPlugins) | |
| 290 { | |
| 291 Json::FastWriter writer; | |
| 292 return RestApiPut(uri, writer.write(body), applyPlugins); | |
| 293 } | |
| 3026 | 294 |
| 3028 | 295 |
| 296 void MemoryBuffer::CreateDicom(const Json::Value& tags, | |
| 297 OrthancPluginCreateDicomFlags flags) | |
| 298 { | |
| 299 Clear(); | |
| 300 | |
| 301 Json::FastWriter writer; | |
| 302 std::string s = writer.write(tags); | |
| 3026 | 303 |
| 3028 | 304 Check(OrthancPluginCreateDicom(GetGlobalContext(), &buffer_, s.c_str(), NULL, flags)); |
| 3026 | 305 } |
| 3028 | 306 |
| 307 void MemoryBuffer::CreateDicom(const Json::Value& tags, | |
| 308 const OrthancImage& pixelData, | |
| 309 OrthancPluginCreateDicomFlags flags) | |
| 3026 | 310 { |
| 3028 | 311 Clear(); |
| 312 | |
| 313 Json::FastWriter writer; | |
| 314 std::string s = writer.write(tags); | |
| 315 | |
| 316 Check(OrthancPluginCreateDicom(GetGlobalContext(), &buffer_, s.c_str(), pixelData.GetObject(), flags)); | |
| 3026 | 317 } |
| 3028 | 318 |
| 319 | |
| 320 void MemoryBuffer::ReadFile(const std::string& path) | |
| 321 { | |
| 322 Clear(); | |
| 323 Check(OrthancPluginReadFile(GetGlobalContext(), &buffer_, path.c_str())); | |
| 324 } | |
| 3026 | 325 |
| 326 | |
| 3028 | 327 void MemoryBuffer::GetDicomQuery(const OrthancPluginWorklistQuery* query) |
| 3026 | 328 { |
| 3028 | 329 Clear(); |
| 330 Check(OrthancPluginWorklistGetDicomQuery(GetGlobalContext(), &buffer_, query)); | |
| 3026 | 331 } |
| 332 | |
| 333 | |
| 3028 | 334 void OrthancString::Assign(char* str) |
| 335 { | |
| 336 if (str == NULL) | |
| 337 { | |
| 338 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
| 339 } | |
| 340 else | |
| 341 { | |
| 342 Clear(); | |
| 343 str_ = str; | |
| 344 } | |
| 345 } | |
| 3026 | 346 |
| 347 | |
| 3028 | 348 void OrthancString::Clear() |
| 349 { | |
| 350 if (str_ != NULL) | |
| 351 { | |
| 352 OrthancPluginFreeString(GetGlobalContext(), str_); | |
| 353 str_ = NULL; | |
| 354 } | |
| 355 } | |
| 3026 | 356 |
| 357 | |
| 3028 | 358 void OrthancString::ToString(std::string& target) const |
| 359 { | |
| 360 if (str_ == NULL) | |
| 361 { | |
| 362 target.clear(); | |
| 363 } | |
| 364 else | |
| 365 { | |
| 366 target.assign(str_); | |
| 367 } | |
| 368 } | |
| 3026 | 369 |
| 370 | |
| 3028 | 371 void OrthancString::ToJson(Json::Value& target) const |
| 372 { | |
| 373 if (str_ == NULL) | |
| 374 { | |
| 375 LogError("Cannot convert an empty memory buffer to JSON"); | |
| 376 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
| 377 } | |
| 378 | |
| 379 Json::Reader reader; | |
| 380 if (!reader.parse(str_, target)) | |
| 381 { | |
| 382 LogError("Cannot convert some memory buffer to JSON"); | |
| 383 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
| 384 } | |
| 385 } | |
| 3026 | 386 |
| 387 | |
| 3028 | 388 void MemoryBuffer::DicomToJson(Json::Value& target, |
| 389 OrthancPluginDicomToJsonFormat format, | |
| 390 OrthancPluginDicomToJsonFlags flags, | |
| 391 uint32_t maxStringLength) | |
| 392 { | |
| 393 OrthancString str; | |
| 394 str.Assign(OrthancPluginDicomBufferToJson | |
| 395 (GetGlobalContext(), GetData(), GetSize(), format, flags, maxStringLength)); | |
| 396 str.ToJson(target); | |
| 397 } | |
| 3026 | 398 |
| 399 | |
| 3028 | 400 bool MemoryBuffer::HttpGet(const std::string& url, |
| 401 const std::string& username, | |
| 402 const std::string& password) | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
403 { |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
404 Clear(); |
| 3028 | 405 return CheckHttp(OrthancPluginHttpGet(GetGlobalContext(), &buffer_, url.c_str(), |
| 406 username.empty() ? NULL : username.c_str(), | |
| 407 password.empty() ? NULL : password.c_str())); | |
| 3026 | 408 } |
| 409 | |
| 410 | |
| 3028 | 411 bool MemoryBuffer::HttpPost(const std::string& url, |
| 412 const std::string& body, | |
| 413 const std::string& username, | |
| 414 const std::string& password) | |
| 3026 | 415 { |
| 3028 | 416 Clear(); |
| 417 return CheckHttp(OrthancPluginHttpPost(GetGlobalContext(), &buffer_, url.c_str(), | |
| 418 body.c_str(), body.size(), | |
| 419 username.empty() ? NULL : username.c_str(), | |
| 420 password.empty() ? NULL : password.c_str())); | |
| 3026 | 421 } |
| 422 | |
| 423 | |
| 3028 | 424 bool MemoryBuffer::HttpPut(const std::string& url, |
| 425 const std::string& body, | |
| 426 const std::string& username, | |
| 427 const std::string& password) | |
| 3026 | 428 { |
| 3028 | 429 Clear(); |
| 430 return CheckHttp(OrthancPluginHttpPut(GetGlobalContext(), &buffer_, url.c_str(), | |
| 431 body.empty() ? NULL : body.c_str(), | |
| 432 body.size(), | |
| 433 username.empty() ? NULL : username.c_str(), | |
| 434 password.empty() ? NULL : password.c_str())); | |
| 3026 | 435 } |
| 436 | |
| 3028 | 437 |
| 438 void MemoryBuffer::GetDicomInstance(const std::string& instanceId) | |
| 3026 | 439 { |
| 3028 | 440 Clear(); |
| 441 Check(OrthancPluginGetDicomForInstance(GetGlobalContext(), &buffer_, instanceId.c_str())); | |
| 3026 | 442 } |
| 443 | |
| 444 | |
| 3028 | 445 bool HttpDelete(const std::string& url, |
| 446 const std::string& username, | |
| 447 const std::string& password) | |
| 448 { | |
| 449 OrthancPluginErrorCode error = OrthancPluginHttpDelete | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
450 (GetGlobalContext(), url.c_str(), |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
451 username.empty() ? NULL : username.c_str(), |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
452 password.empty() ? NULL : password.c_str()); |
| 3028 | 453 |
| 454 if (error == OrthancPluginErrorCode_Success) | |
| 455 { | |
| 456 return true; | |
| 457 } | |
| 458 else if (error == OrthancPluginErrorCode_UnknownResource || | |
| 459 error == OrthancPluginErrorCode_InexistentItem) | |
| 460 { | |
| 461 return false; | |
| 462 } | |
| 463 else | |
| 464 { | |
| 465 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(error); | |
| 466 } | |
| 467 } | |
| 3026 | 468 |
| 469 | |
| 3028 | 470 void LogError(const std::string& message) |
| 471 { | |
| 472 if (HasGlobalContext()) | |
| 473 { | |
| 474 OrthancPluginLogError(GetGlobalContext(), message.c_str()); | |
| 475 } | |
| 476 } | |
| 3026 | 477 |
| 478 | |
| 3028 | 479 void LogWarning(const std::string& message) |
| 480 { | |
| 481 if (HasGlobalContext()) | |
| 482 { | |
| 483 OrthancPluginLogWarning(GetGlobalContext(), message.c_str()); | |
| 484 } | |
| 485 } | |
| 486 | |
| 487 | |
| 488 void LogInfo(const std::string& message) | |
| 489 { | |
| 490 if (HasGlobalContext()) | |
| 491 { | |
| 492 OrthancPluginLogInfo(GetGlobalContext(), message.c_str()); | |
| 493 } | |
| 494 } | |
| 3026 | 495 |
| 496 | |
|
3421
decbede6e3ad
OrthancPlugins::OrthancConfiguration(bool)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3420
diff
changeset
|
497 void OrthancConfiguration::LoadConfiguration() |
| 3028 | 498 { |
| 499 OrthancString str; | |
| 500 str.Assign(OrthancPluginGetConfiguration(GetGlobalContext())); | |
| 3026 | 501 |
| 3028 | 502 if (str.GetContent() == NULL) |
| 503 { | |
| 504 LogError("Cannot access the Orthanc configuration"); | |
| 505 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
| 506 } | |
| 3026 | 507 |
| 3028 | 508 str.ToJson(configuration_); |
| 509 | |
| 510 if (configuration_.type() != Json::objectValue) | |
| 511 { | |
| 512 LogError("Unable to read the Orthanc configuration"); | |
| 513 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
| 514 } | |
| 515 } | |
|
3421
decbede6e3ad
OrthancPlugins::OrthancConfiguration(bool)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3420
diff
changeset
|
516 |
|
decbede6e3ad
OrthancPlugins::OrthancConfiguration(bool)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3420
diff
changeset
|
517 |
|
decbede6e3ad
OrthancPlugins::OrthancConfiguration(bool)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3420
diff
changeset
|
518 OrthancConfiguration::OrthancConfiguration() |
|
decbede6e3ad
OrthancPlugins::OrthancConfiguration(bool)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3420
diff
changeset
|
519 { |
|
decbede6e3ad
OrthancPlugins::OrthancConfiguration(bool)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3420
diff
changeset
|
520 LoadConfiguration(); |
|
decbede6e3ad
OrthancPlugins::OrthancConfiguration(bool)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3420
diff
changeset
|
521 } |
|
decbede6e3ad
OrthancPlugins::OrthancConfiguration(bool)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3420
diff
changeset
|
522 |
|
decbede6e3ad
OrthancPlugins::OrthancConfiguration(bool)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3420
diff
changeset
|
523 |
|
decbede6e3ad
OrthancPlugins::OrthancConfiguration(bool)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3420
diff
changeset
|
524 OrthancConfiguration::OrthancConfiguration(bool loadConfiguration) |
|
decbede6e3ad
OrthancPlugins::OrthancConfiguration(bool)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3420
diff
changeset
|
525 { |
|
decbede6e3ad
OrthancPlugins::OrthancConfiguration(bool)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3420
diff
changeset
|
526 if (loadConfiguration) |
|
decbede6e3ad
OrthancPlugins::OrthancConfiguration(bool)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3420
diff
changeset
|
527 { |
|
decbede6e3ad
OrthancPlugins::OrthancConfiguration(bool)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3420
diff
changeset
|
528 LoadConfiguration(); |
|
decbede6e3ad
OrthancPlugins::OrthancConfiguration(bool)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3420
diff
changeset
|
529 } |
|
decbede6e3ad
OrthancPlugins::OrthancConfiguration(bool)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3420
diff
changeset
|
530 else |
|
decbede6e3ad
OrthancPlugins::OrthancConfiguration(bool)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3420
diff
changeset
|
531 { |
|
decbede6e3ad
OrthancPlugins::OrthancConfiguration(bool)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3420
diff
changeset
|
532 configuration_ = Json::objectValue; |
|
decbede6e3ad
OrthancPlugins::OrthancConfiguration(bool)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3420
diff
changeset
|
533 } |
|
decbede6e3ad
OrthancPlugins::OrthancConfiguration(bool)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3420
diff
changeset
|
534 } |
| 3026 | 535 |
| 536 | |
| 3028 | 537 std::string OrthancConfiguration::GetPath(const std::string& key) const |
| 3026 | 538 { |
| 3028 | 539 if (path_.empty()) |
| 540 { | |
| 541 return key; | |
| 542 } | |
| 543 else | |
| 544 { | |
| 545 return path_ + "." + key; | |
| 546 } | |
| 3026 | 547 } |
| 3028 | 548 |
| 549 | |
| 550 bool OrthancConfiguration::IsSection(const std::string& key) const | |
| 3026 | 551 { |
| 3028 | 552 assert(configuration_.type() == Json::objectValue); |
| 553 | |
| 554 return (configuration_.isMember(key) && | |
| 555 configuration_[key].type() == Json::objectValue); | |
| 3026 | 556 } |
| 557 | |
| 558 | |
| 3028 | 559 void OrthancConfiguration::GetSection(OrthancConfiguration& target, |
| 560 const std::string& key) const | |
| 3026 | 561 { |
| 3028 | 562 assert(configuration_.type() == Json::objectValue); |
| 3026 | 563 |
| 3028 | 564 target.path_ = GetPath(key); |
| 3026 | 565 |
| 3028 | 566 if (!configuration_.isMember(key)) |
| 567 { | |
| 568 target.configuration_ = Json::objectValue; | |
| 569 } | |
| 570 else | |
| 571 { | |
| 572 if (configuration_[key].type() != Json::objectValue) | |
| 573 { | |
| 574 LogError("The configuration section \"" + target.path_ + | |
| 575 "\" is not an associative array as expected"); | |
| 576 | |
| 577 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
| 578 } | |
| 579 | |
| 580 target.configuration_ = configuration_[key]; | |
| 581 } | |
| 3026 | 582 } |
| 583 | |
| 584 | |
| 3028 | 585 bool OrthancConfiguration::LookupStringValue(std::string& target, |
| 586 const std::string& key) const | |
| 587 { | |
| 588 assert(configuration_.type() == Json::objectValue); | |
| 589 | |
| 590 if (!configuration_.isMember(key)) | |
| 591 { | |
| 592 return false; | |
| 593 } | |
| 3026 | 594 |
| 3028 | 595 if (configuration_[key].type() != Json::stringValue) |
| 596 { | |
| 597 LogError("The configuration option \"" + GetPath(key) + | |
| 598 "\" is not a string as expected"); | |
| 599 | |
| 600 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
| 601 } | |
| 602 | |
| 603 target = configuration_[key].asString(); | |
| 604 return true; | |
| 3026 | 605 } |
| 606 | |
| 607 | |
| 3028 | 608 bool OrthancConfiguration::LookupIntegerValue(int& target, |
| 609 const std::string& key) const | |
| 3026 | 610 { |
| 3028 | 611 assert(configuration_.type() == Json::objectValue); |
| 612 | |
| 613 if (!configuration_.isMember(key)) | |
| 614 { | |
| 615 return false; | |
| 616 } | |
| 617 | |
| 618 switch (configuration_[key].type()) | |
| 619 { | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
620 case Json::intValue: |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
621 target = configuration_[key].asInt(); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
622 return true; |
| 3028 | 623 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
624 case Json::uintValue: |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
625 target = configuration_[key].asUInt(); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
626 return true; |
| 3028 | 627 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
628 default: |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
629 LogError("The configuration option \"" + GetPath(key) + |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
630 "\" is not an integer as expected"); |
| 3028 | 631 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
632 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); |
| 3028 | 633 } |
| 3026 | 634 } |
| 635 | |
| 636 | |
| 3028 | 637 bool OrthancConfiguration::LookupUnsignedIntegerValue(unsigned int& target, |
| 638 const std::string& key) const | |
| 639 { | |
| 640 int tmp; | |
| 641 if (!LookupIntegerValue(tmp, key)) | |
| 642 { | |
| 643 return false; | |
| 644 } | |
| 3026 | 645 |
| 3028 | 646 if (tmp < 0) |
| 647 { | |
| 648 LogError("The configuration option \"" + GetPath(key) + | |
| 649 "\" is not a positive integer as expected"); | |
| 650 | |
| 651 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
| 652 } | |
| 653 else | |
| 654 { | |
| 655 target = static_cast<unsigned int>(tmp); | |
| 656 return true; | |
| 657 } | |
| 658 } | |
| 3026 | 659 |
| 660 | |
| 3028 | 661 bool OrthancConfiguration::LookupBooleanValue(bool& target, |
| 662 const std::string& key) const | |
| 3026 | 663 { |
| 3028 | 664 assert(configuration_.type() == Json::objectValue); |
| 665 | |
| 666 if (!configuration_.isMember(key)) | |
| 3026 | 667 { |
| 3028 | 668 return false; |
| 669 } | |
| 670 | |
| 671 if (configuration_[key].type() != Json::booleanValue) | |
| 672 { | |
| 673 LogError("The configuration option \"" + GetPath(key) + | |
| 674 "\" is not a Boolean as expected"); | |
| 3026 | 675 |
| 676 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
| 677 } | |
| 678 | |
| 3028 | 679 target = configuration_[key].asBool(); |
| 680 return true; | |
| 3026 | 681 } |
| 3028 | 682 |
| 683 | |
| 684 bool OrthancConfiguration::LookupFloatValue(float& target, | |
| 685 const std::string& key) const | |
| 686 { | |
| 687 assert(configuration_.type() == Json::objectValue); | |
| 688 | |
| 689 if (!configuration_.isMember(key)) | |
| 690 { | |
| 691 return false; | |
| 692 } | |
| 693 | |
| 694 switch (configuration_[key].type()) | |
| 695 { | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
696 case Json::realValue: |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
697 target = configuration_[key].asFloat(); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
698 return true; |
| 3028 | 699 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
700 case Json::intValue: |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
701 target = static_cast<float>(configuration_[key].asInt()); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
702 return true; |
| 3028 | 703 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
704 case Json::uintValue: |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
705 target = static_cast<float>(configuration_[key].asUInt()); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
706 return true; |
| 3028 | 707 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
708 default: |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
709 LogError("The configuration option \"" + GetPath(key) + |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
710 "\" is not an integer as expected"); |
| 3028 | 711 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
712 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); |
| 3028 | 713 } |
| 714 } | |
| 3026 | 715 |
| 716 | |
| 3028 | 717 bool OrthancConfiguration::LookupListOfStrings(std::list<std::string>& target, |
| 718 const std::string& key, | |
| 719 bool allowSingleString) const | |
| 3026 | 720 { |
| 3028 | 721 assert(configuration_.type() == Json::objectValue); |
| 722 | |
| 723 target.clear(); | |
| 724 | |
| 725 if (!configuration_.isMember(key)) | |
| 726 { | |
| 727 return false; | |
| 728 } | |
| 729 | |
| 730 switch (configuration_[key].type()) | |
| 731 { | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
732 case Json::arrayValue: |
| 3028 | 733 { |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
734 bool ok = true; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
735 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
736 for (Json::Value::ArrayIndex i = 0; ok && i < configuration_[key].size(); i++) |
| 3028 | 737 { |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
738 if (configuration_[key][i].type() == Json::stringValue) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
739 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
740 target.push_back(configuration_[key][i].asString()); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
741 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
742 else |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
743 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
744 ok = false; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
745 } |
| 3028 | 746 } |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
747 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
748 if (ok) |
| 3028 | 749 { |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
750 return true; |
| 3028 | 751 } |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
752 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
753 break; |
| 3028 | 754 } |
| 755 | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
756 case Json::stringValue: |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
757 if (allowSingleString) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
758 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
759 target.push_back(configuration_[key].asString()); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
760 return true; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
761 } |
| 3028 | 762 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
763 break; |
| 3028 | 764 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
765 default: |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
766 break; |
| 3028 | 767 } |
| 768 | |
| 3026 | 769 LogError("The configuration option \"" + GetPath(key) + |
| 3028 | 770 "\" is not a list of strings as expected"); |
| 3026 | 771 |
| 772 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
| 773 } | |
| 774 | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
775 |
| 3028 | 776 bool OrthancConfiguration::LookupSetOfStrings(std::set<std::string>& target, |
| 777 const std::string& key, | |
| 778 bool allowSingleString) const | |
| 779 { | |
| 780 std::list<std::string> lst; | |
| 781 | |
| 782 if (LookupListOfStrings(lst, key, allowSingleString)) | |
| 783 { | |
| 784 target.clear(); | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
785 |
| 3028 | 786 for (std::list<std::string>::const_iterator |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
787 it = lst.begin(); it != lst.end(); ++it) |
| 3028 | 788 { |
| 789 target.insert(*it); | |
| 790 } | |
| 3026 | 791 |
| 3028 | 792 return true; |
| 793 } | |
| 794 else | |
| 795 { | |
| 796 return false; | |
| 797 } | |
| 3026 | 798 } |
| 799 | |
| 3028 | 800 |
| 801 std::string OrthancConfiguration::GetStringValue(const std::string& key, | |
| 802 const std::string& defaultValue) const | |
| 3026 | 803 { |
| 3028 | 804 std::string tmp; |
| 805 if (LookupStringValue(tmp, key)) | |
| 806 { | |
| 807 return tmp; | |
| 808 } | |
| 809 else | |
| 810 { | |
| 811 return defaultValue; | |
| 812 } | |
| 3026 | 813 } |
| 814 | |
| 815 | |
| 3028 | 816 int OrthancConfiguration::GetIntegerValue(const std::string& key, |
| 817 int defaultValue) const | |
| 3026 | 818 { |
| 3028 | 819 int tmp; |
| 820 if (LookupIntegerValue(tmp, key)) | |
| 821 { | |
| 822 return tmp; | |
| 823 } | |
| 824 else | |
| 825 { | |
| 826 return defaultValue; | |
| 827 } | |
| 3026 | 828 } |
| 829 | |
| 3028 | 830 |
| 831 unsigned int OrthancConfiguration::GetUnsignedIntegerValue(const std::string& key, | |
| 832 unsigned int defaultValue) const | |
| 3026 | 833 { |
| 3028 | 834 unsigned int tmp; |
| 835 if (LookupUnsignedIntegerValue(tmp, key)) | |
| 836 { | |
| 837 return tmp; | |
| 838 } | |
| 839 else | |
| 840 { | |
| 841 return defaultValue; | |
| 842 } | |
| 3026 | 843 } |
|
2792
57e2d65d37ce
OrthancPlugins::MemoryBuffer::Release(), fixing openssl link
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
844 |
| 3026 | 845 |
| 3028 | 846 bool OrthancConfiguration::GetBooleanValue(const std::string& key, |
| 847 bool defaultValue) const | |
| 3026 | 848 { |
| 3028 | 849 bool tmp; |
| 850 if (LookupBooleanValue(tmp, key)) | |
| 851 { | |
| 852 return tmp; | |
| 853 } | |
| 854 else | |
| 855 { | |
| 856 return defaultValue; | |
| 857 } | |
| 3026 | 858 } |
| 859 | |
| 3028 | 860 |
| 861 float OrthancConfiguration::GetFloatValue(const std::string& key, | |
| 862 float defaultValue) const | |
| 3026 | 863 { |
| 3028 | 864 float tmp; |
| 865 if (LookupFloatValue(tmp, key)) | |
| 866 { | |
| 867 return tmp; | |
| 868 } | |
| 869 else | |
| 870 { | |
| 871 return defaultValue; | |
| 872 } | |
| 3026 | 873 } |
| 874 | |
| 875 | |
| 3028 | 876 void OrthancConfiguration::GetDictionary(std::map<std::string, std::string>& target, |
| 877 const std::string& key) const | |
| 3026 | 878 { |
| 3028 | 879 assert(configuration_.type() == Json::objectValue); |
| 880 | |
| 881 target.clear(); | |
| 882 | |
| 883 if (!configuration_.isMember(key)) | |
| 884 { | |
| 885 return; | |
| 886 } | |
| 3026 | 887 |
| 3028 | 888 if (configuration_[key].type() != Json::objectValue) |
| 889 { | |
| 890 LogError("The configuration option \"" + GetPath(key) + | |
| 891 "\" is not a string as expected"); | |
| 892 | |
| 893 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
| 894 } | |
| 3026 | 895 |
| 3028 | 896 Json::Value::Members members = configuration_[key].getMemberNames(); |
| 897 | |
| 898 for (size_t i = 0; i < members.size(); i++) | |
| 3026 | 899 { |
| 3028 | 900 const Json::Value& value = configuration_[key][members[i]]; |
| 901 | |
| 902 if (value.type() == Json::stringValue) | |
| 3026 | 903 { |
| 3028 | 904 target[members[i]] = value.asString(); |
| 3026 | 905 } |
| 906 else | |
| 907 { | |
| 3028 | 908 LogError("The configuration option \"" + GetPath(key) + |
| 909 "\" is not a dictionary mapping strings to strings"); | |
| 910 | |
| 911 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
| 3026 | 912 } |
| 913 } | |
| 3028 | 914 } |
| 3026 | 915 |
| 3028 | 916 |
| 917 void OrthancImage::Clear() | |
| 918 { | |
| 919 if (image_ != NULL) | |
| 920 { | |
| 921 OrthancPluginFreeImage(GetGlobalContext(), image_); | |
| 922 image_ = NULL; | |
| 923 } | |
| 924 } | |
| 925 | |
| 926 | |
| 3236 | 927 void OrthancImage::CheckImageAvailable() const |
| 3028 | 928 { |
| 929 if (image_ == NULL) | |
| 930 { | |
| 931 LogError("Trying to access a NULL image"); | |
| 932 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange); | |
| 933 } | |
| 934 } | |
| 935 | |
| 936 | |
| 937 OrthancImage::OrthancImage() : | |
| 938 image_(NULL) | |
| 939 { | |
| 940 } | |
| 941 | |
| 942 | |
| 943 OrthancImage::OrthancImage(OrthancPluginImage* image) : | |
| 944 image_(image) | |
| 945 { | |
| 946 } | |
| 947 | |
| 948 | |
| 949 OrthancImage::OrthancImage(OrthancPluginPixelFormat format, | |
| 950 uint32_t width, | |
| 951 uint32_t height) | |
| 952 { | |
| 953 image_ = OrthancPluginCreateImage(GetGlobalContext(), format, width, height); | |
| 954 | |
| 955 if (image_ == NULL) | |
| 956 { | |
| 957 LogError("Cannot create an image"); | |
| 958 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
| 959 } | |
| 960 } | |
| 961 | |
| 962 | |
| 963 OrthancImage::OrthancImage(OrthancPluginPixelFormat format, | |
| 964 uint32_t width, | |
| 965 uint32_t height, | |
| 966 uint32_t pitch, | |
| 967 void* buffer) | |
| 968 { | |
| 969 image_ = OrthancPluginCreateImageAccessor | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
970 (GetGlobalContext(), format, width, height, pitch, buffer); |
| 3028 | 971 |
| 972 if (image_ == NULL) | |
| 973 { | |
| 974 LogError("Cannot create an image accessor"); | |
| 975 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
| 976 } | |
| 977 } | |
| 978 | |
| 979 void OrthancImage::UncompressPngImage(const void* data, | |
| 980 size_t size) | |
| 981 { | |
| 982 Clear(); | |
| 983 | |
| 984 image_ = OrthancPluginUncompressImage(GetGlobalContext(), data, size, OrthancPluginImageFormat_Png); | |
| 985 | |
| 986 if (image_ == NULL) | |
| 987 { | |
| 988 LogError("Cannot uncompress a PNG image"); | |
| 989 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange); | |
| 990 } | |
| 991 } | |
| 992 | |
| 993 | |
| 994 void OrthancImage::UncompressJpegImage(const void* data, | |
| 995 size_t size) | |
| 996 { | |
| 997 Clear(); | |
| 998 image_ = OrthancPluginUncompressImage(GetGlobalContext(), data, size, OrthancPluginImageFormat_Jpeg); | |
| 999 if (image_ == NULL) | |
| 1000 { | |
| 1001 LogError("Cannot uncompress a JPEG image"); | |
| 1002 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange); | |
| 1003 } | |
| 1004 } | |
| 1005 | |
| 1006 | |
| 1007 void OrthancImage::DecodeDicomImage(const void* data, | |
| 1008 size_t size, | |
| 1009 unsigned int frame) | |
| 1010 { | |
| 1011 Clear(); | |
| 1012 image_ = OrthancPluginDecodeDicomImage(GetGlobalContext(), data, size, frame); | |
| 1013 if (image_ == NULL) | |
| 1014 { | |
| 1015 LogError("Cannot uncompress a DICOM image"); | |
| 1016 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange); | |
| 1017 } | |
| 1018 } | |
| 1019 | |
| 1020 | |
| 3236 | 1021 OrthancPluginPixelFormat OrthancImage::GetPixelFormat() const |
| 3028 | 1022 { |
| 1023 CheckImageAvailable(); | |
| 1024 return OrthancPluginGetImagePixelFormat(GetGlobalContext(), image_); | |
| 1025 } | |
| 1026 | |
| 1027 | |
| 3236 | 1028 unsigned int OrthancImage::GetWidth() const |
| 3028 | 1029 { |
| 1030 CheckImageAvailable(); | |
| 1031 return OrthancPluginGetImageWidth(GetGlobalContext(), image_); | |
| 1032 } | |
| 1033 | |
| 1034 | |
| 3236 | 1035 unsigned int OrthancImage::GetHeight() const |
| 3028 | 1036 { |
| 1037 CheckImageAvailable(); | |
| 1038 return OrthancPluginGetImageHeight(GetGlobalContext(), image_); | |
| 1039 } | |
| 1040 | |
| 1041 | |
| 3236 | 1042 unsigned int OrthancImage::GetPitch() const |
| 3028 | 1043 { |
| 1044 CheckImageAvailable(); | |
| 1045 return OrthancPluginGetImagePitch(GetGlobalContext(), image_); | |
| 1046 } | |
| 1047 | |
| 1048 | |
| 3236 | 1049 const void* OrthancImage::GetBuffer() const |
| 3028 | 1050 { |
| 1051 CheckImageAvailable(); | |
| 1052 return OrthancPluginGetImageBuffer(GetGlobalContext(), image_); | |
| 1053 } | |
| 1054 | |
| 1055 | |
| 3236 | 1056 void OrthancImage::CompressPngImage(MemoryBuffer& target) const |
| 3028 | 1057 { |
| 1058 CheckImageAvailable(); | |
| 1059 | |
| 3320 | 1060 OrthancPlugins::MemoryBuffer answer; |
| 1061 OrthancPluginCompressPngImage(GetGlobalContext(), *answer, GetPixelFormat(), | |
| 3028 | 1062 GetWidth(), GetHeight(), GetPitch(), GetBuffer()); |
| 1063 | |
| 3320 | 1064 target.Swap(answer); |
| 3028 | 1065 } |
| 1066 | |
| 1067 | |
| 1068 void OrthancImage::CompressJpegImage(MemoryBuffer& target, | |
| 3236 | 1069 uint8_t quality) const |
| 3028 | 1070 { |
| 1071 CheckImageAvailable(); | |
| 1072 | |
| 3320 | 1073 OrthancPlugins::MemoryBuffer answer; |
| 1074 OrthancPluginCompressJpegImage(GetGlobalContext(), *answer, GetPixelFormat(), | |
| 3028 | 1075 GetWidth(), GetHeight(), GetPitch(), GetBuffer(), quality); |
| 1076 | |
| 3320 | 1077 target.Swap(answer); |
| 3028 | 1078 } |
| 1079 | |
| 1080 | |
| 3236 | 1081 void OrthancImage::AnswerPngImage(OrthancPluginRestOutput* output) const |
| 3028 | 1082 { |
| 1083 CheckImageAvailable(); | |
| 1084 OrthancPluginCompressAndAnswerPngImage(GetGlobalContext(), output, GetPixelFormat(), | |
| 1085 GetWidth(), GetHeight(), GetPitch(), GetBuffer()); | |
| 1086 } | |
| 1087 | |
| 1088 | |
| 1089 void OrthancImage::AnswerJpegImage(OrthancPluginRestOutput* output, | |
| 3236 | 1090 uint8_t quality) const |
| 3028 | 1091 { |
| 1092 CheckImageAvailable(); | |
| 1093 OrthancPluginCompressAndAnswerJpegImage(GetGlobalContext(), output, GetPixelFormat(), | |
| 1094 GetWidth(), GetHeight(), GetPitch(), GetBuffer(), quality); | |
| 1095 } | |
| 1096 | |
| 1097 | |
| 1098 | |
| 1099 #if HAS_ORTHANC_PLUGIN_FIND_MATCHER == 1 | |
| 1100 FindMatcher::FindMatcher(const OrthancPluginWorklistQuery* worklist) : | |
| 1101 matcher_(NULL), | |
| 1102 worklist_(worklist) | |
| 1103 { | |
| 1104 if (worklist_ == NULL) | |
| 1105 { | |
| 1106 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange); | |
| 1107 } | |
| 1108 } | |
| 1109 | |
| 1110 | |
| 1111 void FindMatcher::SetupDicom(const void* query, | |
| 1112 uint32_t size) | |
| 1113 { | |
| 1114 worklist_ = NULL; | |
| 1115 | |
| 1116 matcher_ = OrthancPluginCreateFindMatcher(GetGlobalContext(), query, size); | |
| 1117 if (matcher_ == NULL) | |
| 1118 { | |
| 1119 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
| 1120 } | |
| 1121 } | |
| 1122 | |
| 1123 | |
| 1124 FindMatcher::~FindMatcher() | |
| 1125 { | |
| 1126 // The "worklist_" field | |
| 1127 | |
| 1128 if (matcher_ != NULL) | |
| 1129 { | |
| 1130 OrthancPluginFreeFindMatcher(GetGlobalContext(), matcher_); | |
| 1131 } | |
| 1132 } | |
| 1133 | |
| 1134 | |
| 1135 | |
| 1136 bool FindMatcher::IsMatch(const void* dicom, | |
| 1137 uint32_t size) const | |
| 1138 { | |
| 1139 int32_t result; | |
| 1140 | |
| 1141 if (matcher_ != NULL) | |
| 1142 { | |
| 1143 result = OrthancPluginFindMatcherIsMatch(GetGlobalContext(), matcher_, dicom, size); | |
| 1144 } | |
| 1145 else if (worklist_ != NULL) | |
| 1146 { | |
| 1147 result = OrthancPluginWorklistIsMatch(GetGlobalContext(), worklist_, dicom, size); | |
| 1148 } | |
| 1149 else | |
| 1150 { | |
| 1151 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
| 1152 } | |
| 1153 | |
| 1154 if (result == 0) | |
| 1155 { | |
| 1156 return false; | |
| 1157 } | |
| 1158 else if (result == 1) | |
| 1159 { | |
| 1160 return true; | |
| 1161 } | |
| 1162 else | |
| 1163 { | |
| 1164 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
| 1165 } | |
| 1166 } | |
| 1167 | |
| 1168 #endif /* HAS_ORTHANC_PLUGIN_FIND_MATCHER == 1 */ | |
| 1169 | |
| 1170 void AnswerJson(const Json::Value& value, | |
| 1171 OrthancPluginRestOutput* output | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1172 ) |
| 3028 | 1173 { |
| 1174 Json::StyledWriter writer; | |
| 1175 std::string bodyString = writer.write(value); | |
| 1176 | |
| 1177 OrthancPluginAnswerBuffer(GetGlobalContext(), output, bodyString.c_str(), bodyString.size(), "application/json"); | |
| 1178 } | |
| 1179 | |
| 1180 void AnswerString(const std::string& answer, | |
| 1181 const char* mimeType, | |
| 1182 OrthancPluginRestOutput* output | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1183 ) |
| 3028 | 1184 { |
| 1185 OrthancPluginAnswerBuffer(GetGlobalContext(), output, answer.c_str(), answer.size(), mimeType); | |
| 1186 } | |
| 1187 | |
| 1188 void AnswerHttpError(uint16_t httpError, OrthancPluginRestOutput *output) | |
| 1189 { | |
| 1190 OrthancPluginSendHttpStatusCode(GetGlobalContext(), output, httpError); | |
| 1191 } | |
| 1192 | |
| 1193 void AnswerMethodNotAllowed(OrthancPluginRestOutput *output, const char* allowedMethods) | |
| 1194 { | |
| 1195 OrthancPluginSendMethodNotAllowed(GetGlobalContext(), output, allowedMethods); | |
| 1196 } | |
| 1197 | |
| 1198 bool RestApiGetString(std::string& result, | |
| 1199 const std::string& uri, | |
| 1200 bool applyPlugins) | |
| 1201 { | |
| 1202 MemoryBuffer answer; | |
| 1203 if (!answer.RestApiGet(uri, applyPlugins)) | |
| 1204 { | |
| 1205 return false; | |
| 1206 } | |
| 1207 else | |
| 1208 { | |
| 1209 answer.ToString(result); | |
| 1210 return true; | |
| 1211 } | |
| 1212 } | |
| 1213 | |
| 1214 bool RestApiGetString(std::string& result, | |
| 1215 const std::string& uri, | |
| 1216 const std::map<std::string, std::string>& httpHeaders, | |
| 1217 bool applyPlugins) | |
| 1218 { | |
| 1219 MemoryBuffer answer; | |
| 1220 if (!answer.RestApiGet(uri, httpHeaders, applyPlugins)) | |
| 1221 { | |
| 1222 return false; | |
| 1223 } | |
| 1224 else | |
| 1225 { | |
| 1226 answer.ToString(result); | |
| 1227 return true; | |
| 1228 } | |
| 1229 } | |
| 1230 | |
| 1231 | |
| 1232 | |
| 1233 bool RestApiGet(Json::Value& result, | |
| 1234 const std::string& uri, | |
| 1235 bool applyPlugins) | |
| 1236 { | |
| 1237 MemoryBuffer answer; | |
| 1238 | |
| 1239 if (!answer.RestApiGet(uri, applyPlugins)) | |
| 1240 { | |
| 1241 return false; | |
| 1242 } | |
| 1243 else | |
| 1244 { | |
| 1245 if (!answer.IsEmpty()) | |
| 1246 { | |
| 1247 answer.ToJson(result); | |
| 1248 } | |
| 1249 return true; | |
| 1250 } | |
| 1251 } | |
| 1252 | |
| 1253 | |
| 1254 bool RestApiPost(Json::Value& result, | |
| 1255 const std::string& uri, | |
|
3400
0faae6f6e3c5
fixed some inconsistencies with pointer types in the plugin sdk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3399
diff
changeset
|
1256 const void* body, |
| 3028 | 1257 size_t bodySize, |
| 1258 bool applyPlugins) | |
| 1259 { | |
| 1260 MemoryBuffer answer; | |
| 1261 | |
| 1262 if (!answer.RestApiPost(uri, body, bodySize, applyPlugins)) | |
| 1263 { | |
| 1264 return false; | |
| 1265 } | |
| 1266 else | |
| 1267 { | |
| 1268 if (!answer.IsEmpty()) | |
| 1269 { | |
| 1270 answer.ToJson(result); | |
| 1271 } | |
| 1272 return true; | |
| 1273 } | |
| 1274 } | |
| 1275 | |
| 1276 | |
| 1277 bool RestApiPost(Json::Value& result, | |
| 1278 const std::string& uri, | |
| 1279 const Json::Value& body, | |
| 1280 bool applyPlugins) | |
| 1281 { | |
| 1282 Json::FastWriter writer; | |
| 1283 return RestApiPost(result, uri, writer.write(body), applyPlugins); | |
| 1284 } | |
| 1285 | |
| 1286 | |
| 1287 bool RestApiPut(Json::Value& result, | |
| 1288 const std::string& uri, | |
|
3400
0faae6f6e3c5
fixed some inconsistencies with pointer types in the plugin sdk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3399
diff
changeset
|
1289 const void* body, |
| 3028 | 1290 size_t bodySize, |
| 1291 bool applyPlugins) | |
| 1292 { | |
| 1293 MemoryBuffer answer; | |
| 1294 | |
| 1295 if (!answer.RestApiPut(uri, body, bodySize, applyPlugins)) | |
| 1296 { | |
| 1297 return false; | |
| 1298 } | |
| 1299 else | |
| 1300 { | |
|
3422
8b4169a88039
ORTHANC_PLUGINS_API using visibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3421
diff
changeset
|
1301 if (!answer.IsEmpty()) // i.e, on a PUT to metadata/..., orthanc returns an empty response |
| 3028 | 1302 { |
| 1303 answer.ToJson(result); | |
| 1304 } | |
| 1305 return true; | |
| 1306 } | |
| 1307 } | |
| 1308 | |
| 1309 | |
| 1310 bool RestApiPut(Json::Value& result, | |
| 1311 const std::string& uri, | |
| 1312 const Json::Value& body, | |
| 1313 bool applyPlugins) | |
| 1314 { | |
| 1315 Json::FastWriter writer; | |
| 1316 return RestApiPut(result, uri, writer.write(body), applyPlugins); | |
| 1317 } | |
| 1318 | |
| 1319 | |
| 1320 bool RestApiDelete(const std::string& uri, | |
| 1321 bool applyPlugins) | |
| 1322 { | |
| 1323 OrthancPluginErrorCode error; | |
| 1324 | |
| 1325 if (applyPlugins) | |
| 1326 { | |
| 1327 error = OrthancPluginRestApiDeleteAfterPlugins(GetGlobalContext(), uri.c_str()); | |
| 1328 } | |
| 1329 else | |
| 1330 { | |
| 1331 error = OrthancPluginRestApiDelete(GetGlobalContext(), uri.c_str()); | |
| 1332 } | |
| 1333 | |
| 1334 if (error == OrthancPluginErrorCode_Success) | |
| 1335 { | |
| 1336 return true; | |
| 1337 } | |
| 1338 else if (error == OrthancPluginErrorCode_UnknownResource || | |
| 1339 error == OrthancPluginErrorCode_InexistentItem) | |
| 1340 { | |
| 1341 return false; | |
| 1342 } | |
| 1343 else | |
| 1344 { | |
| 1345 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(error); | |
| 1346 } | |
| 1347 } | |
| 1348 | |
| 1349 | |
| 1350 void ReportMinimalOrthancVersion(unsigned int major, | |
| 1351 unsigned int minor, | |
| 1352 unsigned int revision) | |
| 1353 { | |
| 1354 LogError("Your version of the Orthanc core (" + | |
| 1355 std::string(GetGlobalContext()->orthancVersion) + | |
| 1356 ") is too old to run this plugin (version " + | |
| 1357 boost::lexical_cast<std::string>(major) + "." + | |
| 1358 boost::lexical_cast<std::string>(minor) + "." + | |
| 1359 boost::lexical_cast<std::string>(revision) + | |
| 1360 " is required)"); | |
| 1361 } | |
| 1362 | |
| 1363 | |
| 1364 bool CheckMinimalOrthancVersion(unsigned int major, | |
| 1365 unsigned int minor, | |
| 1366 unsigned int revision) | |
| 1367 { | |
| 1368 if (!HasGlobalContext()) | |
| 1369 { | |
| 1370 LogError("Bad Orthanc context in the plugin"); | |
| 1371 return false; | |
| 1372 } | |
| 1373 | |
| 1374 if (!strcmp(GetGlobalContext()->orthancVersion, "mainline")) | |
| 1375 { | |
| 1376 // Assume compatibility with the mainline | |
| 1377 return true; | |
| 1378 } | |
| 1379 | |
| 1380 // Parse the version of the Orthanc core | |
| 1381 int aa, bb, cc; | |
| 1382 if ( | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1383 #ifdef _MSC_VER |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1384 sscanf_s |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1385 #else |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1386 sscanf |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1387 #endif |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1388 (GetGlobalContext()->orthancVersion, "%4d.%4d.%4d", &aa, &bb, &cc) != 3 || |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1389 aa < 0 || |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1390 bb < 0 || |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1391 cc < 0) |
| 3028 | 1392 { |
| 1393 return false; | |
| 1394 } | |
| 1395 | |
| 1396 unsigned int a = static_cast<unsigned int>(aa); | |
| 1397 unsigned int b = static_cast<unsigned int>(bb); | |
| 1398 unsigned int c = static_cast<unsigned int>(cc); | |
| 1399 | |
| 1400 // Check the major version number | |
| 1401 | |
| 1402 if (a > major) | |
| 3026 | 1403 { |
| 1404 return true; | |
| 1405 } | |
| 1406 | |
| 3028 | 1407 if (a < major) |
| 1408 { | |
| 1409 return false; | |
| 1410 } | |
| 1411 | |
|
2792
57e2d65d37ce
OrthancPlugins::MemoryBuffer::Release(), fixing openssl link
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
1412 |
| 3028 | 1413 // Check the minor version number |
| 1414 assert(a == major); | |
| 1415 | |
| 1416 if (b > minor) | |
| 3026 | 1417 { |
| 1418 return true; | |
| 1419 } | |
|
2792
57e2d65d37ce
OrthancPlugins::MemoryBuffer::Release(), fixing openssl link
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
1420 |
| 3028 | 1421 if (b < minor) |
| 3026 | 1422 { |
| 3028 | 1423 return false; |
| 3026 | 1424 } |
| 1425 | |
| 3028 | 1426 // Check the patch level version number |
| 1427 assert(a == major && b == minor); | |
| 3026 | 1428 |
| 3028 | 1429 if (c >= revision) |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1430 { |
| 3028 | 1431 return true; |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1432 } |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1433 else |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1434 { |
| 3028 | 1435 return false; |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1436 } |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1437 } |
|
2058
43cd2ab060c7
cont OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2048
diff
changeset
|
1438 |
|
43cd2ab060c7
cont OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2048
diff
changeset
|
1439 |
| 3028 | 1440 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 5, 0) |
| 1441 const char* AutodetectMimeType(const std::string& path) | |
| 3026 | 1442 { |
| 3028 | 1443 const char* mime = OrthancPluginAutodetectMimeType(GetGlobalContext(), path.c_str()); |
|
2062
40ffd0e8676a
generation of etag in ServeFolders
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2059
diff
changeset
|
1444 |
| 3028 | 1445 if (mime == NULL) |
| 1446 { | |
| 1447 // Should never happen, just for safety | |
| 1448 return "application/octet-stream"; | |
| 1449 } | |
| 1450 else | |
| 1451 { | |
| 1452 return mime; | |
| 1453 } | |
| 2848 | 1454 } |
| 3026 | 1455 #endif |
| 1456 | |
| 1457 | |
| 1458 #if HAS_ORTHANC_PLUGIN_PEERS == 1 | |
| 3028 | 1459 size_t OrthancPeers::GetPeerIndex(const std::string& name) const |
| 3026 | 1460 { |
| 3028 | 1461 size_t index; |
| 1462 if (LookupName(index, name)) | |
| 1463 { | |
| 1464 return index; | |
| 1465 } | |
| 1466 else | |
| 1467 { | |
| 1468 LogError("Inexistent peer: " + name); | |
| 1469 ORTHANC_PLUGINS_THROW_EXCEPTION(UnknownResource); | |
| 1470 } | |
| 3026 | 1471 } |
| 2059 | 1472 |
| 1473 | |
| 3028 | 1474 OrthancPeers::OrthancPeers() : |
| 1475 peers_(NULL), | |
| 1476 timeout_(0) | |
|
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2177
diff
changeset
|
1477 { |
| 3028 | 1478 peers_ = OrthancPluginGetPeers(GetGlobalContext()); |
| 3026 | 1479 |
| 3028 | 1480 if (peers_ == NULL) |
| 3026 | 1481 { |
| 1482 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin); | |
| 1483 } | |
| 1484 | |
| 3028 | 1485 uint32_t count = OrthancPluginGetPeersCount(GetGlobalContext(), peers_); |
| 1486 | |
| 1487 for (uint32_t i = 0; i < count; i++) | |
| 1488 { | |
| 1489 const char* name = OrthancPluginGetPeerName(GetGlobalContext(), peers_, i); | |
| 1490 if (name == NULL) | |
| 1491 { | |
| 1492 OrthancPluginFreePeers(GetGlobalContext(), peers_); | |
| 1493 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin); | |
| 1494 } | |
| 1495 | |
| 1496 index_[name] = i; | |
| 1497 } | |
| 1498 } | |
| 1499 | |
| 1500 | |
| 1501 OrthancPeers::~OrthancPeers() | |
| 1502 { | |
| 1503 if (peers_ != NULL) | |
| 1504 { | |
| 1505 OrthancPluginFreePeers(GetGlobalContext(), peers_); | |
| 1506 } | |
| 1507 } | |
| 1508 | |
| 1509 | |
| 1510 bool OrthancPeers::LookupName(size_t& target, | |
| 1511 const std::string& name) const | |
| 1512 { | |
| 1513 Index::const_iterator found = index_.find(name); | |
| 1514 | |
| 1515 if (found == index_.end()) | |
| 1516 { | |
| 1517 return false; | |
| 1518 } | |
| 1519 else | |
| 1520 { | |
| 1521 target = found->second; | |
| 1522 return true; | |
| 1523 } | |
| 3026 | 1524 } |
| 3028 | 1525 |
| 1526 | |
| 1527 std::string OrthancPeers::GetPeerName(size_t index) const | |
| 1528 { | |
| 1529 if (index >= index_.size()) | |
| 1530 { | |
| 1531 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
| 1532 } | |
| 1533 else | |
| 1534 { | |
| 1535 const char* s = OrthancPluginGetPeerName(GetGlobalContext(), peers_, static_cast<uint32_t>(index)); | |
| 1536 if (s == NULL) | |
| 1537 { | |
| 1538 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin); | |
| 1539 } | |
| 1540 else | |
| 1541 { | |
| 1542 return s; | |
| 1543 } | |
| 1544 } | |
| 1545 } | |
| 1546 | |
| 1547 | |
| 1548 std::string OrthancPeers::GetPeerUrl(size_t index) const | |
| 1549 { | |
| 1550 if (index >= index_.size()) | |
| 1551 { | |
| 1552 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
| 1553 } | |
| 1554 else | |
| 1555 { | |
| 1556 const char* s = OrthancPluginGetPeerUrl(GetGlobalContext(), peers_, static_cast<uint32_t>(index)); | |
| 1557 if (s == NULL) | |
| 1558 { | |
| 1559 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin); | |
| 1560 } | |
| 1561 else | |
| 1562 { | |
| 1563 return s; | |
| 1564 } | |
| 1565 } | |
| 1566 } | |
| 1567 | |
| 1568 | |
| 1569 std::string OrthancPeers::GetPeerUrl(const std::string& name) const | |
| 1570 { | |
| 1571 return GetPeerUrl(GetPeerIndex(name)); | |
| 1572 } | |
| 1573 | |
| 1574 | |
| 1575 bool OrthancPeers::LookupUserProperty(std::string& value, | |
| 1576 size_t index, | |
| 1577 const std::string& key) const | |
| 1578 { | |
| 1579 if (index >= index_.size()) | |
| 1580 { | |
| 1581 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
| 1582 } | |
| 1583 else | |
| 1584 { | |
| 1585 const char* s = OrthancPluginGetPeerUserProperty(GetGlobalContext(), peers_, static_cast<uint32_t>(index), key.c_str()); | |
| 1586 if (s == NULL) | |
| 1587 { | |
| 1588 return false; | |
| 1589 } | |
| 1590 else | |
| 1591 { | |
| 1592 value.assign(s); | |
| 1593 return true; | |
| 1594 } | |
| 1595 } | |
| 1596 } | |
| 1597 | |
| 1598 | |
| 1599 bool OrthancPeers::LookupUserProperty(std::string& value, | |
| 1600 const std::string& peer, | |
| 1601 const std::string& key) const | |
| 1602 { | |
| 1603 return LookupUserProperty(value, GetPeerIndex(peer), key); | |
| 1604 } | |
| 3026 | 1605 |
|
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2177
diff
changeset
|
1606 |
| 3028 | 1607 bool OrthancPeers::DoGet(MemoryBuffer& target, |
| 1608 size_t index, | |
| 1609 const std::string& uri) const | |
| 1610 { | |
| 1611 if (index >= index_.size()) | |
| 1612 { | |
| 1613 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
| 1614 } | |
| 1615 | |
| 3320 | 1616 OrthancPlugins::MemoryBuffer answer; |
| 3028 | 1617 uint16_t status; |
| 1618 OrthancPluginErrorCode code = OrthancPluginCallPeerApi | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1619 (GetGlobalContext(), *answer, NULL, &status, peers_, |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1620 static_cast<uint32_t>(index), OrthancPluginHttpMethod_Get, uri.c_str(), |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1621 0, NULL, NULL, NULL, 0, timeout_); |
| 3028 | 1622 |
| 1623 if (code == OrthancPluginErrorCode_Success) | |
| 1624 { | |
| 3320 | 1625 target.Swap(answer); |
| 3028 | 1626 return (status == 200); |
| 1627 } | |
| 1628 else | |
| 1629 { | |
| 1630 return false; | |
| 1631 } | |
| 1632 } | |
| 1633 | |
| 1634 | |
| 1635 bool OrthancPeers::DoGet(MemoryBuffer& target, | |
| 1636 const std::string& name, | |
| 1637 const std::string& uri) const | |
| 1638 { | |
| 1639 size_t index; | |
| 1640 return (LookupName(index, name) && | |
| 1641 DoGet(target, index, uri)); | |
| 1642 } | |
| 1643 | |
| 1644 | |
| 1645 bool OrthancPeers::DoGet(Json::Value& target, | |
| 1646 size_t index, | |
| 1647 const std::string& uri) const | |
| 1648 { | |
| 1649 MemoryBuffer buffer; | |
| 1650 | |
| 1651 if (DoGet(buffer, index, uri)) | |
| 1652 { | |
| 1653 buffer.ToJson(target); | |
| 1654 return true; | |
| 1655 } | |
| 1656 else | |
| 1657 { | |
| 1658 return false; | |
| 1659 } | |
| 1660 } | |
| 1661 | |
| 1662 | |
| 1663 bool OrthancPeers::DoGet(Json::Value& target, | |
| 1664 const std::string& name, | |
| 1665 const std::string& uri) const | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1666 { |
| 3028 | 1667 MemoryBuffer buffer; |
| 1668 | |
| 1669 if (DoGet(buffer, name, uri)) | |
| 1670 { | |
| 1671 buffer.ToJson(target); | |
| 1672 return true; | |
| 1673 } | |
| 1674 else | |
| 1675 { | |
| 1676 return false; | |
| 1677 } | |
| 1678 } | |
| 1679 | |
| 1680 | |
| 1681 bool OrthancPeers::DoPost(MemoryBuffer& target, | |
| 1682 const std::string& name, | |
| 1683 const std::string& uri, | |
| 1684 const std::string& body) const | |
| 1685 { | |
| 1686 size_t index; | |
| 1687 return (LookupName(index, name) && | |
| 1688 DoPost(target, index, uri, body)); | |
| 1689 } | |
| 1690 | |
| 1691 | |
| 1692 bool OrthancPeers::DoPost(Json::Value& target, | |
| 1693 size_t index, | |
| 1694 const std::string& uri, | |
| 1695 const std::string& body) const | |
| 1696 { | |
| 1697 MemoryBuffer buffer; | |
| 1698 | |
| 1699 if (DoPost(buffer, index, uri, body)) | |
| 1700 { | |
| 1701 buffer.ToJson(target); | |
| 1702 return true; | |
| 1703 } | |
| 1704 else | |
| 1705 { | |
| 1706 return false; | |
| 1707 } | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1708 } |
| 3028 | 1709 |
| 1710 | |
| 1711 bool OrthancPeers::DoPost(Json::Value& target, | |
| 1712 const std::string& name, | |
| 1713 const std::string& uri, | |
| 1714 const std::string& body) const | |
| 1715 { | |
| 1716 MemoryBuffer buffer; | |
| 1717 | |
| 1718 if (DoPost(buffer, name, uri, body)) | |
| 1719 { | |
| 1720 buffer.ToJson(target); | |
| 1721 return true; | |
| 1722 } | |
| 1723 else | |
| 1724 { | |
| 1725 return false; | |
| 1726 } | |
| 1727 } | |
| 1728 | |
| 1729 | |
| 1730 bool OrthancPeers::DoPost(MemoryBuffer& target, | |
| 1731 size_t index, | |
| 1732 const std::string& uri, | |
| 1733 const std::string& body) const | |
| 1734 { | |
| 1735 if (index >= index_.size()) | |
| 1736 { | |
| 1737 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
| 1738 } | |
| 1739 | |
| 3320 | 1740 OrthancPlugins::MemoryBuffer answer; |
| 3028 | 1741 uint16_t status; |
| 1742 OrthancPluginErrorCode code = OrthancPluginCallPeerApi | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1743 (GetGlobalContext(), *answer, NULL, &status, peers_, |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1744 static_cast<uint32_t>(index), OrthancPluginHttpMethod_Post, uri.c_str(), |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1745 0, NULL, NULL, body.empty() ? NULL : body.c_str(), body.size(), timeout_); |
| 3028 | 1746 |
| 1747 if (code == OrthancPluginErrorCode_Success) | |
| 1748 { | |
| 3320 | 1749 target.Swap(answer); |
| 3028 | 1750 return (status == 200); |
| 1751 } | |
| 1752 else | |
| 1753 { | |
| 1754 return false; | |
| 1755 } | |
| 1756 } | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1757 |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1758 |
| 3028 | 1759 bool OrthancPeers::DoPut(size_t index, |
| 1760 const std::string& uri, | |
| 1761 const std::string& body) const | |
| 1762 { | |
| 1763 if (index >= index_.size()) | |
| 1764 { | |
| 1765 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
| 1766 } | |
| 1767 | |
| 3320 | 1768 OrthancPlugins::MemoryBuffer answer; |
| 3028 | 1769 uint16_t status; |
| 1770 OrthancPluginErrorCode code = OrthancPluginCallPeerApi | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1771 (GetGlobalContext(), *answer, NULL, &status, peers_, |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1772 static_cast<uint32_t>(index), OrthancPluginHttpMethod_Put, uri.c_str(), |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1773 0, NULL, NULL, body.empty() ? NULL : body.c_str(), body.size(), timeout_); |
| 3026 | 1774 |
| 3028 | 1775 if (code == OrthancPluginErrorCode_Success) |
| 1776 { | |
| 1777 return (status == 200); | |
| 1778 } | |
| 1779 else | |
| 1780 { | |
| 1781 return false; | |
| 1782 } | |
| 1783 } | |
| 1784 | |
| 1785 | |
| 1786 bool OrthancPeers::DoPut(const std::string& name, | |
| 1787 const std::string& uri, | |
| 1788 const std::string& body) const | |
| 1789 { | |
| 1790 size_t index; | |
| 1791 return (LookupName(index, name) && | |
| 1792 DoPut(index, uri, body)); | |
| 1793 } | |
| 1794 | |
| 1795 | |
| 1796 bool OrthancPeers::DoDelete(size_t index, | |
| 1797 const std::string& uri) const | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1798 { |
| 3028 | 1799 if (index >= index_.size()) |
| 1800 { | |
| 1801 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
| 1802 } | |
| 1803 | |
| 3320 | 1804 OrthancPlugins::MemoryBuffer answer; |
| 3028 | 1805 uint16_t status; |
| 1806 OrthancPluginErrorCode code = OrthancPluginCallPeerApi | |
| 3320 | 1807 (GetGlobalContext(), *answer, NULL, &status, peers_, |
| 1808 static_cast<uint32_t>(index), OrthancPluginHttpMethod_Delete, uri.c_str(), | |
| 1809 0, NULL, NULL, NULL, 0, timeout_); | |
| 3028 | 1810 |
| 1811 if (code == OrthancPluginErrorCode_Success) | |
| 1812 { | |
| 1813 return (status == 200); | |
| 1814 } | |
| 1815 else | |
| 1816 { | |
| 1817 return false; | |
| 1818 } | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1819 } |
| 3028 | 1820 |
| 1821 | |
| 1822 bool OrthancPeers::DoDelete(const std::string& name, | |
| 1823 const std::string& uri) const | |
| 3026 | 1824 { |
| 3028 | 1825 size_t index; |
| 1826 return (LookupName(index, name) && | |
| 1827 DoDelete(index, uri)); | |
| 1828 } | |
| 1829 #endif | |
| 1830 | |
| 1831 | |
| 1832 | |
|
3397
9019279dbfd7
new plugin c++ wrapper: MultipartRestCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3394
diff
changeset
|
1833 |
|
9019279dbfd7
new plugin c++ wrapper: MultipartRestCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3394
diff
changeset
|
1834 |
|
9019279dbfd7
new plugin c++ wrapper: MultipartRestCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3394
diff
changeset
|
1835 /****************************************************************** |
|
9019279dbfd7
new plugin c++ wrapper: MultipartRestCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3394
diff
changeset
|
1836 ** JOBS |
|
9019279dbfd7
new plugin c++ wrapper: MultipartRestCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3394
diff
changeset
|
1837 ******************************************************************/ |
|
9019279dbfd7
new plugin c++ wrapper: MultipartRestCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3394
diff
changeset
|
1838 |
| 3028 | 1839 #if HAS_ORTHANC_PLUGIN_JOB == 1 |
| 1840 void OrthancJob::CallbackFinalize(void* job) | |
| 1841 { | |
| 1842 if (job != NULL) | |
| 1843 { | |
| 1844 delete reinterpret_cast<OrthancJob*>(job); | |
| 1845 } | |
| 3026 | 1846 } |
| 3028 | 1847 |
| 1848 | |
| 1849 float OrthancJob::CallbackGetProgress(void* job) | |
| 1850 { | |
| 1851 assert(job != NULL); | |
| 1852 | |
| 1853 try | |
| 1854 { | |
| 1855 return reinterpret_cast<OrthancJob*>(job)->progress_; | |
| 1856 } | |
| 1857 catch (...) | |
| 1858 { | |
| 1859 return 0; | |
| 1860 } | |
| 1861 } | |
| 1862 | |
| 1863 | |
| 1864 const char* OrthancJob::CallbackGetContent(void* job) | |
| 1865 { | |
| 1866 assert(job != NULL); | |
| 1867 | |
| 1868 try | |
| 1869 { | |
| 1870 return reinterpret_cast<OrthancJob*>(job)->content_.c_str(); | |
| 1871 } | |
| 1872 catch (...) | |
| 1873 { | |
| 1874 return 0; | |
| 1875 } | |
| 1876 } | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1877 |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1878 |
| 3028 | 1879 const char* OrthancJob::CallbackGetSerialized(void* job) |
| 1880 { | |
| 1881 assert(job != NULL); | |
| 1882 | |
| 1883 try | |
| 1884 { | |
| 1885 const OrthancJob& tmp = *reinterpret_cast<OrthancJob*>(job); | |
| 1886 | |
| 1887 if (tmp.hasSerialized_) | |
| 1888 { | |
| 1889 return tmp.serialized_.c_str(); | |
| 1890 } | |
| 1891 else | |
| 1892 { | |
| 1893 return NULL; | |
| 1894 } | |
| 1895 } | |
| 1896 catch (...) | |
| 1897 { | |
| 1898 return 0; | |
| 1899 } | |
| 1900 } | |
| 1901 | |
| 1902 | |
| 1903 OrthancPluginJobStepStatus OrthancJob::CallbackStep(void* job) | |
| 1904 { | |
| 1905 assert(job != NULL); | |
| 1906 | |
| 1907 try | |
| 1908 { | |
| 1909 return reinterpret_cast<OrthancJob*>(job)->Step(); | |
| 1910 } | |
| 1911 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS&) | |
| 1912 { | |
| 1913 return OrthancPluginJobStepStatus_Failure; | |
| 1914 } | |
| 1915 catch (...) | |
| 1916 { | |
| 1917 return OrthancPluginJobStepStatus_Failure; | |
| 1918 } | |
| 1919 } | |
| 1920 | |
| 1921 | |
| 1922 OrthancPluginErrorCode OrthancJob::CallbackStop(void* job, | |
| 1923 OrthancPluginJobStopReason reason) | |
| 1924 { | |
| 1925 assert(job != NULL); | |
| 1926 | |
| 1927 try | |
| 1928 { | |
| 1929 reinterpret_cast<OrthancJob*>(job)->Stop(reason); | |
| 1930 return OrthancPluginErrorCode_Success; | |
| 1931 } | |
| 1932 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) | |
| 1933 { | |
| 1934 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); | |
| 1935 } | |
| 1936 catch (...) | |
| 1937 { | |
| 1938 return OrthancPluginErrorCode_Plugin; | |
| 1939 } | |
| 1940 } | |
| 1941 | |
| 1942 | |
| 1943 OrthancPluginErrorCode OrthancJob::CallbackReset(void* job) | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1944 { |
| 3028 | 1945 assert(job != NULL); |
| 1946 | |
| 1947 try | |
| 1948 { | |
| 1949 reinterpret_cast<OrthancJob*>(job)->Reset(); | |
| 1950 return OrthancPluginErrorCode_Success; | |
| 1951 } | |
| 1952 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) | |
| 1953 { | |
| 1954 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); | |
| 1955 } | |
| 1956 catch (...) | |
| 1957 { | |
| 1958 return OrthancPluginErrorCode_Plugin; | |
| 1959 } | |
| 1960 } | |
| 1961 | |
| 1962 | |
| 1963 void OrthancJob::ClearContent() | |
| 1964 { | |
| 1965 Json::Value empty = Json::objectValue; | |
| 1966 UpdateContent(empty); | |
| 1967 } | |
| 1968 | |
| 1969 | |
| 1970 void OrthancJob::UpdateContent(const Json::Value& content) | |
| 1971 { | |
| 1972 if (content.type() != Json::objectValue) | |
| 1973 { | |
| 1974 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_BadFileFormat); | |
| 1975 } | |
| 1976 else | |
| 1977 { | |
| 1978 Json::FastWriter writer; | |
| 1979 content_ = writer.write(content); | |
| 1980 } | |
| 1981 } | |
| 1982 | |
| 1983 | |
| 1984 void OrthancJob::ClearSerialized() | |
| 1985 { | |
| 1986 hasSerialized_ = false; | |
| 1987 serialized_.clear(); | |
| 3026 | 1988 } |
| 3028 | 1989 |
| 1990 | |
| 1991 void OrthancJob::UpdateSerialized(const Json::Value& serialized) | |
| 1992 { | |
| 1993 if (serialized.type() != Json::objectValue) | |
| 1994 { | |
| 1995 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_BadFileFormat); | |
| 1996 } | |
| 1997 else | |
| 1998 { | |
| 1999 Json::FastWriter writer; | |
| 2000 serialized_ = writer.write(serialized); | |
| 2001 hasSerialized_ = true; | |
| 2002 } | |
| 2003 } | |
| 2004 | |
| 2005 | |
| 2006 void OrthancJob::UpdateProgress(float progress) | |
| 3026 | 2007 { |
| 3028 | 2008 if (progress < 0 || |
| 2009 progress > 1) | |
| 2010 { | |
| 2011 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
| 2012 } | |
| 2013 | |
| 2014 progress_ = progress; | |
| 2015 } | |
| 2016 | |
| 2017 | |
| 2018 OrthancJob::OrthancJob(const std::string& jobType) : | |
| 2019 jobType_(jobType), | |
| 2020 progress_(0) | |
| 2021 { | |
| 2022 ClearContent(); | |
| 2023 ClearSerialized(); | |
| 2024 } | |
| 2025 | |
| 2026 | |
| 2027 OrthancPluginJob* OrthancJob::Create(OrthancJob* job) | |
| 2028 { | |
| 2029 if (job == NULL) | |
| 2030 { | |
| 2031 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_NullPointer); | |
| 2032 } | |
| 2033 | |
| 2034 OrthancPluginJob* orthanc = OrthancPluginCreateJob( | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2035 GetGlobalContext(), job, CallbackFinalize, job->jobType_.c_str(), |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2036 CallbackGetProgress, CallbackGetContent, CallbackGetSerialized, |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2037 CallbackStep, CallbackStop, CallbackReset); |
| 3028 | 2038 |
| 2039 if (orthanc == NULL) | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2040 { |
| 3026 | 2041 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin); |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2042 } |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2043 else |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2044 { |
| 3028 | 2045 return orthanc; |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2046 } |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2047 } |
|
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2177
diff
changeset
|
2048 |
|
2264
8e5e0de75839
primitives for HTTP client in plugin C++ wrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2263
diff
changeset
|
2049 |
| 3028 | 2050 std::string OrthancJob::Submit(OrthancJob* job, |
| 2051 int priority) | |
|
2264
8e5e0de75839
primitives for HTTP client in plugin C++ wrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2263
diff
changeset
|
2052 { |
| 3028 | 2053 OrthancPluginJob* orthanc = Create(job); |
| 2054 | |
| 2055 char* id = OrthancPluginSubmitJob(GetGlobalContext(), orthanc, priority); | |
| 2056 | |
| 2057 if (id == NULL) | |
| 3026 | 2058 { |
| 3028 | 2059 LogError("Plugin cannot submit job"); |
| 2060 OrthancPluginFreeJob(GetGlobalContext(), orthanc); | |
| 3026 | 2061 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin); |
| 2062 } | |
| 2063 else | |
| 2064 { | |
| 3028 | 2065 std::string tmp(id); |
| 2066 tmp.assign(id); | |
| 2067 OrthancPluginFreeString(GetGlobalContext(), id); | |
| 3026 | 2068 |
| 3028 | 2069 return tmp; |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2070 } |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2071 } |
|
2817
473bf302d629
C++ wrappers around OrthancPluginJob and OrthancPluginPeers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2803
diff
changeset
|
2072 #endif |
|
3179
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2073 |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2074 |
|
3397
9019279dbfd7
new plugin c++ wrapper: MultipartRestCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3394
diff
changeset
|
2075 |
|
9019279dbfd7
new plugin c++ wrapper: MultipartRestCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3394
diff
changeset
|
2076 |
|
9019279dbfd7
new plugin c++ wrapper: MultipartRestCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3394
diff
changeset
|
2077 /****************************************************************** |
|
9019279dbfd7
new plugin c++ wrapper: MultipartRestCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3394
diff
changeset
|
2078 ** METRICS |
|
9019279dbfd7
new plugin c++ wrapper: MultipartRestCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3394
diff
changeset
|
2079 ******************************************************************/ |
|
9019279dbfd7
new plugin c++ wrapper: MultipartRestCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3394
diff
changeset
|
2080 |
|
3179
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2081 #if HAS_ORTHANC_PLUGIN_METRICS == 1 |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2082 MetricsTimer::MetricsTimer(const char* name) : |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2083 name_(name) |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2084 { |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2085 start_ = boost::posix_time::microsec_clock::universal_time(); |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2086 } |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2087 |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2088 MetricsTimer::~MetricsTimer() |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2089 { |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2090 const boost::posix_time::ptime stop = boost::posix_time::microsec_clock::universal_time(); |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2091 const boost::posix_time::time_duration diff = stop - start_; |
| 3418 | 2092 OrthancPluginSetMetricsValue(GetGlobalContext(), name_.c_str(), static_cast<float>(diff.total_milliseconds()), |
|
3179
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2093 OrthancPluginMetricsType_Timer); |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2094 } |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2095 #endif |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2096 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2097 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2098 |
|
3397
9019279dbfd7
new plugin c++ wrapper: MultipartRestCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3394
diff
changeset
|
2099 |
|
9019279dbfd7
new plugin c++ wrapper: MultipartRestCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3394
diff
changeset
|
2100 /****************************************************************** |
|
9019279dbfd7
new plugin c++ wrapper: MultipartRestCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3394
diff
changeset
|
2101 ** HTTP CLIENT |
|
9019279dbfd7
new plugin c++ wrapper: MultipartRestCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3394
diff
changeset
|
2102 ******************************************************************/ |
|
9019279dbfd7
new plugin c++ wrapper: MultipartRestCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3394
diff
changeset
|
2103 |
| 3388 | 2104 #if HAS_ORTHANC_PLUGIN_HTTP_CLIENT == 1 |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2105 class HttpClient::RequestBodyWrapper : public boost::noncopyable |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2106 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2107 private: |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2108 static RequestBodyWrapper& GetObject(void* body) |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2109 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2110 assert(body != NULL); |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2111 return *reinterpret_cast<RequestBodyWrapper*>(body); |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2112 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2113 |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2114 IRequestBody& body_; |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2115 bool done_; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2116 std::string chunk_; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2117 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2118 public: |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2119 RequestBodyWrapper(IRequestBody& body) : |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2120 body_(body), |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2121 done_(false) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2122 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2123 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2124 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2125 static uint8_t IsDone(void* body) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2126 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2127 return GetObject(body).done_; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2128 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2129 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2130 static const void* GetChunkData(void* body) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2131 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2132 return GetObject(body).chunk_.c_str(); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2133 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2134 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2135 static uint32_t GetChunkSize(void* body) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2136 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2137 return static_cast<uint32_t>(GetObject(body).chunk_.size()); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2138 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2139 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2140 static OrthancPluginErrorCode Next(void* body) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2141 { |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2142 RequestBodyWrapper& that = GetObject(body); |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2143 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2144 if (that.done_) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2145 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2146 return OrthancPluginErrorCode_BadSequenceOfCalls; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2147 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2148 else |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2149 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2150 try |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2151 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2152 that.done_ = !that.body_.ReadNextChunk(that.chunk_); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2153 return OrthancPluginErrorCode_Success; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2154 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2155 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2156 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2157 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2158 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2159 catch (...) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2160 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2161 return OrthancPluginErrorCode_InternalError; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2162 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2163 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2164 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2165 }; |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2166 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2167 |
| 3413 | 2168 #if HAS_ORTHANC_PLUGIN_CHUNKED_HTTP_CLIENT == 1 |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2169 static OrthancPluginErrorCode AnswerAddHeaderCallback(void* answer, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2170 const char* key, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2171 const char* value) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2172 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2173 assert(answer != NULL && key != NULL && value != NULL); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2174 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2175 try |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2176 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2177 reinterpret_cast<HttpClient::IAnswer*>(answer)->AddHeader(key, value); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2178 return OrthancPluginErrorCode_Success; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2179 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2180 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2181 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2182 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2183 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2184 catch (...) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2185 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2186 return OrthancPluginErrorCode_Plugin; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2187 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2188 } |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2189 #endif |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2190 |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2191 |
| 3413 | 2192 #if HAS_ORTHANC_PLUGIN_CHUNKED_HTTP_CLIENT == 1 |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2193 static OrthancPluginErrorCode AnswerAddChunkCallback(void* answer, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2194 const void* data, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2195 uint32_t size) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2196 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2197 assert(answer != NULL); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2198 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2199 try |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2200 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2201 reinterpret_cast<HttpClient::IAnswer*>(answer)->AddChunk(data, size); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2202 return OrthancPluginErrorCode_Success; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2203 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2204 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2205 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2206 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2207 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2208 catch (...) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2209 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2210 return OrthancPluginErrorCode_Plugin; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2211 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2212 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2213 #endif |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2214 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2215 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2216 HttpClient::HttpClient() : |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2217 httpStatus_(0), |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2218 method_(OrthancPluginHttpMethod_Get), |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2219 timeout_(0), |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2220 pkcs11_(false), |
| 3413 | 2221 chunkedBody_(NULL) |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2222 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2223 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2224 |
|
3426
00737cd21f40
OrthancPlugins::HttpClient::AddHeaders()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3422
diff
changeset
|
2225 |
|
00737cd21f40
OrthancPlugins::HttpClient::AddHeaders()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3422
diff
changeset
|
2226 void HttpClient::AddHeaders(const HttpHeaders& headers) |
|
00737cd21f40
OrthancPlugins::HttpClient::AddHeaders()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3422
diff
changeset
|
2227 { |
|
00737cd21f40
OrthancPlugins::HttpClient::AddHeaders()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3422
diff
changeset
|
2228 for (HttpHeaders::const_iterator it = headers.begin(); |
|
00737cd21f40
OrthancPlugins::HttpClient::AddHeaders()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3422
diff
changeset
|
2229 it != headers.end(); ++it) |
|
00737cd21f40
OrthancPlugins::HttpClient::AddHeaders()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3422
diff
changeset
|
2230 { |
|
00737cd21f40
OrthancPlugins::HttpClient::AddHeaders()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3422
diff
changeset
|
2231 headers_[it->first] = it->second; |
|
00737cd21f40
OrthancPlugins::HttpClient::AddHeaders()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3422
diff
changeset
|
2232 } |
|
00737cd21f40
OrthancPlugins::HttpClient::AddHeaders()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3422
diff
changeset
|
2233 } |
|
00737cd21f40
OrthancPlugins::HttpClient::AddHeaders()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3422
diff
changeset
|
2234 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2235 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2236 void HttpClient::SetCredentials(const std::string& username, |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2237 const std::string& password) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2238 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2239 username_ = username; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2240 password_ = password; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2241 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2242 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2243 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2244 void HttpClient::ClearCredentials() |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2245 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2246 username_.empty(); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2247 password_.empty(); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2248 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2249 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2250 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2251 void HttpClient::SetCertificate(const std::string& certificateFile, |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2252 const std::string& keyFile, |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2253 const std::string& keyPassword) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2254 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2255 certificateFile_ = certificateFile; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2256 certificateKeyFile_ = keyFile; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2257 certificateKeyPassword_ = keyPassword; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2258 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2259 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2260 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2261 void HttpClient::ClearCertificate() |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2262 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2263 certificateFile_.clear(); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2264 certificateKeyFile_.clear(); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2265 certificateKeyPassword_.clear(); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2266 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2267 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2268 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2269 void HttpClient::ClearBody() |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2270 { |
| 3413 | 2271 fullBody_.clear(); |
| 2272 chunkedBody_ = NULL; | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2273 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2274 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2275 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2276 void HttpClient::SwapBody(std::string& body) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2277 { |
| 3413 | 2278 fullBody_.swap(body); |
| 2279 chunkedBody_ = NULL; | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2280 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2281 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2282 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2283 void HttpClient::SetBody(const std::string& body) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2284 { |
| 3413 | 2285 fullBody_ = body; |
| 2286 chunkedBody_ = NULL; | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2287 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2288 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2289 |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2290 void HttpClient::SetBody(IRequestBody& body) |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2291 { |
| 3413 | 2292 fullBody_.clear(); |
| 2293 chunkedBody_ = &body; | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2294 } |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2295 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2296 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2297 namespace |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2298 { |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2299 class HeadersWrapper : public boost::noncopyable |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2300 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2301 private: |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2302 std::vector<const char*> headersKeys_; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2303 std::vector<const char*> headersValues_; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2304 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2305 public: |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2306 HeadersWrapper(const HttpClient::HttpHeaders& headers) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2307 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2308 headersKeys_.reserve(headers.size()); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2309 headersValues_.reserve(headers.size()); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2310 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2311 for (HttpClient::HttpHeaders::const_iterator it = headers.begin(); it != headers.end(); ++it) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2312 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2313 headersKeys_.push_back(it->first.c_str()); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2314 headersValues_.push_back(it->second.c_str()); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2315 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2316 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2317 |
| 3394 | 2318 void AddStaticString(const char* key, |
| 2319 const char* value) | |
| 2320 { | |
| 2321 headersKeys_.push_back(key); | |
| 2322 headersValues_.push_back(value); | |
| 2323 } | |
| 2324 | |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2325 uint32_t GetCount() const |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2326 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2327 return headersKeys_.size(); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2328 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2329 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2330 const char* const* GetKeys() const |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2331 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2332 return headersKeys_.empty() ? NULL : &headersKeys_[0]; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2333 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2334 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2335 const char* const* GetValues() const |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2336 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2337 return headersValues_.empty() ? NULL : &headersValues_[0]; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2338 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2339 }; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2340 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2341 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2342 class MemoryRequestBody : public HttpClient::IRequestBody |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2343 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2344 private: |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2345 std::string body_; |
|
3420
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2346 bool done_; |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2347 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2348 public: |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2349 MemoryRequestBody(const std::string& body) : |
|
3420
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2350 body_(body), |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2351 done_(false) |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2352 { |
| 3434 | 2353 if (body_.empty()) |
| 2354 { | |
| 2355 done_ = true; | |
| 2356 } | |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2357 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2358 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2359 virtual bool ReadNextChunk(std::string& chunk) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2360 { |
|
3420
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2361 if (done_) |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2362 { |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2363 return false; |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2364 } |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2365 else |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2366 { |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2367 chunk.swap(body_); |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2368 done_ = true; |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2369 return true; |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2370 } |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2371 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2372 }; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2373 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2374 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2375 // This class mimics Orthanc::ChunkedBuffer |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2376 class ChunkedBuffer : public boost::noncopyable |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2377 { |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2378 private: |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2379 typedef std::list<std::string*> Content; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2380 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2381 Content content_; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2382 size_t size_; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2383 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2384 public: |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2385 ChunkedBuffer() : |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2386 size_(0) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2387 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2388 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2389 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2390 ~ChunkedBuffer() |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2391 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2392 Clear(); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2393 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2394 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2395 void Clear() |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2396 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2397 for (Content::iterator it = content_.begin(); it != content_.end(); ++it) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2398 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2399 assert(*it != NULL); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2400 delete *it; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2401 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2402 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2403 content_.clear(); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2404 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2405 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2406 void Flatten(std::string& target) const |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2407 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2408 target.resize(size_); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2409 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2410 size_t pos = 0; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2411 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2412 for (Content::const_iterator it = content_.begin(); it != content_.end(); ++it) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2413 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2414 assert(*it != NULL); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2415 size_t s = (*it)->size(); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2416 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2417 if (s != 0) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2418 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2419 memcpy(&target[pos], (*it)->c_str(), s); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2420 pos += s; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2421 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2422 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2423 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2424 assert(size_ == 0 || |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2425 pos == target.size()); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2426 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2427 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2428 void AddChunk(const void* data, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2429 size_t size) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2430 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2431 content_.push_back(new std::string(reinterpret_cast<const char*>(data), size)); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2432 size_ += size; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2433 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2434 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2435 void AddChunk(const std::string& chunk) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2436 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2437 content_.push_back(new std::string(chunk)); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2438 size_ += chunk.size(); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2439 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2440 }; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2441 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2442 |
| 3413 | 2443 #if HAS_ORTHANC_PLUGIN_CHUNKED_HTTP_CLIENT == 1 |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2444 class MemoryAnswer : public HttpClient::IAnswer |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2445 { |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2446 private: |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2447 HttpClient::HttpHeaders headers_; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2448 ChunkedBuffer body_; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2449 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2450 public: |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2451 const HttpClient::HttpHeaders& GetHeaders() const |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2452 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2453 return headers_; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2454 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2455 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2456 const ChunkedBuffer& GetBody() const |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2457 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2458 return body_; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2459 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2460 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2461 virtual void AddHeader(const std::string& key, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2462 const std::string& value) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2463 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2464 headers_[key] = value; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2465 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2466 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2467 virtual void AddChunk(const void* data, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2468 size_t size) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2469 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2470 body_.AddChunk(data, size); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2471 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2472 }; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2473 #endif |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2474 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2475 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2476 |
| 3413 | 2477 #if HAS_ORTHANC_PLUGIN_CHUNKED_HTTP_CLIENT == 1 |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2478 void HttpClient::ExecuteWithStream(uint16_t& httpStatus, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2479 IAnswer& answer, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2480 IRequestBody& body) const |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2481 { |
| 3394 | 2482 HeadersWrapper h(headers_); |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2483 |
| 3434 | 2484 if (method_ == OrthancPluginHttpMethod_Post || |
| 2485 method_ == OrthancPluginHttpMethod_Put) | |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2486 { |
| 3434 | 2487 // Automatically set the "Transfer-Encoding" header if absent |
| 2488 bool found = false; | |
| 2489 | |
| 2490 for (HttpHeaders::const_iterator it = headers_.begin(); it != headers_.end(); ++it) | |
| 3394 | 2491 { |
| 3434 | 2492 if (boost::iequals(it->first, "Transfer-Encoding")) |
| 2493 { | |
| 2494 found = true; | |
| 2495 break; | |
| 2496 } | |
| 3394 | 2497 } |
| 3434 | 2498 |
| 2499 if (!found) | |
| 2500 { | |
| 2501 h.AddStaticString("Transfer-Encoding", "chunked"); | |
| 2502 } | |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2503 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2504 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2505 RequestBodyWrapper request(body); |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2506 |
| 3413 | 2507 OrthancPluginErrorCode error = OrthancPluginChunkedHttpClient( |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2508 GetGlobalContext(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2509 &answer, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2510 AnswerAddChunkCallback, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2511 AnswerAddHeaderCallback, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2512 &httpStatus, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2513 method_, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2514 url_.c_str(), |
| 3394 | 2515 h.GetCount(), |
| 2516 h.GetKeys(), | |
| 2517 h.GetValues(), | |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2518 &request, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2519 RequestBodyWrapper::IsDone, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2520 RequestBodyWrapper::GetChunkData, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2521 RequestBodyWrapper::GetChunkSize, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2522 RequestBodyWrapper::Next, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2523 username_.empty() ? NULL : username_.c_str(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2524 password_.empty() ? NULL : password_.c_str(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2525 timeout_, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2526 certificateFile_.empty() ? NULL : certificateFile_.c_str(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2527 certificateFile_.empty() ? NULL : certificateKeyFile_.c_str(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2528 certificateFile_.empty() ? NULL : certificateKeyPassword_.c_str(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2529 pkcs11_ ? 1 : 0); |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2530 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2531 if (error != OrthancPluginErrorCode_Success) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2532 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2533 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(error); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2534 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2535 } |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2536 #endif |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2537 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2538 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2539 void HttpClient::ExecuteWithoutStream(uint16_t& httpStatus, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2540 HttpHeaders& answerHeaders, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2541 std::string& answerBody, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2542 const std::string& body) const |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2543 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2544 HeadersWrapper headers(headers_); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2545 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2546 MemoryBuffer answerBodyBuffer, answerHeadersBuffer; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2547 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2548 OrthancPluginErrorCode error = OrthancPluginHttpClient( |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2549 GetGlobalContext(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2550 *answerBodyBuffer, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2551 *answerHeadersBuffer, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2552 &httpStatus, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2553 method_, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2554 url_.c_str(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2555 headers.GetCount(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2556 headers.GetKeys(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2557 headers.GetValues(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2558 body.empty() ? NULL : body.c_str(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2559 body.size(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2560 username_.empty() ? NULL : username_.c_str(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2561 password_.empty() ? NULL : password_.c_str(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2562 timeout_, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2563 certificateFile_.empty() ? NULL : certificateFile_.c_str(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2564 certificateFile_.empty() ? NULL : certificateKeyFile_.c_str(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2565 certificateFile_.empty() ? NULL : certificateKeyPassword_.c_str(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2566 pkcs11_ ? 1 : 0); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2567 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2568 if (error != OrthancPluginErrorCode_Success) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2569 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2570 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(error); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2571 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2572 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2573 Json::Value v; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2574 answerHeadersBuffer.ToJson(v); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2575 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2576 if (v.type() != Json::objectValue) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2577 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2578 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2579 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2580 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2581 Json::Value::Members members = v.getMemberNames(); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2582 answerHeaders.clear(); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2583 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2584 for (size_t i = 0; i < members.size(); i++) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2585 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2586 const Json::Value& h = v[members[i]]; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2587 if (h.type() != Json::stringValue) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2588 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2589 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2590 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2591 else |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2592 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2593 answerHeaders[members[i]] = h.asString(); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2594 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2595 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2596 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2597 answerBodyBuffer.ToString(answerBody); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2598 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2599 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2600 |
| 3413 | 2601 #if HAS_ORTHANC_PLUGIN_CHUNKED_HTTP_CLIENT == 1 |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2602 void HttpClient::Execute(IAnswer& answer) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2603 { |
| 3413 | 2604 if (chunkedBody_ != NULL) |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2605 { |
| 3413 | 2606 ExecuteWithStream(httpStatus_, answer, *chunkedBody_); |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2607 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2608 else |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2609 { |
| 3413 | 2610 MemoryRequestBody wrapper(fullBody_); |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2611 ExecuteWithStream(httpStatus_, answer, wrapper); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2612 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2613 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2614 #endif |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2615 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2616 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2617 void HttpClient::Execute(HttpHeaders& answerHeaders /* out */, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2618 std::string& answerBody /* out */) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2619 { |
| 3413 | 2620 #if HAS_ORTHANC_PLUGIN_CHUNKED_HTTP_CLIENT == 1 |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2621 MemoryAnswer answer; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2622 Execute(answer); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2623 answerHeaders = answer.GetHeaders(); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2624 answer.GetBody().Flatten(answerBody); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2625 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2626 #else |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2627 // Compatibility mode for Orthanc SDK <= 1.5.6. This results in |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2628 // higher memory usage (all chunks from the body request are sent |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2629 // at once) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2630 |
| 3413 | 2631 if (chunkedBody_ != NULL) |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2632 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2633 ChunkedBuffer buffer; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2634 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2635 std::string chunk; |
| 3413 | 2636 while (chunkedBody_->ReadNextChunk(chunk)) |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2637 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2638 buffer.AddChunk(chunk); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2639 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2640 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2641 std::string body; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2642 buffer.Flatten(body); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2643 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2644 ExecuteWithoutStream(httpStatus_, answerHeaders, answerBody, body); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2645 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2646 else |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2647 { |
| 3413 | 2648 ExecuteWithoutStream(httpStatus_, answerHeaders, answerBody, fullBody_); |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2649 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2650 #endif |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2651 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2652 |
|
3420
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2653 |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2654 void HttpClient::Execute(HttpHeaders& answerHeaders /* out */, |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2655 Json::Value& answerBody /* out */) |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2656 { |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2657 std::string body; |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2658 Execute(answerHeaders, body); |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2659 |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2660 Json::Reader reader; |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2661 if (!reader.parse(body, answerBody)) |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2662 { |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2663 LogError("Cannot convert HTTP answer body to JSON"); |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2664 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2665 } |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2666 } |
|
0a0e7eca95ae
fix encoding in DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3418
diff
changeset
|
2667 |
| 3434 | 2668 |
| 2669 void HttpClient::Execute() | |
| 2670 { | |
| 2671 HttpHeaders answerHeaders; | |
| 2672 std::string body; | |
| 2673 Execute(answerHeaders, body); | |
| 2674 } | |
| 2675 | |
| 3388 | 2676 #endif /* HAS_ORTHANC_PLUGIN_HTTP_CLIENT == 1 */ |
| 3416 | 2677 |
| 2678 | |
| 2679 | |
| 2680 | |
| 2681 | |
| 2682 /****************************************************************** | |
| 2683 ** CHUNKED HTTP SERVER | |
| 2684 ******************************************************************/ | |
| 2685 | |
| 2686 namespace Internals | |
| 2687 { | |
| 2688 void NullRestCallback(OrthancPluginRestOutput* output, | |
| 2689 const char* url, | |
| 2690 const OrthancPluginHttpRequest* request) | |
| 2691 { | |
| 2692 } | |
| 2693 | |
| 2694 IChunkedRequestReader *NullChunkedRestCallback(const char* url, | |
| 2695 const OrthancPluginHttpRequest* request) | |
| 2696 { | |
| 2697 return NULL; | |
| 2698 } | |
| 2699 | |
| 2700 | |
| 2701 #if HAS_ORTHANC_PLUGIN_CHUNKED_HTTP_SERVER == 1 | |
| 2702 | |
| 2703 OrthancPluginErrorCode ChunkedRequestReaderAddChunk( | |
| 2704 OrthancPluginServerChunkedRequestReader* reader, | |
| 2705 const void* data, | |
| 2706 uint32_t size) | |
| 2707 { | |
| 2708 try | |
| 2709 { | |
| 2710 if (reader == NULL) | |
| 2711 { | |
| 2712 return OrthancPluginErrorCode_InternalError; | |
| 2713 } | |
| 2714 | |
| 2715 reinterpret_cast<IChunkedRequestReader*>(reader)->AddChunk(data, size); | |
| 2716 return OrthancPluginErrorCode_Success; | |
| 2717 } | |
| 2718 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) | |
| 2719 { | |
| 2720 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); | |
| 2721 } | |
| 2722 catch (boost::bad_lexical_cast&) | |
| 2723 { | |
| 2724 return OrthancPluginErrorCode_BadFileFormat; | |
| 2725 } | |
| 2726 catch (...) | |
| 2727 { | |
| 2728 return OrthancPluginErrorCode_Plugin; | |
| 2729 } | |
| 2730 } | |
| 2731 | |
| 2732 | |
| 2733 OrthancPluginErrorCode ChunkedRequestReaderExecute( | |
| 2734 OrthancPluginServerChunkedRequestReader* reader, | |
| 2735 OrthancPluginRestOutput* output) | |
| 2736 { | |
| 2737 try | |
| 2738 { | |
| 2739 if (reader == NULL) | |
| 2740 { | |
| 2741 return OrthancPluginErrorCode_InternalError; | |
| 2742 } | |
| 2743 | |
| 2744 reinterpret_cast<IChunkedRequestReader*>(reader)->Execute(output); | |
| 2745 return OrthancPluginErrorCode_Success; | |
| 2746 } | |
| 2747 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) | |
| 2748 { | |
| 2749 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); | |
| 2750 } | |
| 2751 catch (boost::bad_lexical_cast&) | |
| 2752 { | |
| 2753 return OrthancPluginErrorCode_BadFileFormat; | |
| 2754 } | |
| 2755 catch (...) | |
| 2756 { | |
| 2757 return OrthancPluginErrorCode_Plugin; | |
| 2758 } | |
| 2759 } | |
| 2760 | |
| 2761 | |
| 2762 void ChunkedRequestReaderFinalize( | |
| 2763 OrthancPluginServerChunkedRequestReader* reader) | |
| 2764 { | |
| 2765 if (reader != NULL) | |
| 2766 { | |
| 2767 delete reinterpret_cast<IChunkedRequestReader*>(reader); | |
| 2768 } | |
| 2769 } | |
| 2770 | |
| 2771 #else | |
| 2772 | |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2773 OrthancPluginErrorCode ChunkedRestCompatibility(OrthancPluginRestOutput* output, |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2774 const char* url, |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2775 const OrthancPluginHttpRequest* request, |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2776 RestCallback GetHandler, |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2777 ChunkedRestCallback PostHandler, |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2778 RestCallback DeleteHandler, |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2779 ChunkedRestCallback PutHandler) |
| 3416 | 2780 { |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2781 try |
| 3416 | 2782 { |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2783 std::string allowed; |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2784 |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2785 if (GetHandler != Internals::NullRestCallback) |
| 3416 | 2786 { |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2787 allowed += "GET"; |
| 3416 | 2788 } |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2789 |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2790 if (PostHandler != Internals::NullChunkedRestCallback) |
| 3416 | 2791 { |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2792 if (!allowed.empty()) |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2793 { |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2794 allowed += ","; |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2795 } |
| 3416 | 2796 |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2797 allowed += "POST"; |
| 3416 | 2798 } |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2799 |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2800 if (DeleteHandler != Internals::NullRestCallback) |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2801 { |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2802 if (!allowed.empty()) |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2803 { |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2804 allowed += ","; |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2805 } |
| 3416 | 2806 |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2807 allowed += "DELETE"; |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2808 } |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2809 |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2810 if (PutHandler != Internals::NullChunkedRestCallback) |
| 3416 | 2811 { |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2812 if (!allowed.empty()) |
| 3416 | 2813 { |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2814 allowed += ","; |
| 3416 | 2815 } |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2816 |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2817 allowed += "PUT"; |
| 3416 | 2818 } |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2819 |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2820 switch (request->method) |
| 3416 | 2821 { |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2822 case OrthancPluginHttpMethod_Get: |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2823 if (GetHandler == Internals::NullRestCallback) |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2824 { |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2825 OrthancPluginSendMethodNotAllowed(GetGlobalContext(), output, allowed.c_str()); |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2826 } |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2827 else |
| 3416 | 2828 { |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2829 GetHandler(output, url, request); |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2830 } |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2831 |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2832 break; |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2833 |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2834 case OrthancPluginHttpMethod_Post: |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2835 if (PostHandler == Internals::NullChunkedRestCallback) |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2836 { |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2837 OrthancPluginSendMethodNotAllowed(GetGlobalContext(), output, allowed.c_str()); |
| 3416 | 2838 } |
| 2839 else | |
| 2840 { | |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2841 std::auto_ptr<IChunkedRequestReader> reader(PostHandler(url, request)); |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2842 if (reader.get() == NULL) |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2843 { |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2844 ORTHANC_PLUGINS_THROW_EXCEPTION(Plugin); |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2845 } |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2846 else |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2847 { |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2848 reader->AddChunk(request->body, request->bodySize); |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2849 reader->Execute(output); |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2850 } |
| 3416 | 2851 } |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2852 |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2853 break; |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2854 |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2855 case OrthancPluginHttpMethod_Delete: |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2856 if (DeleteHandler == Internals::NullRestCallback) |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2857 { |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2858 OrthancPluginSendMethodNotAllowed(GetGlobalContext(), output, allowed.c_str()); |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2859 } |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2860 else |
| 3416 | 2861 { |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2862 DeleteHandler(output, url, request); |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2863 } |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2864 |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2865 break; |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2866 |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2867 case OrthancPluginHttpMethod_Put: |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2868 if (PutHandler == Internals::NullChunkedRestCallback) |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2869 { |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2870 OrthancPluginSendMethodNotAllowed(GetGlobalContext(), output, allowed.c_str()); |
| 3416 | 2871 } |
| 2872 else | |
| 2873 { | |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2874 std::auto_ptr<IChunkedRequestReader> reader(PutHandler(url, request)); |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2875 if (reader.get() == NULL) |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2876 { |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2877 ORTHANC_PLUGINS_THROW_EXCEPTION(Plugin); |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2878 } |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2879 else |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2880 { |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2881 reader->AddChunk(request->body, request->bodySize); |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2882 reader->Execute(output); |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2883 } |
| 3416 | 2884 } |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2885 |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2886 break; |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2887 |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2888 default: |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2889 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); |
| 3416 | 2890 } |
| 2891 | |
|
3433
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2892 return OrthancPluginErrorCode_Success; |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2893 } |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2894 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2895 { |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2896 #if HAS_ORTHANC_EXCEPTION == 1 && HAS_ORTHANC_PLUGIN_EXCEPTION_DETAILS == 1 |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2897 if (HasGlobalContext() && |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2898 e.HasDetails()) |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2899 { |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2900 // The "false" instructs Orthanc not to log the detailed |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2901 // error message. This is to avoid duplicating the details, |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2902 // because "OrthancException" already does it on construction. |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2903 OrthancPluginSetHttpErrorDetails |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2904 (GetGlobalContext(), output, e.GetDetails(), false); |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2905 } |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2906 #endif |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2907 |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2908 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2909 } |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2910 catch (boost::bad_lexical_cast&) |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2911 { |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2912 return OrthancPluginErrorCode_BadFileFormat; |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2913 } |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2914 catch (...) |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2915 { |
|
caa526bb65cc
fixed C++ compatibility wrapper for OrthancPluginRegisterRestCallbackNoLock()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3426
diff
changeset
|
2916 return OrthancPluginErrorCode_Plugin; |
| 3416 | 2917 } |
| 2918 } | |
| 2919 #endif | |
| 2920 } | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2921 } |