Mercurial > hg > orthanc
annotate Plugins/Samples/Common/OrthancPluginCppWrapper.cpp @ 3394:2f82ef41bf5a
fix
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 06 Jun 2019 16:42:41 +0200 |
| parents | 2cd0369a156f |
| children | 9019279dbfd7 |
| 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, | |
| 237 const char* body, | |
| 238 size_t bodySize, | |
| 239 bool applyPlugins) | |
| 240 { | |
| 241 Clear(); | |
| 242 | |
| 243 if (applyPlugins) | |
| 244 { | |
| 245 return CheckHttp(OrthancPluginRestApiPostAfterPlugins(GetGlobalContext(), &buffer_, uri.c_str(), body, bodySize)); | |
| 246 } | |
| 247 else | |
| 248 { | |
| 249 return CheckHttp(OrthancPluginRestApiPost(GetGlobalContext(), &buffer_, uri.c_str(), body, bodySize)); | |
| 250 } | |
| 251 } | |
| 3026 | 252 |
| 253 | |
| 3028 | 254 bool MemoryBuffer::RestApiPut(const std::string& uri, |
| 255 const char* body, | |
| 256 size_t bodySize, | |
| 257 bool applyPlugins) | |
| 258 { | |
| 259 Clear(); | |
| 3026 | 260 |
| 3028 | 261 if (applyPlugins) |
| 262 { | |
| 263 return CheckHttp(OrthancPluginRestApiPutAfterPlugins(GetGlobalContext(), &buffer_, uri.c_str(), body, bodySize)); | |
| 264 } | |
| 265 else | |
| 266 { | |
| 267 return CheckHttp(OrthancPluginRestApiPut(GetGlobalContext(), &buffer_, uri.c_str(), body, bodySize)); | |
| 268 } | |
| 3026 | 269 } |
| 3028 | 270 |
| 3026 | 271 |
| 3028 | 272 bool MemoryBuffer::RestApiPost(const std::string& uri, |
| 273 const Json::Value& body, | |
| 274 bool applyPlugins) | |
| 3026 | 275 { |
| 3028 | 276 Json::FastWriter writer; |
| 277 return RestApiPost(uri, writer.write(body), applyPlugins); | |
| 3026 | 278 } |
| 279 | |
| 3028 | 280 |
| 281 bool MemoryBuffer::RestApiPut(const std::string& uri, | |
| 282 const Json::Value& body, | |
| 283 bool applyPlugins) | |
| 284 { | |
| 285 Json::FastWriter writer; | |
| 286 return RestApiPut(uri, writer.write(body), applyPlugins); | |
| 287 } | |
| 3026 | 288 |
| 3028 | 289 |
| 290 void MemoryBuffer::CreateDicom(const Json::Value& tags, | |
| 291 OrthancPluginCreateDicomFlags flags) | |
| 292 { | |
| 293 Clear(); | |
| 294 | |
| 295 Json::FastWriter writer; | |
| 296 std::string s = writer.write(tags); | |
| 3026 | 297 |
| 3028 | 298 Check(OrthancPluginCreateDicom(GetGlobalContext(), &buffer_, s.c_str(), NULL, flags)); |
| 3026 | 299 } |
| 3028 | 300 |
| 301 void MemoryBuffer::CreateDicom(const Json::Value& tags, | |
| 302 const OrthancImage& pixelData, | |
| 303 OrthancPluginCreateDicomFlags flags) | |
| 3026 | 304 { |
| 3028 | 305 Clear(); |
| 306 | |
| 307 Json::FastWriter writer; | |
| 308 std::string s = writer.write(tags); | |
| 309 | |
| 310 Check(OrthancPluginCreateDicom(GetGlobalContext(), &buffer_, s.c_str(), pixelData.GetObject(), flags)); | |
| 3026 | 311 } |
| 3028 | 312 |
| 313 | |
| 314 void MemoryBuffer::ReadFile(const std::string& path) | |
| 315 { | |
| 316 Clear(); | |
| 317 Check(OrthancPluginReadFile(GetGlobalContext(), &buffer_, path.c_str())); | |
| 318 } | |
| 3026 | 319 |
| 320 | |
| 3028 | 321 void MemoryBuffer::GetDicomQuery(const OrthancPluginWorklistQuery* query) |
| 3026 | 322 { |
| 3028 | 323 Clear(); |
| 324 Check(OrthancPluginWorklistGetDicomQuery(GetGlobalContext(), &buffer_, query)); | |
| 3026 | 325 } |
| 326 | |
| 327 | |
| 3028 | 328 void OrthancString::Assign(char* str) |
| 329 { | |
| 330 if (str == NULL) | |
| 331 { | |
| 332 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
| 333 } | |
| 334 else | |
| 335 { | |
| 336 Clear(); | |
| 337 str_ = str; | |
| 338 } | |
| 339 } | |
| 3026 | 340 |
| 341 | |
| 3028 | 342 void OrthancString::Clear() |
| 343 { | |
| 344 if (str_ != NULL) | |
| 345 { | |
| 346 OrthancPluginFreeString(GetGlobalContext(), str_); | |
| 347 str_ = NULL; | |
| 348 } | |
| 349 } | |
| 3026 | 350 |
| 351 | |
| 3028 | 352 void OrthancString::ToString(std::string& target) const |
| 353 { | |
| 354 if (str_ == NULL) | |
| 355 { | |
| 356 target.clear(); | |
| 357 } | |
| 358 else | |
| 359 { | |
| 360 target.assign(str_); | |
| 361 } | |
| 362 } | |
| 3026 | 363 |
| 364 | |
| 3028 | 365 void OrthancString::ToJson(Json::Value& target) const |
| 366 { | |
| 367 if (str_ == NULL) | |
| 368 { | |
| 369 LogError("Cannot convert an empty memory buffer to JSON"); | |
| 370 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
| 371 } | |
| 372 | |
| 373 Json::Reader reader; | |
| 374 if (!reader.parse(str_, target)) | |
| 375 { | |
| 376 LogError("Cannot convert some memory buffer to JSON"); | |
| 377 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
| 378 } | |
| 379 } | |
| 3026 | 380 |
| 381 | |
| 3028 | 382 void MemoryBuffer::DicomToJson(Json::Value& target, |
| 383 OrthancPluginDicomToJsonFormat format, | |
| 384 OrthancPluginDicomToJsonFlags flags, | |
| 385 uint32_t maxStringLength) | |
| 386 { | |
| 387 OrthancString str; | |
| 388 str.Assign(OrthancPluginDicomBufferToJson | |
| 389 (GetGlobalContext(), GetData(), GetSize(), format, flags, maxStringLength)); | |
| 390 str.ToJson(target); | |
| 391 } | |
| 3026 | 392 |
| 393 | |
| 3028 | 394 bool MemoryBuffer::HttpGet(const std::string& url, |
| 395 const std::string& username, | |
| 396 const std::string& password) | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
397 { |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
398 Clear(); |
| 3028 | 399 return CheckHttp(OrthancPluginHttpGet(GetGlobalContext(), &buffer_, url.c_str(), |
| 400 username.empty() ? NULL : username.c_str(), | |
| 401 password.empty() ? NULL : password.c_str())); | |
| 3026 | 402 } |
| 403 | |
| 404 | |
| 3028 | 405 bool MemoryBuffer::HttpPost(const std::string& url, |
| 406 const std::string& body, | |
| 407 const std::string& username, | |
| 408 const std::string& password) | |
| 3026 | 409 { |
| 3028 | 410 Clear(); |
| 411 return CheckHttp(OrthancPluginHttpPost(GetGlobalContext(), &buffer_, url.c_str(), | |
| 412 body.c_str(), body.size(), | |
| 413 username.empty() ? NULL : username.c_str(), | |
| 414 password.empty() ? NULL : password.c_str())); | |
| 3026 | 415 } |
| 416 | |
| 417 | |
| 3028 | 418 bool MemoryBuffer::HttpPut(const std::string& url, |
| 419 const std::string& body, | |
| 420 const std::string& username, | |
| 421 const std::string& password) | |
| 3026 | 422 { |
| 3028 | 423 Clear(); |
| 424 return CheckHttp(OrthancPluginHttpPut(GetGlobalContext(), &buffer_, url.c_str(), | |
| 425 body.empty() ? NULL : body.c_str(), | |
| 426 body.size(), | |
| 427 username.empty() ? NULL : username.c_str(), | |
| 428 password.empty() ? NULL : password.c_str())); | |
| 3026 | 429 } |
| 430 | |
| 3028 | 431 |
| 432 void MemoryBuffer::GetDicomInstance(const std::string& instanceId) | |
| 3026 | 433 { |
| 3028 | 434 Clear(); |
| 435 Check(OrthancPluginGetDicomForInstance(GetGlobalContext(), &buffer_, instanceId.c_str())); | |
| 3026 | 436 } |
| 437 | |
| 438 | |
| 3028 | 439 bool HttpDelete(const std::string& url, |
| 440 const std::string& username, | |
| 441 const std::string& password) | |
| 442 { | |
| 443 OrthancPluginErrorCode error = OrthancPluginHttpDelete | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
444 (GetGlobalContext(), url.c_str(), |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
445 username.empty() ? NULL : username.c_str(), |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
446 password.empty() ? NULL : password.c_str()); |
| 3028 | 447 |
| 448 if (error == OrthancPluginErrorCode_Success) | |
| 449 { | |
| 450 return true; | |
| 451 } | |
| 452 else if (error == OrthancPluginErrorCode_UnknownResource || | |
| 453 error == OrthancPluginErrorCode_InexistentItem) | |
| 454 { | |
| 455 return false; | |
| 456 } | |
| 457 else | |
| 458 { | |
| 459 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(error); | |
| 460 } | |
| 461 } | |
| 3026 | 462 |
| 463 | |
| 3028 | 464 void LogError(const std::string& message) |
| 465 { | |
| 466 if (HasGlobalContext()) | |
| 467 { | |
| 468 OrthancPluginLogError(GetGlobalContext(), message.c_str()); | |
| 469 } | |
| 470 } | |
| 3026 | 471 |
| 472 | |
| 3028 | 473 void LogWarning(const std::string& message) |
| 474 { | |
| 475 if (HasGlobalContext()) | |
| 476 { | |
| 477 OrthancPluginLogWarning(GetGlobalContext(), message.c_str()); | |
| 478 } | |
| 479 } | |
| 480 | |
| 481 | |
| 482 void LogInfo(const std::string& message) | |
| 483 { | |
| 484 if (HasGlobalContext()) | |
| 485 { | |
| 486 OrthancPluginLogInfo(GetGlobalContext(), message.c_str()); | |
| 487 } | |
| 488 } | |
| 3026 | 489 |
| 490 | |
| 3028 | 491 OrthancConfiguration::OrthancConfiguration() |
| 492 { | |
| 493 OrthancString str; | |
| 494 str.Assign(OrthancPluginGetConfiguration(GetGlobalContext())); | |
| 3026 | 495 |
| 3028 | 496 if (str.GetContent() == NULL) |
| 497 { | |
| 498 LogError("Cannot access the Orthanc configuration"); | |
| 499 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
| 500 } | |
| 3026 | 501 |
| 3028 | 502 str.ToJson(configuration_); |
| 503 | |
| 504 if (configuration_.type() != Json::objectValue) | |
| 505 { | |
| 506 LogError("Unable to read the Orthanc configuration"); | |
| 507 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
| 508 } | |
| 509 } | |
| 3026 | 510 |
| 511 | |
| 3028 | 512 std::string OrthancConfiguration::GetPath(const std::string& key) const |
| 3026 | 513 { |
| 3028 | 514 if (path_.empty()) |
| 515 { | |
| 516 return key; | |
| 517 } | |
| 518 else | |
| 519 { | |
| 520 return path_ + "." + key; | |
| 521 } | |
| 3026 | 522 } |
| 3028 | 523 |
| 524 | |
| 525 bool OrthancConfiguration::IsSection(const std::string& key) const | |
| 3026 | 526 { |
| 3028 | 527 assert(configuration_.type() == Json::objectValue); |
| 528 | |
| 529 return (configuration_.isMember(key) && | |
| 530 configuration_[key].type() == Json::objectValue); | |
| 3026 | 531 } |
| 532 | |
| 533 | |
| 3028 | 534 void OrthancConfiguration::GetSection(OrthancConfiguration& target, |
| 535 const std::string& key) const | |
| 3026 | 536 { |
| 3028 | 537 assert(configuration_.type() == Json::objectValue); |
| 3026 | 538 |
| 3028 | 539 target.path_ = GetPath(key); |
| 3026 | 540 |
| 3028 | 541 if (!configuration_.isMember(key)) |
| 542 { | |
| 543 target.configuration_ = Json::objectValue; | |
| 544 } | |
| 545 else | |
| 546 { | |
| 547 if (configuration_[key].type() != Json::objectValue) | |
| 548 { | |
| 549 LogError("The configuration section \"" + target.path_ + | |
| 550 "\" is not an associative array as expected"); | |
| 551 | |
| 552 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
| 553 } | |
| 554 | |
| 555 target.configuration_ = configuration_[key]; | |
| 556 } | |
| 3026 | 557 } |
| 558 | |
| 559 | |
| 3028 | 560 bool OrthancConfiguration::LookupStringValue(std::string& target, |
| 561 const std::string& key) const | |
| 562 { | |
| 563 assert(configuration_.type() == Json::objectValue); | |
| 564 | |
| 565 if (!configuration_.isMember(key)) | |
| 566 { | |
| 567 return false; | |
| 568 } | |
| 3026 | 569 |
| 3028 | 570 if (configuration_[key].type() != Json::stringValue) |
| 571 { | |
| 572 LogError("The configuration option \"" + GetPath(key) + | |
| 573 "\" is not a string as expected"); | |
| 574 | |
| 575 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
| 576 } | |
| 577 | |
| 578 target = configuration_[key].asString(); | |
| 579 return true; | |
| 3026 | 580 } |
| 581 | |
| 582 | |
| 3028 | 583 bool OrthancConfiguration::LookupIntegerValue(int& target, |
| 584 const std::string& key) const | |
| 3026 | 585 { |
| 3028 | 586 assert(configuration_.type() == Json::objectValue); |
| 587 | |
| 588 if (!configuration_.isMember(key)) | |
| 589 { | |
| 590 return false; | |
| 591 } | |
| 592 | |
| 593 switch (configuration_[key].type()) | |
| 594 { | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
595 case Json::intValue: |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
596 target = configuration_[key].asInt(); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
597 return true; |
| 3028 | 598 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
599 case Json::uintValue: |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
600 target = configuration_[key].asUInt(); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
601 return true; |
| 3028 | 602 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
603 default: |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
604 LogError("The configuration option \"" + GetPath(key) + |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
605 "\" is not an integer as expected"); |
| 3028 | 606 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
607 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); |
| 3028 | 608 } |
| 3026 | 609 } |
| 610 | |
| 611 | |
| 3028 | 612 bool OrthancConfiguration::LookupUnsignedIntegerValue(unsigned int& target, |
| 613 const std::string& key) const | |
| 614 { | |
| 615 int tmp; | |
| 616 if (!LookupIntegerValue(tmp, key)) | |
| 617 { | |
| 618 return false; | |
| 619 } | |
| 3026 | 620 |
| 3028 | 621 if (tmp < 0) |
| 622 { | |
| 623 LogError("The configuration option \"" + GetPath(key) + | |
| 624 "\" is not a positive integer as expected"); | |
| 625 | |
| 626 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
| 627 } | |
| 628 else | |
| 629 { | |
| 630 target = static_cast<unsigned int>(tmp); | |
| 631 return true; | |
| 632 } | |
| 633 } | |
| 3026 | 634 |
| 635 | |
| 3028 | 636 bool OrthancConfiguration::LookupBooleanValue(bool& target, |
| 637 const std::string& key) const | |
| 3026 | 638 { |
| 3028 | 639 assert(configuration_.type() == Json::objectValue); |
| 640 | |
| 641 if (!configuration_.isMember(key)) | |
| 3026 | 642 { |
| 3028 | 643 return false; |
| 644 } | |
| 645 | |
| 646 if (configuration_[key].type() != Json::booleanValue) | |
| 647 { | |
| 648 LogError("The configuration option \"" + GetPath(key) + | |
| 649 "\" is not a Boolean as expected"); | |
| 3026 | 650 |
| 651 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
| 652 } | |
| 653 | |
| 3028 | 654 target = configuration_[key].asBool(); |
| 655 return true; | |
| 3026 | 656 } |
| 3028 | 657 |
| 658 | |
| 659 bool OrthancConfiguration::LookupFloatValue(float& target, | |
| 660 const std::string& key) const | |
| 661 { | |
| 662 assert(configuration_.type() == Json::objectValue); | |
| 663 | |
| 664 if (!configuration_.isMember(key)) | |
| 665 { | |
| 666 return false; | |
| 667 } | |
| 668 | |
| 669 switch (configuration_[key].type()) | |
| 670 { | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
671 case Json::realValue: |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
672 target = configuration_[key].asFloat(); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
673 return true; |
| 3028 | 674 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
675 case Json::intValue: |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
676 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
|
677 return true; |
| 3028 | 678 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
679 case Json::uintValue: |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
680 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
|
681 return true; |
| 3028 | 682 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
683 default: |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
684 LogError("The configuration option \"" + GetPath(key) + |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
685 "\" is not an integer as expected"); |
| 3028 | 686 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
687 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); |
| 3028 | 688 } |
| 689 } | |
| 3026 | 690 |
| 691 | |
| 3028 | 692 bool OrthancConfiguration::LookupListOfStrings(std::list<std::string>& target, |
| 693 const std::string& key, | |
| 694 bool allowSingleString) const | |
| 3026 | 695 { |
| 3028 | 696 assert(configuration_.type() == Json::objectValue); |
| 697 | |
| 698 target.clear(); | |
| 699 | |
| 700 if (!configuration_.isMember(key)) | |
| 701 { | |
| 702 return false; | |
| 703 } | |
| 704 | |
| 705 switch (configuration_[key].type()) | |
| 706 { | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
707 case Json::arrayValue: |
| 3028 | 708 { |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
709 bool ok = true; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
710 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
711 for (Json::Value::ArrayIndex i = 0; ok && i < configuration_[key].size(); i++) |
| 3028 | 712 { |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
713 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
|
714 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
715 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
|
716 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
717 else |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
718 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
719 ok = false; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
720 } |
| 3028 | 721 } |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
722 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
723 if (ok) |
| 3028 | 724 { |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
725 return true; |
| 3028 | 726 } |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
727 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
728 break; |
| 3028 | 729 } |
| 730 | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
731 case Json::stringValue: |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
732 if (allowSingleString) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
733 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
734 target.push_back(configuration_[key].asString()); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
735 return true; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
736 } |
| 3028 | 737 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
738 break; |
| 3028 | 739 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
740 default: |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
741 break; |
| 3028 | 742 } |
| 743 | |
| 3026 | 744 LogError("The configuration option \"" + GetPath(key) + |
| 3028 | 745 "\" is not a list of strings as expected"); |
| 3026 | 746 |
| 747 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
| 748 } | |
| 749 | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
750 |
| 3028 | 751 bool OrthancConfiguration::LookupSetOfStrings(std::set<std::string>& target, |
| 752 const std::string& key, | |
| 753 bool allowSingleString) const | |
| 754 { | |
| 755 std::list<std::string> lst; | |
| 756 | |
| 757 if (LookupListOfStrings(lst, key, allowSingleString)) | |
| 758 { | |
| 759 target.clear(); | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
760 |
| 3028 | 761 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
|
762 it = lst.begin(); it != lst.end(); ++it) |
| 3028 | 763 { |
| 764 target.insert(*it); | |
| 765 } | |
| 3026 | 766 |
| 3028 | 767 return true; |
| 768 } | |
| 769 else | |
| 770 { | |
| 771 return false; | |
| 772 } | |
| 3026 | 773 } |
| 774 | |
| 3028 | 775 |
| 776 std::string OrthancConfiguration::GetStringValue(const std::string& key, | |
| 777 const std::string& defaultValue) const | |
| 3026 | 778 { |
| 3028 | 779 std::string tmp; |
| 780 if (LookupStringValue(tmp, key)) | |
| 781 { | |
| 782 return tmp; | |
| 783 } | |
| 784 else | |
| 785 { | |
| 786 return defaultValue; | |
| 787 } | |
| 3026 | 788 } |
| 789 | |
| 790 | |
| 3028 | 791 int OrthancConfiguration::GetIntegerValue(const std::string& key, |
| 792 int defaultValue) const | |
| 3026 | 793 { |
| 3028 | 794 int tmp; |
| 795 if (LookupIntegerValue(tmp, key)) | |
| 796 { | |
| 797 return tmp; | |
| 798 } | |
| 799 else | |
| 800 { | |
| 801 return defaultValue; | |
| 802 } | |
| 3026 | 803 } |
| 804 | |
| 3028 | 805 |
| 806 unsigned int OrthancConfiguration::GetUnsignedIntegerValue(const std::string& key, | |
| 807 unsigned int defaultValue) const | |
| 3026 | 808 { |
| 3028 | 809 unsigned int tmp; |
| 810 if (LookupUnsignedIntegerValue(tmp, key)) | |
| 811 { | |
| 812 return tmp; | |
| 813 } | |
| 814 else | |
| 815 { | |
| 816 return defaultValue; | |
| 817 } | |
| 3026 | 818 } |
|
2792
57e2d65d37ce
OrthancPlugins::MemoryBuffer::Release(), fixing openssl link
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
819 |
| 3026 | 820 |
| 3028 | 821 bool OrthancConfiguration::GetBooleanValue(const std::string& key, |
| 822 bool defaultValue) const | |
| 3026 | 823 { |
| 3028 | 824 bool tmp; |
| 825 if (LookupBooleanValue(tmp, key)) | |
| 826 { | |
| 827 return tmp; | |
| 828 } | |
| 829 else | |
| 830 { | |
| 831 return defaultValue; | |
| 832 } | |
| 3026 | 833 } |
| 834 | |
| 3028 | 835 |
| 836 float OrthancConfiguration::GetFloatValue(const std::string& key, | |
| 837 float defaultValue) const | |
| 3026 | 838 { |
| 3028 | 839 float tmp; |
| 840 if (LookupFloatValue(tmp, key)) | |
| 841 { | |
| 842 return tmp; | |
| 843 } | |
| 844 else | |
| 845 { | |
| 846 return defaultValue; | |
| 847 } | |
| 3026 | 848 } |
| 849 | |
| 850 | |
| 3028 | 851 void OrthancConfiguration::GetDictionary(std::map<std::string, std::string>& target, |
| 852 const std::string& key) const | |
| 3026 | 853 { |
| 3028 | 854 assert(configuration_.type() == Json::objectValue); |
| 855 | |
| 856 target.clear(); | |
| 857 | |
| 858 if (!configuration_.isMember(key)) | |
| 859 { | |
| 860 return; | |
| 861 } | |
| 3026 | 862 |
| 3028 | 863 if (configuration_[key].type() != Json::objectValue) |
| 864 { | |
| 865 LogError("The configuration option \"" + GetPath(key) + | |
| 866 "\" is not a string as expected"); | |
| 867 | |
| 868 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
| 869 } | |
| 3026 | 870 |
| 3028 | 871 Json::Value::Members members = configuration_[key].getMemberNames(); |
| 872 | |
| 873 for (size_t i = 0; i < members.size(); i++) | |
| 3026 | 874 { |
| 3028 | 875 const Json::Value& value = configuration_[key][members[i]]; |
| 876 | |
| 877 if (value.type() == Json::stringValue) | |
| 3026 | 878 { |
| 3028 | 879 target[members[i]] = value.asString(); |
| 3026 | 880 } |
| 881 else | |
| 882 { | |
| 3028 | 883 LogError("The configuration option \"" + GetPath(key) + |
| 884 "\" is not a dictionary mapping strings to strings"); | |
| 885 | |
| 886 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
| 3026 | 887 } |
| 888 } | |
| 3028 | 889 } |
| 3026 | 890 |
| 3028 | 891 |
| 892 void OrthancImage::Clear() | |
| 893 { | |
| 894 if (image_ != NULL) | |
| 895 { | |
| 896 OrthancPluginFreeImage(GetGlobalContext(), image_); | |
| 897 image_ = NULL; | |
| 898 } | |
| 899 } | |
| 900 | |
| 901 | |
| 3236 | 902 void OrthancImage::CheckImageAvailable() const |
| 3028 | 903 { |
| 904 if (image_ == NULL) | |
| 905 { | |
| 906 LogError("Trying to access a NULL image"); | |
| 907 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange); | |
| 908 } | |
| 909 } | |
| 910 | |
| 911 | |
| 912 OrthancImage::OrthancImage() : | |
| 913 image_(NULL) | |
| 914 { | |
| 915 } | |
| 916 | |
| 917 | |
| 918 OrthancImage::OrthancImage(OrthancPluginImage* image) : | |
| 919 image_(image) | |
| 920 { | |
| 921 } | |
| 922 | |
| 923 | |
| 924 OrthancImage::OrthancImage(OrthancPluginPixelFormat format, | |
| 925 uint32_t width, | |
| 926 uint32_t height) | |
| 927 { | |
| 928 image_ = OrthancPluginCreateImage(GetGlobalContext(), format, width, height); | |
| 929 | |
| 930 if (image_ == NULL) | |
| 931 { | |
| 932 LogError("Cannot create an image"); | |
| 933 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
| 934 } | |
| 935 } | |
| 936 | |
| 937 | |
| 938 OrthancImage::OrthancImage(OrthancPluginPixelFormat format, | |
| 939 uint32_t width, | |
| 940 uint32_t height, | |
| 941 uint32_t pitch, | |
| 942 void* buffer) | |
| 943 { | |
| 944 image_ = OrthancPluginCreateImageAccessor | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
945 (GetGlobalContext(), format, width, height, pitch, buffer); |
| 3028 | 946 |
| 947 if (image_ == NULL) | |
| 948 { | |
| 949 LogError("Cannot create an image accessor"); | |
| 950 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
| 951 } | |
| 952 } | |
| 953 | |
| 954 void OrthancImage::UncompressPngImage(const void* data, | |
| 955 size_t size) | |
| 956 { | |
| 957 Clear(); | |
| 958 | |
| 959 image_ = OrthancPluginUncompressImage(GetGlobalContext(), data, size, OrthancPluginImageFormat_Png); | |
| 960 | |
| 961 if (image_ == NULL) | |
| 962 { | |
| 963 LogError("Cannot uncompress a PNG image"); | |
| 964 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange); | |
| 965 } | |
| 966 } | |
| 967 | |
| 968 | |
| 969 void OrthancImage::UncompressJpegImage(const void* data, | |
| 970 size_t size) | |
| 971 { | |
| 972 Clear(); | |
| 973 image_ = OrthancPluginUncompressImage(GetGlobalContext(), data, size, OrthancPluginImageFormat_Jpeg); | |
| 974 if (image_ == NULL) | |
| 975 { | |
| 976 LogError("Cannot uncompress a JPEG image"); | |
| 977 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange); | |
| 978 } | |
| 979 } | |
| 980 | |
| 981 | |
| 982 void OrthancImage::DecodeDicomImage(const void* data, | |
| 983 size_t size, | |
| 984 unsigned int frame) | |
| 985 { | |
| 986 Clear(); | |
| 987 image_ = OrthancPluginDecodeDicomImage(GetGlobalContext(), data, size, frame); | |
| 988 if (image_ == NULL) | |
| 989 { | |
| 990 LogError("Cannot uncompress a DICOM image"); | |
| 991 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange); | |
| 992 } | |
| 993 } | |
| 994 | |
| 995 | |
| 3236 | 996 OrthancPluginPixelFormat OrthancImage::GetPixelFormat() const |
| 3028 | 997 { |
| 998 CheckImageAvailable(); | |
| 999 return OrthancPluginGetImagePixelFormat(GetGlobalContext(), image_); | |
| 1000 } | |
| 1001 | |
| 1002 | |
| 3236 | 1003 unsigned int OrthancImage::GetWidth() const |
| 3028 | 1004 { |
| 1005 CheckImageAvailable(); | |
| 1006 return OrthancPluginGetImageWidth(GetGlobalContext(), image_); | |
| 1007 } | |
| 1008 | |
| 1009 | |
| 3236 | 1010 unsigned int OrthancImage::GetHeight() const |
| 3028 | 1011 { |
| 1012 CheckImageAvailable(); | |
| 1013 return OrthancPluginGetImageHeight(GetGlobalContext(), image_); | |
| 1014 } | |
| 1015 | |
| 1016 | |
| 3236 | 1017 unsigned int OrthancImage::GetPitch() const |
| 3028 | 1018 { |
| 1019 CheckImageAvailable(); | |
| 1020 return OrthancPluginGetImagePitch(GetGlobalContext(), image_); | |
| 1021 } | |
| 1022 | |
| 1023 | |
| 3236 | 1024 const void* OrthancImage::GetBuffer() const |
| 3028 | 1025 { |
| 1026 CheckImageAvailable(); | |
| 1027 return OrthancPluginGetImageBuffer(GetGlobalContext(), image_); | |
| 1028 } | |
| 1029 | |
| 1030 | |
| 3236 | 1031 void OrthancImage::CompressPngImage(MemoryBuffer& target) const |
| 3028 | 1032 { |
| 1033 CheckImageAvailable(); | |
| 1034 | |
| 3320 | 1035 OrthancPlugins::MemoryBuffer answer; |
| 1036 OrthancPluginCompressPngImage(GetGlobalContext(), *answer, GetPixelFormat(), | |
| 3028 | 1037 GetWidth(), GetHeight(), GetPitch(), GetBuffer()); |
| 1038 | |
| 3320 | 1039 target.Swap(answer); |
| 3028 | 1040 } |
| 1041 | |
| 1042 | |
| 1043 void OrthancImage::CompressJpegImage(MemoryBuffer& target, | |
| 3236 | 1044 uint8_t quality) const |
| 3028 | 1045 { |
| 1046 CheckImageAvailable(); | |
| 1047 | |
| 3320 | 1048 OrthancPlugins::MemoryBuffer answer; |
| 1049 OrthancPluginCompressJpegImage(GetGlobalContext(), *answer, GetPixelFormat(), | |
| 3028 | 1050 GetWidth(), GetHeight(), GetPitch(), GetBuffer(), quality); |
| 1051 | |
| 3320 | 1052 target.Swap(answer); |
| 3028 | 1053 } |
| 1054 | |
| 1055 | |
| 3236 | 1056 void OrthancImage::AnswerPngImage(OrthancPluginRestOutput* output) const |
| 3028 | 1057 { |
| 1058 CheckImageAvailable(); | |
| 1059 OrthancPluginCompressAndAnswerPngImage(GetGlobalContext(), output, GetPixelFormat(), | |
| 1060 GetWidth(), GetHeight(), GetPitch(), GetBuffer()); | |
| 1061 } | |
| 1062 | |
| 1063 | |
| 1064 void OrthancImage::AnswerJpegImage(OrthancPluginRestOutput* output, | |
| 3236 | 1065 uint8_t quality) const |
| 3028 | 1066 { |
| 1067 CheckImageAvailable(); | |
| 1068 OrthancPluginCompressAndAnswerJpegImage(GetGlobalContext(), output, GetPixelFormat(), | |
| 1069 GetWidth(), GetHeight(), GetPitch(), GetBuffer(), quality); | |
| 1070 } | |
| 1071 | |
| 1072 | |
| 1073 | |
| 1074 #if HAS_ORTHANC_PLUGIN_FIND_MATCHER == 1 | |
| 1075 FindMatcher::FindMatcher(const OrthancPluginWorklistQuery* worklist) : | |
| 1076 matcher_(NULL), | |
| 1077 worklist_(worklist) | |
| 1078 { | |
| 1079 if (worklist_ == NULL) | |
| 1080 { | |
| 1081 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange); | |
| 1082 } | |
| 1083 } | |
| 1084 | |
| 1085 | |
| 1086 void FindMatcher::SetupDicom(const void* query, | |
| 1087 uint32_t size) | |
| 1088 { | |
| 1089 worklist_ = NULL; | |
| 1090 | |
| 1091 matcher_ = OrthancPluginCreateFindMatcher(GetGlobalContext(), query, size); | |
| 1092 if (matcher_ == NULL) | |
| 1093 { | |
| 1094 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
| 1095 } | |
| 1096 } | |
| 1097 | |
| 1098 | |
| 1099 FindMatcher::~FindMatcher() | |
| 1100 { | |
| 1101 // The "worklist_" field | |
| 1102 | |
| 1103 if (matcher_ != NULL) | |
| 1104 { | |
| 1105 OrthancPluginFreeFindMatcher(GetGlobalContext(), matcher_); | |
| 1106 } | |
| 1107 } | |
| 1108 | |
| 1109 | |
| 1110 | |
| 1111 bool FindMatcher::IsMatch(const void* dicom, | |
| 1112 uint32_t size) const | |
| 1113 { | |
| 1114 int32_t result; | |
| 1115 | |
| 1116 if (matcher_ != NULL) | |
| 1117 { | |
| 1118 result = OrthancPluginFindMatcherIsMatch(GetGlobalContext(), matcher_, dicom, size); | |
| 1119 } | |
| 1120 else if (worklist_ != NULL) | |
| 1121 { | |
| 1122 result = OrthancPluginWorklistIsMatch(GetGlobalContext(), worklist_, dicom, size); | |
| 1123 } | |
| 1124 else | |
| 1125 { | |
| 1126 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
| 1127 } | |
| 1128 | |
| 1129 if (result == 0) | |
| 1130 { | |
| 1131 return false; | |
| 1132 } | |
| 1133 else if (result == 1) | |
| 1134 { | |
| 1135 return true; | |
| 1136 } | |
| 1137 else | |
| 1138 { | |
| 1139 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
| 1140 } | |
| 1141 } | |
| 1142 | |
| 1143 #endif /* HAS_ORTHANC_PLUGIN_FIND_MATCHER == 1 */ | |
| 1144 | |
| 1145 void AnswerJson(const Json::Value& value, | |
| 1146 OrthancPluginRestOutput* output | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1147 ) |
| 3028 | 1148 { |
| 1149 Json::StyledWriter writer; | |
| 1150 std::string bodyString = writer.write(value); | |
| 1151 | |
| 1152 OrthancPluginAnswerBuffer(GetGlobalContext(), output, bodyString.c_str(), bodyString.size(), "application/json"); | |
| 1153 } | |
| 1154 | |
| 1155 void AnswerString(const std::string& answer, | |
| 1156 const char* mimeType, | |
| 1157 OrthancPluginRestOutput* output | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1158 ) |
| 3028 | 1159 { |
| 1160 OrthancPluginAnswerBuffer(GetGlobalContext(), output, answer.c_str(), answer.size(), mimeType); | |
| 1161 } | |
| 1162 | |
| 1163 void AnswerHttpError(uint16_t httpError, OrthancPluginRestOutput *output) | |
| 1164 { | |
| 1165 OrthancPluginSendHttpStatusCode(GetGlobalContext(), output, httpError); | |
| 1166 } | |
| 1167 | |
| 1168 void AnswerMethodNotAllowed(OrthancPluginRestOutput *output, const char* allowedMethods) | |
| 1169 { | |
| 1170 OrthancPluginSendMethodNotAllowed(GetGlobalContext(), output, allowedMethods); | |
| 1171 } | |
| 1172 | |
| 1173 bool RestApiGetString(std::string& result, | |
| 1174 const std::string& uri, | |
| 1175 bool applyPlugins) | |
| 1176 { | |
| 1177 MemoryBuffer answer; | |
| 1178 if (!answer.RestApiGet(uri, applyPlugins)) | |
| 1179 { | |
| 1180 return false; | |
| 1181 } | |
| 1182 else | |
| 1183 { | |
| 1184 answer.ToString(result); | |
| 1185 return true; | |
| 1186 } | |
| 1187 } | |
| 1188 | |
| 1189 bool RestApiGetString(std::string& result, | |
| 1190 const std::string& uri, | |
| 1191 const std::map<std::string, std::string>& httpHeaders, | |
| 1192 bool applyPlugins) | |
| 1193 { | |
| 1194 MemoryBuffer answer; | |
| 1195 if (!answer.RestApiGet(uri, httpHeaders, applyPlugins)) | |
| 1196 { | |
| 1197 return false; | |
| 1198 } | |
| 1199 else | |
| 1200 { | |
| 1201 answer.ToString(result); | |
| 1202 return true; | |
| 1203 } | |
| 1204 } | |
| 1205 | |
| 1206 | |
| 1207 | |
| 1208 bool RestApiGet(Json::Value& result, | |
| 1209 const std::string& uri, | |
| 1210 bool applyPlugins) | |
| 1211 { | |
| 1212 MemoryBuffer answer; | |
| 1213 | |
| 1214 if (!answer.RestApiGet(uri, applyPlugins)) | |
| 1215 { | |
| 1216 return false; | |
| 1217 } | |
| 1218 else | |
| 1219 { | |
| 1220 if (!answer.IsEmpty()) | |
| 1221 { | |
| 1222 answer.ToJson(result); | |
| 1223 } | |
| 1224 return true; | |
| 1225 } | |
| 1226 } | |
| 1227 | |
| 1228 | |
| 1229 bool RestApiPost(Json::Value& result, | |
| 1230 const std::string& uri, | |
| 1231 const char* body, | |
| 1232 size_t bodySize, | |
| 1233 bool applyPlugins) | |
| 1234 { | |
| 1235 MemoryBuffer answer; | |
| 1236 | |
| 1237 if (!answer.RestApiPost(uri, body, bodySize, applyPlugins)) | |
| 1238 { | |
| 1239 return false; | |
| 1240 } | |
| 1241 else | |
| 1242 { | |
| 1243 if (!answer.IsEmpty()) | |
| 1244 { | |
| 1245 answer.ToJson(result); | |
| 1246 } | |
| 1247 return true; | |
| 1248 } | |
| 1249 } | |
| 1250 | |
| 1251 | |
| 1252 bool RestApiPost(Json::Value& result, | |
| 1253 const std::string& uri, | |
| 1254 const Json::Value& body, | |
| 1255 bool applyPlugins) | |
| 1256 { | |
| 1257 Json::FastWriter writer; | |
| 1258 return RestApiPost(result, uri, writer.write(body), applyPlugins); | |
| 1259 } | |
| 1260 | |
| 1261 | |
| 1262 bool RestApiPut(Json::Value& result, | |
| 1263 const std::string& uri, | |
| 1264 const char* body, | |
| 1265 size_t bodySize, | |
| 1266 bool applyPlugins) | |
| 1267 { | |
| 1268 MemoryBuffer answer; | |
| 1269 | |
| 1270 if (!answer.RestApiPut(uri, body, bodySize, applyPlugins)) | |
| 1271 { | |
| 1272 return false; | |
| 1273 } | |
| 1274 else | |
| 1275 { | |
| 1276 if (!answer.IsEmpty()) // i.e, on a PUT to metadata/..., orthand returns an empty response | |
| 1277 { | |
| 1278 answer.ToJson(result); | |
| 1279 } | |
| 1280 return true; | |
| 1281 } | |
| 1282 } | |
| 1283 | |
| 1284 | |
| 1285 bool RestApiPut(Json::Value& result, | |
| 1286 const std::string& uri, | |
| 1287 const Json::Value& body, | |
| 1288 bool applyPlugins) | |
| 1289 { | |
| 1290 Json::FastWriter writer; | |
| 1291 return RestApiPut(result, uri, writer.write(body), applyPlugins); | |
| 1292 } | |
| 1293 | |
| 1294 | |
| 1295 bool RestApiDelete(const std::string& uri, | |
| 1296 bool applyPlugins) | |
| 1297 { | |
| 1298 OrthancPluginErrorCode error; | |
| 1299 | |
| 1300 if (applyPlugins) | |
| 1301 { | |
| 1302 error = OrthancPluginRestApiDeleteAfterPlugins(GetGlobalContext(), uri.c_str()); | |
| 1303 } | |
| 1304 else | |
| 1305 { | |
| 1306 error = OrthancPluginRestApiDelete(GetGlobalContext(), uri.c_str()); | |
| 1307 } | |
| 1308 | |
| 1309 if (error == OrthancPluginErrorCode_Success) | |
| 1310 { | |
| 1311 return true; | |
| 1312 } | |
| 1313 else if (error == OrthancPluginErrorCode_UnknownResource || | |
| 1314 error == OrthancPluginErrorCode_InexistentItem) | |
| 1315 { | |
| 1316 return false; | |
| 1317 } | |
| 1318 else | |
| 1319 { | |
| 1320 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(error); | |
| 1321 } | |
| 1322 } | |
| 1323 | |
| 1324 | |
| 1325 void ReportMinimalOrthancVersion(unsigned int major, | |
| 1326 unsigned int minor, | |
| 1327 unsigned int revision) | |
| 1328 { | |
| 1329 LogError("Your version of the Orthanc core (" + | |
| 1330 std::string(GetGlobalContext()->orthancVersion) + | |
| 1331 ") is too old to run this plugin (version " + | |
| 1332 boost::lexical_cast<std::string>(major) + "." + | |
| 1333 boost::lexical_cast<std::string>(minor) + "." + | |
| 1334 boost::lexical_cast<std::string>(revision) + | |
| 1335 " is required)"); | |
| 1336 } | |
| 1337 | |
| 1338 | |
| 1339 bool CheckMinimalOrthancVersion(unsigned int major, | |
| 1340 unsigned int minor, | |
| 1341 unsigned int revision) | |
| 1342 { | |
| 1343 if (!HasGlobalContext()) | |
| 1344 { | |
| 1345 LogError("Bad Orthanc context in the plugin"); | |
| 1346 return false; | |
| 1347 } | |
| 1348 | |
| 1349 if (!strcmp(GetGlobalContext()->orthancVersion, "mainline")) | |
| 1350 { | |
| 1351 // Assume compatibility with the mainline | |
| 1352 return true; | |
| 1353 } | |
| 1354 | |
| 1355 // Parse the version of the Orthanc core | |
| 1356 int aa, bb, cc; | |
| 1357 if ( | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1358 #ifdef _MSC_VER |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1359 sscanf_s |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1360 #else |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1361 sscanf |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1362 #endif |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1363 (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
|
1364 aa < 0 || |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1365 bb < 0 || |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1366 cc < 0) |
| 3028 | 1367 { |
| 1368 return false; | |
| 1369 } | |
| 1370 | |
| 1371 unsigned int a = static_cast<unsigned int>(aa); | |
| 1372 unsigned int b = static_cast<unsigned int>(bb); | |
| 1373 unsigned int c = static_cast<unsigned int>(cc); | |
| 1374 | |
| 1375 // Check the major version number | |
| 1376 | |
| 1377 if (a > major) | |
| 3026 | 1378 { |
| 1379 return true; | |
| 1380 } | |
| 1381 | |
| 3028 | 1382 if (a < major) |
| 1383 { | |
| 1384 return false; | |
| 1385 } | |
| 1386 | |
|
2792
57e2d65d37ce
OrthancPlugins::MemoryBuffer::Release(), fixing openssl link
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
1387 |
| 3028 | 1388 // Check the minor version number |
| 1389 assert(a == major); | |
| 1390 | |
| 1391 if (b > minor) | |
| 3026 | 1392 { |
| 1393 return true; | |
| 1394 } | |
|
2792
57e2d65d37ce
OrthancPlugins::MemoryBuffer::Release(), fixing openssl link
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
1395 |
| 3028 | 1396 if (b < minor) |
| 3026 | 1397 { |
| 3028 | 1398 return false; |
| 3026 | 1399 } |
| 1400 | |
| 3028 | 1401 // Check the patch level version number |
| 1402 assert(a == major && b == minor); | |
| 3026 | 1403 |
| 3028 | 1404 if (c >= revision) |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1405 { |
| 3028 | 1406 return true; |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1407 } |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1408 else |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1409 { |
| 3028 | 1410 return false; |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1411 } |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1412 } |
|
2058
43cd2ab060c7
cont OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2048
diff
changeset
|
1413 |
|
43cd2ab060c7
cont OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2048
diff
changeset
|
1414 |
| 3028 | 1415 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 5, 0) |
| 1416 const char* AutodetectMimeType(const std::string& path) | |
| 3026 | 1417 { |
| 3028 | 1418 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
|
1419 |
| 3028 | 1420 if (mime == NULL) |
| 1421 { | |
| 1422 // Should never happen, just for safety | |
| 1423 return "application/octet-stream"; | |
| 1424 } | |
| 1425 else | |
| 1426 { | |
| 1427 return mime; | |
| 1428 } | |
| 2848 | 1429 } |
| 3026 | 1430 #endif |
| 1431 | |
| 1432 | |
| 1433 #if HAS_ORTHANC_PLUGIN_PEERS == 1 | |
| 3028 | 1434 size_t OrthancPeers::GetPeerIndex(const std::string& name) const |
| 3026 | 1435 { |
| 3028 | 1436 size_t index; |
| 1437 if (LookupName(index, name)) | |
| 1438 { | |
| 1439 return index; | |
| 1440 } | |
| 1441 else | |
| 1442 { | |
| 1443 LogError("Inexistent peer: " + name); | |
| 1444 ORTHANC_PLUGINS_THROW_EXCEPTION(UnknownResource); | |
| 1445 } | |
| 3026 | 1446 } |
| 2059 | 1447 |
| 1448 | |
| 3028 | 1449 OrthancPeers::OrthancPeers() : |
| 1450 peers_(NULL), | |
| 1451 timeout_(0) | |
|
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2177
diff
changeset
|
1452 { |
| 3028 | 1453 peers_ = OrthancPluginGetPeers(GetGlobalContext()); |
| 3026 | 1454 |
| 3028 | 1455 if (peers_ == NULL) |
| 3026 | 1456 { |
| 1457 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin); | |
| 1458 } | |
| 1459 | |
| 3028 | 1460 uint32_t count = OrthancPluginGetPeersCount(GetGlobalContext(), peers_); |
| 1461 | |
| 1462 for (uint32_t i = 0; i < count; i++) | |
| 1463 { | |
| 1464 const char* name = OrthancPluginGetPeerName(GetGlobalContext(), peers_, i); | |
| 1465 if (name == NULL) | |
| 1466 { | |
| 1467 OrthancPluginFreePeers(GetGlobalContext(), peers_); | |
| 1468 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin); | |
| 1469 } | |
| 1470 | |
| 1471 index_[name] = i; | |
| 1472 } | |
| 1473 } | |
| 1474 | |
| 1475 | |
| 1476 OrthancPeers::~OrthancPeers() | |
| 1477 { | |
| 1478 if (peers_ != NULL) | |
| 1479 { | |
| 1480 OrthancPluginFreePeers(GetGlobalContext(), peers_); | |
| 1481 } | |
| 1482 } | |
| 1483 | |
| 1484 | |
| 1485 bool OrthancPeers::LookupName(size_t& target, | |
| 1486 const std::string& name) const | |
| 1487 { | |
| 1488 Index::const_iterator found = index_.find(name); | |
| 1489 | |
| 1490 if (found == index_.end()) | |
| 1491 { | |
| 1492 return false; | |
| 1493 } | |
| 1494 else | |
| 1495 { | |
| 1496 target = found->second; | |
| 1497 return true; | |
| 1498 } | |
| 3026 | 1499 } |
| 3028 | 1500 |
| 1501 | |
| 1502 std::string OrthancPeers::GetPeerName(size_t index) const | |
| 1503 { | |
| 1504 if (index >= index_.size()) | |
| 1505 { | |
| 1506 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
| 1507 } | |
| 1508 else | |
| 1509 { | |
| 1510 const char* s = OrthancPluginGetPeerName(GetGlobalContext(), peers_, static_cast<uint32_t>(index)); | |
| 1511 if (s == NULL) | |
| 1512 { | |
| 1513 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin); | |
| 1514 } | |
| 1515 else | |
| 1516 { | |
| 1517 return s; | |
| 1518 } | |
| 1519 } | |
| 1520 } | |
| 1521 | |
| 1522 | |
| 1523 std::string OrthancPeers::GetPeerUrl(size_t index) const | |
| 1524 { | |
| 1525 if (index >= index_.size()) | |
| 1526 { | |
| 1527 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
| 1528 } | |
| 1529 else | |
| 1530 { | |
| 1531 const char* s = OrthancPluginGetPeerUrl(GetGlobalContext(), peers_, static_cast<uint32_t>(index)); | |
| 1532 if (s == NULL) | |
| 1533 { | |
| 1534 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin); | |
| 1535 } | |
| 1536 else | |
| 1537 { | |
| 1538 return s; | |
| 1539 } | |
| 1540 } | |
| 1541 } | |
| 1542 | |
| 1543 | |
| 1544 std::string OrthancPeers::GetPeerUrl(const std::string& name) const | |
| 1545 { | |
| 1546 return GetPeerUrl(GetPeerIndex(name)); | |
| 1547 } | |
| 1548 | |
| 1549 | |
| 1550 bool OrthancPeers::LookupUserProperty(std::string& value, | |
| 1551 size_t index, | |
| 1552 const std::string& key) const | |
| 1553 { | |
| 1554 if (index >= index_.size()) | |
| 1555 { | |
| 1556 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
| 1557 } | |
| 1558 else | |
| 1559 { | |
| 1560 const char* s = OrthancPluginGetPeerUserProperty(GetGlobalContext(), peers_, static_cast<uint32_t>(index), key.c_str()); | |
| 1561 if (s == NULL) | |
| 1562 { | |
| 1563 return false; | |
| 1564 } | |
| 1565 else | |
| 1566 { | |
| 1567 value.assign(s); | |
| 1568 return true; | |
| 1569 } | |
| 1570 } | |
| 1571 } | |
| 1572 | |
| 1573 | |
| 1574 bool OrthancPeers::LookupUserProperty(std::string& value, | |
| 1575 const std::string& peer, | |
| 1576 const std::string& key) const | |
| 1577 { | |
| 1578 return LookupUserProperty(value, GetPeerIndex(peer), key); | |
| 1579 } | |
| 3026 | 1580 |
|
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2177
diff
changeset
|
1581 |
| 3028 | 1582 bool OrthancPeers::DoGet(MemoryBuffer& target, |
| 1583 size_t index, | |
| 1584 const std::string& uri) const | |
| 1585 { | |
| 1586 if (index >= index_.size()) | |
| 1587 { | |
| 1588 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
| 1589 } | |
| 1590 | |
| 3320 | 1591 OrthancPlugins::MemoryBuffer answer; |
| 3028 | 1592 uint16_t status; |
| 1593 OrthancPluginErrorCode code = OrthancPluginCallPeerApi | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1594 (GetGlobalContext(), *answer, NULL, &status, peers_, |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1595 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
|
1596 0, NULL, NULL, NULL, 0, timeout_); |
| 3028 | 1597 |
| 1598 if (code == OrthancPluginErrorCode_Success) | |
| 1599 { | |
| 3320 | 1600 target.Swap(answer); |
| 3028 | 1601 return (status == 200); |
| 1602 } | |
| 1603 else | |
| 1604 { | |
| 1605 return false; | |
| 1606 } | |
| 1607 } | |
| 1608 | |
| 1609 | |
| 1610 bool OrthancPeers::DoGet(MemoryBuffer& target, | |
| 1611 const std::string& name, | |
| 1612 const std::string& uri) const | |
| 1613 { | |
| 1614 size_t index; | |
| 1615 return (LookupName(index, name) && | |
| 1616 DoGet(target, index, uri)); | |
| 1617 } | |
| 1618 | |
| 1619 | |
| 1620 bool OrthancPeers::DoGet(Json::Value& target, | |
| 1621 size_t index, | |
| 1622 const std::string& uri) const | |
| 1623 { | |
| 1624 MemoryBuffer buffer; | |
| 1625 | |
| 1626 if (DoGet(buffer, index, uri)) | |
| 1627 { | |
| 1628 buffer.ToJson(target); | |
| 1629 return true; | |
| 1630 } | |
| 1631 else | |
| 1632 { | |
| 1633 return false; | |
| 1634 } | |
| 1635 } | |
| 1636 | |
| 1637 | |
| 1638 bool OrthancPeers::DoGet(Json::Value& target, | |
| 1639 const std::string& name, | |
| 1640 const std::string& uri) const | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1641 { |
| 3028 | 1642 MemoryBuffer buffer; |
| 1643 | |
| 1644 if (DoGet(buffer, name, uri)) | |
| 1645 { | |
| 1646 buffer.ToJson(target); | |
| 1647 return true; | |
| 1648 } | |
| 1649 else | |
| 1650 { | |
| 1651 return false; | |
| 1652 } | |
| 1653 } | |
| 1654 | |
| 1655 | |
| 1656 bool OrthancPeers::DoPost(MemoryBuffer& target, | |
| 1657 const std::string& name, | |
| 1658 const std::string& uri, | |
| 1659 const std::string& body) const | |
| 1660 { | |
| 1661 size_t index; | |
| 1662 return (LookupName(index, name) && | |
| 1663 DoPost(target, index, uri, body)); | |
| 1664 } | |
| 1665 | |
| 1666 | |
| 1667 bool OrthancPeers::DoPost(Json::Value& target, | |
| 1668 size_t index, | |
| 1669 const std::string& uri, | |
| 1670 const std::string& body) const | |
| 1671 { | |
| 1672 MemoryBuffer buffer; | |
| 1673 | |
| 1674 if (DoPost(buffer, index, uri, body)) | |
| 1675 { | |
| 1676 buffer.ToJson(target); | |
| 1677 return true; | |
| 1678 } | |
| 1679 else | |
| 1680 { | |
| 1681 return false; | |
| 1682 } | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1683 } |
| 3028 | 1684 |
| 1685 | |
| 1686 bool OrthancPeers::DoPost(Json::Value& target, | |
| 1687 const std::string& name, | |
| 1688 const std::string& uri, | |
| 1689 const std::string& body) const | |
| 1690 { | |
| 1691 MemoryBuffer buffer; | |
| 1692 | |
| 1693 if (DoPost(buffer, name, uri, body)) | |
| 1694 { | |
| 1695 buffer.ToJson(target); | |
| 1696 return true; | |
| 1697 } | |
| 1698 else | |
| 1699 { | |
| 1700 return false; | |
| 1701 } | |
| 1702 } | |
| 1703 | |
| 1704 | |
| 1705 bool OrthancPeers::DoPost(MemoryBuffer& target, | |
| 1706 size_t index, | |
| 1707 const std::string& uri, | |
| 1708 const std::string& body) const | |
| 1709 { | |
| 1710 if (index >= index_.size()) | |
| 1711 { | |
| 1712 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
| 1713 } | |
| 1714 | |
| 3320 | 1715 OrthancPlugins::MemoryBuffer answer; |
| 3028 | 1716 uint16_t status; |
| 1717 OrthancPluginErrorCode code = OrthancPluginCallPeerApi | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1718 (GetGlobalContext(), *answer, NULL, &status, peers_, |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1719 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
|
1720 0, NULL, NULL, body.empty() ? NULL : body.c_str(), body.size(), timeout_); |
| 3028 | 1721 |
| 1722 if (code == OrthancPluginErrorCode_Success) | |
| 1723 { | |
| 3320 | 1724 target.Swap(answer); |
| 3028 | 1725 return (status == 200); |
| 1726 } | |
| 1727 else | |
| 1728 { | |
| 1729 return false; | |
| 1730 } | |
| 1731 } | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1732 |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1733 |
| 3028 | 1734 bool OrthancPeers::DoPut(size_t index, |
| 1735 const std::string& uri, | |
| 1736 const std::string& body) const | |
| 1737 { | |
| 1738 if (index >= index_.size()) | |
| 1739 { | |
| 1740 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
| 1741 } | |
| 1742 | |
| 3320 | 1743 OrthancPlugins::MemoryBuffer answer; |
| 3028 | 1744 uint16_t status; |
| 1745 OrthancPluginErrorCode code = OrthancPluginCallPeerApi | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1746 (GetGlobalContext(), *answer, NULL, &status, peers_, |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
1747 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
|
1748 0, NULL, NULL, body.empty() ? NULL : body.c_str(), body.size(), timeout_); |
| 3026 | 1749 |
| 3028 | 1750 if (code == OrthancPluginErrorCode_Success) |
| 1751 { | |
| 1752 return (status == 200); | |
| 1753 } | |
| 1754 else | |
| 1755 { | |
| 1756 return false; | |
| 1757 } | |
| 1758 } | |
| 1759 | |
| 1760 | |
| 1761 bool OrthancPeers::DoPut(const std::string& name, | |
| 1762 const std::string& uri, | |
| 1763 const std::string& body) const | |
| 1764 { | |
| 1765 size_t index; | |
| 1766 return (LookupName(index, name) && | |
| 1767 DoPut(index, uri, body)); | |
| 1768 } | |
| 1769 | |
| 1770 | |
| 1771 bool OrthancPeers::DoDelete(size_t index, | |
| 1772 const std::string& uri) const | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1773 { |
| 3028 | 1774 if (index >= index_.size()) |
| 1775 { | |
| 1776 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
| 1777 } | |
| 1778 | |
| 3320 | 1779 OrthancPlugins::MemoryBuffer answer; |
| 3028 | 1780 uint16_t status; |
| 1781 OrthancPluginErrorCode code = OrthancPluginCallPeerApi | |
| 3320 | 1782 (GetGlobalContext(), *answer, NULL, &status, peers_, |
| 1783 static_cast<uint32_t>(index), OrthancPluginHttpMethod_Delete, uri.c_str(), | |
| 1784 0, NULL, NULL, NULL, 0, timeout_); | |
| 3028 | 1785 |
| 1786 if (code == OrthancPluginErrorCode_Success) | |
| 1787 { | |
| 1788 return (status == 200); | |
| 1789 } | |
| 1790 else | |
| 1791 { | |
| 1792 return false; | |
| 1793 } | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1794 } |
| 3028 | 1795 |
| 1796 | |
| 1797 bool OrthancPeers::DoDelete(const std::string& name, | |
| 1798 const std::string& uri) const | |
| 3026 | 1799 { |
| 3028 | 1800 size_t index; |
| 1801 return (LookupName(index, name) && | |
| 1802 DoDelete(index, uri)); | |
| 1803 } | |
| 1804 #endif | |
| 1805 | |
| 1806 | |
| 1807 | |
| 1808 #if HAS_ORTHANC_PLUGIN_JOB == 1 | |
| 1809 void OrthancJob::CallbackFinalize(void* job) | |
| 1810 { | |
| 1811 if (job != NULL) | |
| 1812 { | |
| 1813 delete reinterpret_cast<OrthancJob*>(job); | |
| 1814 } | |
| 3026 | 1815 } |
| 3028 | 1816 |
| 1817 | |
| 1818 float OrthancJob::CallbackGetProgress(void* job) | |
| 1819 { | |
| 1820 assert(job != NULL); | |
| 1821 | |
| 1822 try | |
| 1823 { | |
| 1824 return reinterpret_cast<OrthancJob*>(job)->progress_; | |
| 1825 } | |
| 1826 catch (...) | |
| 1827 { | |
| 1828 return 0; | |
| 1829 } | |
| 1830 } | |
| 1831 | |
| 1832 | |
| 1833 const char* OrthancJob::CallbackGetContent(void* job) | |
| 1834 { | |
| 1835 assert(job != NULL); | |
| 1836 | |
| 1837 try | |
| 1838 { | |
| 1839 return reinterpret_cast<OrthancJob*>(job)->content_.c_str(); | |
| 1840 } | |
| 1841 catch (...) | |
| 1842 { | |
| 1843 return 0; | |
| 1844 } | |
| 1845 } | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1846 |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1847 |
| 3028 | 1848 const char* OrthancJob::CallbackGetSerialized(void* job) |
| 1849 { | |
| 1850 assert(job != NULL); | |
| 1851 | |
| 1852 try | |
| 1853 { | |
| 1854 const OrthancJob& tmp = *reinterpret_cast<OrthancJob*>(job); | |
| 1855 | |
| 1856 if (tmp.hasSerialized_) | |
| 1857 { | |
| 1858 return tmp.serialized_.c_str(); | |
| 1859 } | |
| 1860 else | |
| 1861 { | |
| 1862 return NULL; | |
| 1863 } | |
| 1864 } | |
| 1865 catch (...) | |
| 1866 { | |
| 1867 return 0; | |
| 1868 } | |
| 1869 } | |
| 1870 | |
| 1871 | |
| 1872 OrthancPluginJobStepStatus OrthancJob::CallbackStep(void* job) | |
| 1873 { | |
| 1874 assert(job != NULL); | |
| 1875 | |
| 1876 try | |
| 1877 { | |
| 1878 return reinterpret_cast<OrthancJob*>(job)->Step(); | |
| 1879 } | |
| 1880 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS&) | |
| 1881 { | |
| 1882 return OrthancPluginJobStepStatus_Failure; | |
| 1883 } | |
| 1884 catch (...) | |
| 1885 { | |
| 1886 return OrthancPluginJobStepStatus_Failure; | |
| 1887 } | |
| 1888 } | |
| 1889 | |
| 1890 | |
| 1891 OrthancPluginErrorCode OrthancJob::CallbackStop(void* job, | |
| 1892 OrthancPluginJobStopReason reason) | |
| 1893 { | |
| 1894 assert(job != NULL); | |
| 1895 | |
| 1896 try | |
| 1897 { | |
| 1898 reinterpret_cast<OrthancJob*>(job)->Stop(reason); | |
| 1899 return OrthancPluginErrorCode_Success; | |
| 1900 } | |
| 1901 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) | |
| 1902 { | |
| 1903 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); | |
| 1904 } | |
| 1905 catch (...) | |
| 1906 { | |
| 1907 return OrthancPluginErrorCode_Plugin; | |
| 1908 } | |
| 1909 } | |
| 1910 | |
| 1911 | |
| 1912 OrthancPluginErrorCode OrthancJob::CallbackReset(void* job) | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1913 { |
| 3028 | 1914 assert(job != NULL); |
| 1915 | |
| 1916 try | |
| 1917 { | |
| 1918 reinterpret_cast<OrthancJob*>(job)->Reset(); | |
| 1919 return OrthancPluginErrorCode_Success; | |
| 1920 } | |
| 1921 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) | |
| 1922 { | |
| 1923 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); | |
| 1924 } | |
| 1925 catch (...) | |
| 1926 { | |
| 1927 return OrthancPluginErrorCode_Plugin; | |
| 1928 } | |
| 1929 } | |
| 1930 | |
| 1931 | |
| 1932 void OrthancJob::ClearContent() | |
| 1933 { | |
| 1934 Json::Value empty = Json::objectValue; | |
| 1935 UpdateContent(empty); | |
| 1936 } | |
| 1937 | |
| 1938 | |
| 1939 void OrthancJob::UpdateContent(const Json::Value& content) | |
| 1940 { | |
| 1941 if (content.type() != Json::objectValue) | |
| 1942 { | |
| 1943 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_BadFileFormat); | |
| 1944 } | |
| 1945 else | |
| 1946 { | |
| 1947 Json::FastWriter writer; | |
| 1948 content_ = writer.write(content); | |
| 1949 } | |
| 1950 } | |
| 1951 | |
| 1952 | |
| 1953 void OrthancJob::ClearSerialized() | |
| 1954 { | |
| 1955 hasSerialized_ = false; | |
| 1956 serialized_.clear(); | |
| 3026 | 1957 } |
| 3028 | 1958 |
| 1959 | |
| 1960 void OrthancJob::UpdateSerialized(const Json::Value& serialized) | |
| 1961 { | |
| 1962 if (serialized.type() != Json::objectValue) | |
| 1963 { | |
| 1964 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_BadFileFormat); | |
| 1965 } | |
| 1966 else | |
| 1967 { | |
| 1968 Json::FastWriter writer; | |
| 1969 serialized_ = writer.write(serialized); | |
| 1970 hasSerialized_ = true; | |
| 1971 } | |
| 1972 } | |
| 1973 | |
| 1974 | |
| 1975 void OrthancJob::UpdateProgress(float progress) | |
| 3026 | 1976 { |
| 3028 | 1977 if (progress < 0 || |
| 1978 progress > 1) | |
| 1979 { | |
| 1980 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
| 1981 } | |
| 1982 | |
| 1983 progress_ = progress; | |
| 1984 } | |
| 1985 | |
| 1986 | |
| 1987 OrthancJob::OrthancJob(const std::string& jobType) : | |
| 1988 jobType_(jobType), | |
| 1989 progress_(0) | |
| 1990 { | |
| 1991 ClearContent(); | |
| 1992 ClearSerialized(); | |
| 1993 } | |
| 1994 | |
| 1995 | |
| 1996 OrthancPluginJob* OrthancJob::Create(OrthancJob* job) | |
| 1997 { | |
| 1998 if (job == NULL) | |
| 1999 { | |
| 2000 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_NullPointer); | |
| 2001 } | |
| 2002 | |
| 2003 OrthancPluginJob* orthanc = OrthancPluginCreateJob( | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2004 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
|
2005 CallbackGetProgress, CallbackGetContent, CallbackGetSerialized, |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2006 CallbackStep, CallbackStop, CallbackReset); |
| 3028 | 2007 |
| 2008 if (orthanc == NULL) | |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2009 { |
| 3026 | 2010 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin); |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2011 } |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2012 else |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2013 { |
| 3028 | 2014 return orthanc; |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2015 } |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2016 } |
|
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2177
diff
changeset
|
2017 |
|
2264
8e5e0de75839
primitives for HTTP client in plugin C++ wrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2263
diff
changeset
|
2018 |
| 3028 | 2019 std::string OrthancJob::Submit(OrthancJob* job, |
| 2020 int priority) | |
|
2264
8e5e0de75839
primitives for HTTP client in plugin C++ wrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2263
diff
changeset
|
2021 { |
| 3028 | 2022 OrthancPluginJob* orthanc = Create(job); |
| 2023 | |
| 2024 char* id = OrthancPluginSubmitJob(GetGlobalContext(), orthanc, priority); | |
| 2025 | |
| 2026 if (id == NULL) | |
| 3026 | 2027 { |
| 3028 | 2028 LogError("Plugin cannot submit job"); |
| 2029 OrthancPluginFreeJob(GetGlobalContext(), orthanc); | |
| 3026 | 2030 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin); |
| 2031 } | |
| 2032 else | |
| 2033 { | |
| 3028 | 2034 std::string tmp(id); |
| 2035 tmp.assign(id); | |
| 2036 OrthancPluginFreeString(GetGlobalContext(), id); | |
| 3026 | 2037 |
| 3028 | 2038 return tmp; |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2039 } |
|
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2040 } |
|
2817
473bf302d629
C++ wrappers around OrthancPluginJob and OrthancPluginPeers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2803
diff
changeset
|
2041 #endif |
|
3179
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2042 |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2043 |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2044 #if HAS_ORTHANC_PLUGIN_METRICS == 1 |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2045 MetricsTimer::MetricsTimer(const char* name) : |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2046 name_(name) |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2047 { |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2048 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
|
2049 } |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2050 |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2051 MetricsTimer::~MetricsTimer() |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2052 { |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2053 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
|
2054 const boost::posix_time::time_duration diff = stop - start_; |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2055 OrthancPluginSetMetricsValue(GetGlobalContext(), name_.c_str(), diff.total_milliseconds(), |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2056 OrthancPluginMetricsType_Timer); |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2057 } |
|
fca730c267d7
New primitives to set and refresh metrics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
2058 #endif |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2059 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2060 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2061 |
| 3388 | 2062 #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
|
2063 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
|
2064 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2065 private: |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2066 static RequestBodyWrapper& GetObject(void* body) |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2067 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2068 assert(body != NULL); |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2069 return *reinterpret_cast<RequestBodyWrapper*>(body); |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2070 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2071 |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2072 IRequestBody& body_; |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2073 bool done_; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2074 std::string chunk_; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2075 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2076 public: |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2077 RequestBodyWrapper(IRequestBody& body) : |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2078 body_(body), |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2079 done_(false) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2080 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2081 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2082 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2083 static uint8_t IsDone(void* body) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2084 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2085 return GetObject(body).done_; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2086 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2087 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2088 static const void* GetChunkData(void* body) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2089 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2090 return GetObject(body).chunk_.c_str(); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2091 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2092 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2093 static uint32_t GetChunkSize(void* body) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2094 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2095 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
|
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 static OrthancPluginErrorCode Next(void* body) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2099 { |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2100 RequestBodyWrapper& that = GetObject(body); |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2101 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2102 if (that.done_) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2103 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2104 return OrthancPluginErrorCode_BadSequenceOfCalls; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2105 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2106 else |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2107 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2108 try |
|
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 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
|
2111 return OrthancPluginErrorCode_Success; |
|
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 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2114 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2115 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2116 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2117 catch (...) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2118 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2119 return OrthancPluginErrorCode_InternalError; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2120 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2121 } |
|
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 }; |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2124 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2125 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2126 #if HAS_ORTHANC_PLUGIN_STREAMING_HTTP_CLIENT == 1 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2127 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
|
2128 const char* key, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2129 const char* value) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2130 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2131 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
|
2132 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2133 try |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2134 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2135 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
|
2136 return OrthancPluginErrorCode_Success; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2137 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2138 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
|
2139 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2140 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
|
2141 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2142 catch (...) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2143 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2144 return OrthancPluginErrorCode_Plugin; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2145 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2146 } |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2147 #endif |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2148 |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2149 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2150 #if HAS_ORTHANC_PLUGIN_STREAMING_HTTP_CLIENT == 1 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2151 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
|
2152 const void* data, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2153 uint32_t size) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2154 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2155 assert(answer != NULL); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2156 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2157 try |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2158 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2159 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
|
2160 return OrthancPluginErrorCode_Success; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2161 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2162 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
|
2163 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2164 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
|
2165 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2166 catch (...) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2167 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2168 return OrthancPluginErrorCode_Plugin; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2169 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2170 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2171 #endif |
|
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 |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2174 HttpClient::HttpClient() : |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2175 httpStatus_(0), |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2176 method_(OrthancPluginHttpMethod_Get), |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2177 timeout_(0), |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2178 pkcs11_(false), |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2179 streamingBody_(NULL) |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2180 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2181 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2182 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2183 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2184 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
|
2185 const std::string& password) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2186 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2187 username_ = username; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2188 password_ = password; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2189 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2190 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2191 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2192 void HttpClient::ClearCredentials() |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2193 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2194 username_.empty(); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2195 password_.empty(); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2196 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2197 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2198 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2199 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
|
2200 const std::string& keyFile, |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2201 const std::string& keyPassword) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2202 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2203 certificateFile_ = certificateFile; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2204 certificateKeyFile_ = keyFile; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2205 certificateKeyPassword_ = keyPassword; |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2206 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2207 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2208 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2209 void HttpClient::ClearCertificate() |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2210 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2211 certificateFile_.clear(); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2212 certificateKeyFile_.clear(); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2213 certificateKeyPassword_.clear(); |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2214 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2215 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2216 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2217 void HttpClient::ClearBody() |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2218 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2219 body_.clear(); |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2220 streamingBody_ = NULL; |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2221 } |
|
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 void HttpClient::SwapBody(std::string& body) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2225 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2226 body_.swap(body); |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2227 streamingBody_ = NULL; |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2228 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2229 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2230 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2231 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
|
2232 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2233 body_ = body; |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2234 streamingBody_ = NULL; |
|
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 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2237 |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2238 void HttpClient::SetBody(IRequestBody& body) |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2239 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2240 body_.clear(); |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2241 streamingBody_ = &body; |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2242 } |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2243 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2244 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2245 namespace |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2246 { |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2247 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
|
2248 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2249 private: |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2250 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
|
2251 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
|
2252 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2253 public: |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2254 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
|
2255 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2256 headersKeys_.reserve(headers.size()); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2257 headersValues_.reserve(headers.size()); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2258 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2259 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
|
2260 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2261 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
|
2262 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
|
2263 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2264 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2265 |
| 3394 | 2266 void AddStaticString(const char* key, |
| 2267 const char* value) | |
| 2268 { | |
| 2269 headersKeys_.push_back(key); | |
| 2270 headersValues_.push_back(value); | |
| 2271 } | |
| 2272 | |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2273 uint32_t GetCount() const |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2274 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2275 return headersKeys_.size(); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2276 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2277 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2278 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
|
2279 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2280 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
|
2281 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2282 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2283 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
|
2284 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2285 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
|
2286 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2287 }; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2288 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2289 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2290 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
|
2291 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2292 private: |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2293 std::string body_; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2294 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2295 public: |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2296 MemoryRequestBody(const std::string& body) : |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2297 body_(body) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2298 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2299 } |
|
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 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
|
2302 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2303 chunk.swap(body_); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2304 return true; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2305 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2306 }; |
|
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 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2309 // 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
|
2310 class ChunkedBuffer : public boost::noncopyable |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2311 { |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2312 private: |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2313 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
|
2314 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2315 Content content_; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2316 size_t size_; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2317 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2318 public: |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2319 ChunkedBuffer() : |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2320 size_(0) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2321 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2322 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2323 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2324 ~ChunkedBuffer() |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2325 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2326 Clear(); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2327 } |
|
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 void Clear() |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2330 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2331 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
|
2332 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2333 assert(*it != NULL); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2334 delete *it; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2335 } |
|
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 content_.clear(); |
|
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 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
|
2341 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2342 target.resize(size_); |
|
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 size_t pos = 0; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2345 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2346 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
|
2347 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2348 assert(*it != NULL); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2349 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
|
2350 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2351 if (s != 0) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2352 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2353 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
|
2354 pos += s; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2355 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2356 } |
|
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 assert(size_ == 0 || |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2359 pos == target.size()); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2360 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2361 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2362 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
|
2363 size_t size) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2364 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2365 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
|
2366 size_ += size; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2367 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2368 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2369 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
|
2370 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2371 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
|
2372 size_ += chunk.size(); |
|
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 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2376 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2377 #if HAS_ORTHANC_PLUGIN_STREAMING_HTTP_CLIENT == 1 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2378 class MemoryAnswer : public HttpClient::IAnswer |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2379 { |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2380 private: |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2381 HttpClient::HttpHeaders headers_; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2382 ChunkedBuffer body_; |
|
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 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
|
2386 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2387 return headers_; |
|
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 const ChunkedBuffer& GetBody() const |
|
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 return body_; |
|
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 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
|
2396 const std::string& value) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2397 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2398 headers_[key] = value; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2399 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2400 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2401 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
|
2402 size_t size) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2403 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2404 body_.AddChunk(data, size); |
|
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 }; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2407 #endif |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2408 } |
|
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 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2411 #if HAS_ORTHANC_PLUGIN_STREAMING_HTTP_CLIENT == 1 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2412 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
|
2413 IAnswer& answer, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2414 IRequestBody& body) const |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2415 { |
| 3394 | 2416 HeadersWrapper h(headers_); |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2417 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2418 // Automatically set the "Transfer-Encoding" header if absent |
| 3394 | 2419 bool found = false; |
| 2420 | |
| 2421 for (HttpHeaders::const_iterator it = headers_.begin(); it != headers_.end(); ++it) | |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2422 { |
| 3394 | 2423 if (boost::iequals(it->first, "Transfer-Encoding")) |
| 2424 { | |
| 2425 found = true; | |
| 2426 break; | |
| 2427 } | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2428 } |
| 3394 | 2429 |
| 2430 if (!found) | |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2431 { |
| 3394 | 2432 h.AddStaticString("Transfer-Encoding", "chunked"); |
|
3393
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 RequestBodyWrapper request(body); |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2436 |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2437 OrthancPluginErrorCode error = OrthancPluginStreamingHttpClient( |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2438 GetGlobalContext(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2439 &answer, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2440 AnswerAddChunkCallback, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2441 AnswerAddHeaderCallback, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2442 &httpStatus, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2443 method_, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2444 url_.c_str(), |
| 3394 | 2445 h.GetCount(), |
| 2446 h.GetKeys(), | |
| 2447 h.GetValues(), | |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2448 &request, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2449 RequestBodyWrapper::IsDone, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2450 RequestBodyWrapper::GetChunkData, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2451 RequestBodyWrapper::GetChunkSize, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2452 RequestBodyWrapper::Next, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2453 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
|
2454 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
|
2455 timeout_, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2456 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
|
2457 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
|
2458 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
|
2459 pkcs11_ ? 1 : 0); |
|
3387
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2460 |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2461 if (error != OrthancPluginErrorCode_Success) |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2462 { |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2463 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
|
2464 } |
|
a48d652f1500
new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3320
diff
changeset
|
2465 } |
|
3393
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2466 #endif |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2467 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2468 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2469 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
|
2470 HttpHeaders& answerHeaders, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2471 std::string& answerBody, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2472 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
|
2473 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2474 HeadersWrapper headers(headers_); |
|
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 MemoryBuffer answerBodyBuffer, answerHeadersBuffer; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2477 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2478 OrthancPluginErrorCode error = OrthancPluginHttpClient( |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2479 GetGlobalContext(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2480 *answerBodyBuffer, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2481 *answerHeadersBuffer, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2482 &httpStatus, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2483 method_, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2484 url_.c_str(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2485 headers.GetCount(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2486 headers.GetKeys(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2487 headers.GetValues(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2488 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
|
2489 body.size(), |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2490 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
|
2491 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
|
2492 timeout_, |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2493 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
|
2494 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
|
2495 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
|
2496 pkcs11_ ? 1 : 0); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2497 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2498 if (error != OrthancPluginErrorCode_Success) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2499 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2500 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
|
2501 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2502 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2503 Json::Value v; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2504 answerHeadersBuffer.ToJson(v); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2505 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2506 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
|
2507 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2508 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
|
2509 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2510 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2511 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
|
2512 answerHeaders.clear(); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2513 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2514 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
|
2515 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2516 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
|
2517 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
|
2518 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2519 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
|
2520 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2521 else |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2522 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2523 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
|
2524 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2525 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2526 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2527 answerBodyBuffer.ToString(answerBody); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2528 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2529 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2530 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2531 #if HAS_ORTHANC_PLUGIN_STREAMING_HTTP_CLIENT == 1 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2532 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
|
2533 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2534 if (streamingBody_ != NULL) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2535 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2536 ExecuteWithStream(httpStatus_, answer, *streamingBody_); |
|
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 else |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2539 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2540 MemoryRequestBody wrapper(body_); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2541 ExecuteWithStream(httpStatus_, answer, wrapper); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2542 } |
|
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 #endif |
|
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 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2547 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
|
2548 std::string& answerBody /* out */) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2549 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2550 #if HAS_ORTHANC_PLUGIN_STREAMING_HTTP_CLIENT == 1 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2551 MemoryAnswer answer; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2552 Execute(answer); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2553 answerHeaders = answer.GetHeaders(); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2554 answer.GetBody().Flatten(answerBody); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2555 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2556 #else |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2557 // 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
|
2558 // 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
|
2559 // at once) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2560 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2561 if (streamingBody_ != NULL) |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2562 { |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2563 ChunkedBuffer buffer; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2564 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2565 std::string chunk; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2566 while (streamingBody_->ReadNextChunk(chunk)) |
|
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 buffer.AddChunk(chunk); |
|
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 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2571 std::string body; |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2572 buffer.Flatten(body); |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2573 |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2574 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
|
2575 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2576 else |
|
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 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
|
2579 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2580 #endif |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2581 } |
|
2cd0369a156f
support of chunked answers in HttpClient and in SDK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3392
diff
changeset
|
2582 |
| 3388 | 2583 #endif /* HAS_ORTHANC_PLUGIN_HTTP_CLIENT == 1 */ |
|
2047
438f86ee19fc
toolbox shared by all plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2584 } |