Mercurial > hg > orthanc-transfers
annotate Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp @ 64:5fb01c588287
updated to Orthanc Framework 1.12.1
author | Alain Mazy <am@osimis.io> |
---|---|
date | Wed, 11 Oct 2023 15:58:27 +0200 |
parents | 5915547fa6f2 |
children | 1078942460cc |
rev | line source |
---|---|
22 | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | |
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
4 * Department, University Hospital of Liege, Belgium | |
64
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
5 * Copyright (C) 2017-2023 Osimis S.A., Belgium |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
6 * Copyright (C) 2021-2023 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
22 | 7 * |
8 * This program is free software: you can redistribute it and/or | |
9 * modify it under the terms of the GNU General Public License as | |
10 * published by the Free Software Foundation, either version 3 of the | |
11 * License, or (at your option) any later version. | |
28 | 12 * |
22 | 13 * This program is distributed in the hope that it will be useful, but |
14 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
16 * General Public License for more details. | |
17 * | |
18 * You should have received a copy of the GNU General Public License | |
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
20 **/ | |
21 | |
22 | |
23 #include "OrthancPluginCppWrapper.h" | |
24 | |
25 #include <boost/algorithm/string/predicate.hpp> | |
26 #include <boost/move/unique_ptr.hpp> | |
27 #include <boost/thread.hpp> | |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
28 |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
29 |
22 | 30 #include <json/reader.h> |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
31 #include <json/version.h> |
22 | 32 #include <json/writer.h> |
33 | |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
34 #if !defined(JSONCPP_VERSION_MAJOR) || !defined(JSONCPP_VERSION_MINOR) |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
35 # error Cannot access the version of JsonCpp |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
36 #endif |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
37 |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
38 |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
39 /** |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
40 * We use deprecated "Json::Reader", "Json::StyledWriter" and |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
41 * "Json::FastWriter" if JsonCpp < 1.7.0. This choice is rather |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
42 * arbitrary, but if Json >= 1.9.0, gcc generates explicit deprecation |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
43 * warnings (clang was warning in earlier versions). For reference, |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
44 * these classes seem to have been deprecated since JsonCpp 1.4.0 (on |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
45 * February 2015) by the following changeset: |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
46 * https://github.com/open-source-parsers/jsoncpp/commit/8df98f6112890d6272734975dd6d70cf8999bb22 |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
47 **/ |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
48 #if (JSONCPP_VERSION_MAJOR >= 2 || \ |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
49 (JSONCPP_VERSION_MAJOR == 1 && JSONCPP_VERSION_MINOR >= 8)) |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
50 # define JSONCPP_USE_DEPRECATED 0 |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
51 #else |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
52 # define JSONCPP_USE_DEPRECATED 1 |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
53 #endif |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
54 |
22 | 55 |
56 #if !ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 2, 0) | |
57 static const OrthancPluginErrorCode OrthancPluginErrorCode_NullPointer = OrthancPluginErrorCode_Plugin; | |
58 #endif | |
59 | |
60 | |
61 namespace OrthancPlugins | |
62 { | |
63 static OrthancPluginContext* globalContext_ = NULL; | |
64 | |
65 | |
66 void SetGlobalContext(OrthancPluginContext* context) | |
67 { | |
68 if (context == NULL) | |
69 { | |
70 ORTHANC_PLUGINS_THROW_EXCEPTION(NullPointer); | |
71 } | |
72 else if (globalContext_ == NULL) | |
73 { | |
74 globalContext_ = context; | |
75 } | |
76 else | |
77 { | |
78 ORTHANC_PLUGINS_THROW_EXCEPTION(BadSequenceOfCalls); | |
79 } | |
80 } | |
81 | |
82 | |
83 bool HasGlobalContext() | |
84 { | |
85 return globalContext_ != NULL; | |
86 } | |
87 | |
88 | |
89 OrthancPluginContext* GetGlobalContext() | |
90 { | |
91 if (globalContext_ == NULL) | |
92 { | |
93 ORTHANC_PLUGINS_THROW_EXCEPTION(BadSequenceOfCalls); | |
94 } | |
95 else | |
96 { | |
97 return globalContext_; | |
98 } | |
99 } | |
100 | |
101 | |
102 void MemoryBuffer::Check(OrthancPluginErrorCode code) | |
103 { | |
104 if (code != OrthancPluginErrorCode_Success) | |
105 { | |
106 // Prevent using garbage information | |
107 buffer_.data = NULL; | |
108 buffer_.size = 0; | |
109 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(code); | |
110 } | |
111 } | |
112 | |
113 | |
114 bool MemoryBuffer::CheckHttp(OrthancPluginErrorCode code) | |
115 { | |
116 if (code != OrthancPluginErrorCode_Success) | |
117 { | |
118 // Prevent using garbage information | |
119 buffer_.data = NULL; | |
120 buffer_.size = 0; | |
121 } | |
122 | |
123 if (code == OrthancPluginErrorCode_Success) | |
124 { | |
125 return true; | |
126 } | |
127 else if (code == OrthancPluginErrorCode_UnknownResource || | |
128 code == OrthancPluginErrorCode_InexistentItem) | |
129 { | |
130 return false; | |
131 } | |
132 else | |
133 { | |
134 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(code); | |
135 } | |
136 } | |
137 | |
138 | |
139 MemoryBuffer::MemoryBuffer() | |
140 { | |
141 buffer_.data = NULL; | |
142 buffer_.size = 0; | |
143 } | |
144 | |
145 | |
146 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 7, 0) | |
147 MemoryBuffer::MemoryBuffer(const void* buffer, | |
148 size_t size) | |
149 { | |
150 uint32_t s = static_cast<uint32_t>(size); | |
151 if (static_cast<size_t>(s) != size) | |
152 { | |
153 ORTHANC_PLUGINS_THROW_EXCEPTION(NotEnoughMemory); | |
154 } | |
155 else if (OrthancPluginCreateMemoryBuffer(GetGlobalContext(), &buffer_, s) != | |
156 OrthancPluginErrorCode_Success) | |
157 { | |
158 ORTHANC_PLUGINS_THROW_EXCEPTION(NotEnoughMemory); | |
159 } | |
160 else | |
161 { | |
162 memcpy(buffer_.data, buffer, size); | |
163 } | |
164 } | |
165 #endif | |
166 | |
167 | |
168 void MemoryBuffer::Clear() | |
169 { | |
170 if (buffer_.data != NULL) | |
171 { | |
172 OrthancPluginFreeMemoryBuffer(GetGlobalContext(), &buffer_); | |
173 buffer_.data = NULL; | |
174 buffer_.size = 0; | |
175 } | |
176 } | |
177 | |
178 | |
179 void MemoryBuffer::Assign(OrthancPluginMemoryBuffer& other) | |
180 { | |
181 Clear(); | |
182 | |
183 buffer_.data = other.data; | |
184 buffer_.size = other.size; | |
185 | |
186 other.data = NULL; | |
187 other.size = 0; | |
188 } | |
189 | |
190 | |
191 void MemoryBuffer::Swap(MemoryBuffer& other) | |
192 { | |
193 std::swap(buffer_.data, other.buffer_.data); | |
194 std::swap(buffer_.size, other.buffer_.size); | |
195 } | |
196 | |
197 | |
198 OrthancPluginMemoryBuffer MemoryBuffer::Release() | |
199 { | |
200 OrthancPluginMemoryBuffer result = buffer_; | |
201 | |
202 buffer_.data = NULL; | |
203 buffer_.size = 0; | |
204 | |
205 return result; | |
206 } | |
207 | |
208 | |
209 void MemoryBuffer::ToString(std::string& target) const | |
210 { | |
211 if (buffer_.size == 0) | |
212 { | |
213 target.clear(); | |
214 } | |
215 else | |
216 { | |
217 target.assign(reinterpret_cast<const char*>(buffer_.data), buffer_.size); | |
218 } | |
219 } | |
220 | |
221 | |
222 void MemoryBuffer::ToJson(Json::Value& target) const | |
223 { | |
224 if (buffer_.data == NULL || | |
225 buffer_.size == 0) | |
226 { | |
227 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
228 } | |
229 | |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
230 if (!ReadJson(target, buffer_.data, buffer_.size)) |
22 | 231 { |
232 LogError("Cannot convert some memory buffer to JSON"); | |
233 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
234 } | |
235 } | |
236 | |
237 | |
238 bool MemoryBuffer::RestApiGet(const std::string& uri, | |
239 bool applyPlugins) | |
240 { | |
241 Clear(); | |
242 | |
243 if (applyPlugins) | |
244 { | |
245 return CheckHttp(OrthancPluginRestApiGetAfterPlugins(GetGlobalContext(), &buffer_, uri.c_str())); | |
246 } | |
247 else | |
248 { | |
249 return CheckHttp(OrthancPluginRestApiGet(GetGlobalContext(), &buffer_, uri.c_str())); | |
250 } | |
251 } | |
252 | |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
253 // helper class to convert std::map of headers to the plugin SDK C structure |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
254 class PluginHttpHeaders |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
255 { |
64
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
256 private: |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
257 std::vector<const char*> headersKeys_; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
258 std::vector<const char*> headersValues_; |
64
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
259 |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
260 public: |
64
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
261 explicit PluginHttpHeaders(const std::map<std::string, std::string>& httpHeaders) |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
262 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
263 for (std::map<std::string, std::string>::const_iterator |
64
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
264 it = httpHeaders.begin(); it != httpHeaders.end(); ++it) |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
265 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
266 headersKeys_.push_back(it->first.c_str()); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
267 headersValues_.push_back(it->second.c_str()); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
268 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
269 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
270 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
271 const char* const* GetKeys() |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
272 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
273 return (headersKeys_.empty() ? NULL : &headersKeys_[0]); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
274 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
275 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
276 const char* const* GetValues() |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
277 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
278 return (headersValues_.empty() ? NULL : &headersValues_[0]); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
279 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
280 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
281 uint32_t GetSize() |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
282 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
283 return static_cast<uint32_t>(headersKeys_.size()); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
284 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
285 }; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
286 |
22 | 287 bool MemoryBuffer::RestApiGet(const std::string& uri, |
288 const std::map<std::string, std::string>& httpHeaders, | |
289 bool applyPlugins) | |
290 { | |
291 Clear(); | |
292 | |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
293 PluginHttpHeaders headers(httpHeaders); |
22 | 294 |
295 return CheckHttp(OrthancPluginRestApiGet2( | |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
296 GetGlobalContext(), &buffer_, uri.c_str(), |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
297 headers.GetSize(), |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
298 headers.GetKeys(), |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
299 headers.GetValues(), applyPlugins)); |
22 | 300 } |
301 | |
302 bool MemoryBuffer::RestApiPost(const std::string& uri, | |
303 const void* body, | |
304 size_t bodySize, | |
305 bool applyPlugins) | |
306 { | |
307 Clear(); | |
308 | |
309 // Cast for compatibility with Orthanc SDK <= 1.5.6 | |
310 const char* b = reinterpret_cast<const char*>(body); | |
311 | |
312 if (applyPlugins) | |
313 { | |
314 return CheckHttp(OrthancPluginRestApiPostAfterPlugins(GetGlobalContext(), &buffer_, uri.c_str(), b, bodySize)); | |
315 } | |
316 else | |
317 { | |
318 return CheckHttp(OrthancPluginRestApiPost(GetGlobalContext(), &buffer_, uri.c_str(), b, bodySize)); | |
319 } | |
320 } | |
321 | |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
322 #if HAS_ORTHANC_PLUGIN_GENERIC_CALL_REST_API == 1 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
323 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
324 bool MemoryBuffer::RestApiPost(const std::string& uri, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
325 const void* body, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
326 size_t bodySize, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
327 const std::map<std::string, std::string>& httpHeaders, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
328 bool applyPlugins) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
329 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
330 MemoryBuffer answerHeaders; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
331 uint16_t httpStatus; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
332 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
333 PluginHttpHeaders headers(httpHeaders); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
334 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
335 return CheckHttp(OrthancPluginCallRestApi(GetGlobalContext(), |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
336 &buffer_, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
337 *answerHeaders, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
338 &httpStatus, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
339 OrthancPluginHttpMethod_Post, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
340 uri.c_str(), |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
341 headers.GetSize(), headers.GetKeys(), headers.GetValues(), |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
342 body, bodySize, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
343 applyPlugins)); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
344 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
345 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
346 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
347 bool MemoryBuffer::RestApiPost(const std::string& uri, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
348 const Json::Value& body, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
349 const std::map<std::string, std::string>& httpHeaders, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
350 bool applyPlugins) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
351 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
352 std::string s; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
353 WriteFastJson(s, body); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
354 return RestApiPost(uri, s.c_str(), s.size(), httpHeaders, applyPlugins); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
355 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
356 #endif |
22 | 357 |
358 bool MemoryBuffer::RestApiPut(const std::string& uri, | |
359 const void* body, | |
360 size_t bodySize, | |
361 bool applyPlugins) | |
362 { | |
363 Clear(); | |
364 | |
365 // Cast for compatibility with Orthanc SDK <= 1.5.6 | |
366 const char* b = reinterpret_cast<const char*>(body); | |
367 | |
368 if (applyPlugins) | |
369 { | |
370 return CheckHttp(OrthancPluginRestApiPutAfterPlugins(GetGlobalContext(), &buffer_, uri.c_str(), b, bodySize)); | |
371 } | |
372 else | |
373 { | |
374 return CheckHttp(OrthancPluginRestApiPut(GetGlobalContext(), &buffer_, uri.c_str(), b, bodySize)); | |
375 } | |
376 } | |
377 | |
378 | |
35 | 379 static bool ReadJsonInternal(Json::Value& target, |
380 const void* buffer, | |
381 size_t size, | |
382 bool collectComments) | |
383 { | |
384 #if JSONCPP_USE_DEPRECATED == 1 | |
385 Json::Reader reader; | |
386 return reader.parse(reinterpret_cast<const char*>(buffer), | |
387 reinterpret_cast<const char*>(buffer) + size, target, collectComments); | |
388 #else | |
389 Json::CharReaderBuilder builder; | |
390 builder.settings_["collectComments"] = collectComments; | |
391 | |
392 const std::unique_ptr<Json::CharReader> reader(builder.newCharReader()); | |
393 assert(reader.get() != NULL); | |
394 | |
395 JSONCPP_STRING err; | |
396 if (reader->parse(reinterpret_cast<const char*>(buffer), | |
397 reinterpret_cast<const char*>(buffer) + size, &target, &err)) | |
398 { | |
399 return true; | |
400 } | |
401 else | |
402 { | |
403 LogError("Cannot parse JSON: " + std::string(err)); | |
404 return false; | |
405 } | |
406 #endif | |
407 } | |
408 | |
409 | |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
410 bool ReadJson(Json::Value& target, |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
411 const std::string& source) |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
412 { |
32
3bd0ec7c5a7c
upgrade to year 2021
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
31
diff
changeset
|
413 return ReadJson(target, source.empty() ? NULL : source.c_str(), source.size()); |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
414 } |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
415 |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
416 |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
417 bool ReadJson(Json::Value& target, |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
418 const void* buffer, |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
419 size_t size) |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
420 { |
35 | 421 return ReadJsonInternal(target, buffer, size, true); |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
422 } |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
423 |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
424 |
35 | 425 bool ReadJsonWithoutComments(Json::Value& target, |
426 const std::string& source) | |
427 { | |
428 return ReadJsonWithoutComments(target, source.empty() ? NULL : source.c_str(), source.size()); | |
429 } | |
430 | |
431 | |
432 bool ReadJsonWithoutComments(Json::Value& target, | |
433 const void* buffer, | |
434 size_t size) | |
435 { | |
436 return ReadJsonInternal(target, buffer, size, false); | |
437 } | |
438 | |
439 | |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
440 void WriteFastJson(std::string& target, |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
441 const Json::Value& source) |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
442 { |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
443 #if JSONCPP_USE_DEPRECATED == 1 |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
444 Json::FastWriter writer; |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
445 target = writer.write(source); |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
446 #else |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
447 Json::StreamWriterBuilder builder; |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
448 builder.settings_["indentation"] = ""; |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
449 target = Json::writeString(builder, source); |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
450 #endif |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
451 } |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
452 |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
453 |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
454 void WriteStyledJson(std::string& target, |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
455 const Json::Value& source) |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
456 { |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
457 #if JSONCPP_USE_DEPRECATED == 1 |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
458 Json::StyledWriter writer; |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
459 target = writer.write(source); |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
460 #else |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
461 Json::StreamWriterBuilder builder; |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
462 builder.settings_["indentation"] = " "; |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
463 target = Json::writeString(builder, source); |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
464 #endif |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
465 } |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
466 |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
467 |
22 | 468 bool MemoryBuffer::RestApiPost(const std::string& uri, |
469 const Json::Value& body, | |
470 bool applyPlugins) | |
471 { | |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
472 std::string s; |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
473 WriteFastJson(s, body); |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
474 return RestApiPost(uri, s, applyPlugins); |
22 | 475 } |
476 | |
477 | |
478 bool MemoryBuffer::RestApiPut(const std::string& uri, | |
479 const Json::Value& body, | |
480 bool applyPlugins) | |
481 { | |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
482 std::string s; |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
483 WriteFastJson(s, body); |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
484 return RestApiPut(uri, s, applyPlugins); |
22 | 485 } |
486 | |
487 | |
488 void MemoryBuffer::CreateDicom(const Json::Value& tags, | |
489 OrthancPluginCreateDicomFlags flags) | |
490 { | |
491 Clear(); | |
492 | |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
493 std::string s; |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
494 WriteFastJson(s, tags); |
22 | 495 |
496 Check(OrthancPluginCreateDicom(GetGlobalContext(), &buffer_, s.c_str(), NULL, flags)); | |
497 } | |
498 | |
499 void MemoryBuffer::CreateDicom(const Json::Value& tags, | |
500 const OrthancImage& pixelData, | |
501 OrthancPluginCreateDicomFlags flags) | |
502 { | |
503 Clear(); | |
504 | |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
505 std::string s; |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
506 WriteFastJson(s, tags); |
22 | 507 |
508 Check(OrthancPluginCreateDicom(GetGlobalContext(), &buffer_, s.c_str(), pixelData.GetObject(), flags)); | |
509 } | |
510 | |
511 | |
512 void MemoryBuffer::ReadFile(const std::string& path) | |
513 { | |
514 Clear(); | |
515 Check(OrthancPluginReadFile(GetGlobalContext(), &buffer_, path.c_str())); | |
516 } | |
517 | |
518 | |
519 void MemoryBuffer::GetDicomQuery(const OrthancPluginWorklistQuery* query) | |
520 { | |
521 Clear(); | |
522 Check(OrthancPluginWorklistGetDicomQuery(GetGlobalContext(), &buffer_, query)); | |
523 } | |
524 | |
525 | |
526 void OrthancString::Assign(char* str) | |
527 { | |
528 Clear(); | |
529 | |
530 if (str != NULL) | |
531 { | |
532 str_ = str; | |
533 } | |
534 } | |
535 | |
536 | |
537 void OrthancString::Clear() | |
538 { | |
539 if (str_ != NULL) | |
540 { | |
541 OrthancPluginFreeString(GetGlobalContext(), str_); | |
542 str_ = NULL; | |
543 } | |
544 } | |
545 | |
546 | |
547 void OrthancString::ToString(std::string& target) const | |
548 { | |
549 if (str_ == NULL) | |
550 { | |
551 target.clear(); | |
552 } | |
553 else | |
554 { | |
555 target.assign(str_); | |
556 } | |
557 } | |
558 | |
559 | |
560 void OrthancString::ToJson(Json::Value& target) const | |
561 { | |
562 if (str_ == NULL) | |
563 { | |
564 LogError("Cannot convert an empty memory buffer to JSON"); | |
565 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
566 } | |
567 | |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
568 if (!ReadJson(target, str_)) |
22 | 569 { |
570 LogError("Cannot convert some memory buffer to JSON"); | |
571 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
572 } | |
573 } | |
574 | |
575 | |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
576 void OrthancString::ToJsonWithoutComments(Json::Value& target) const |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
577 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
578 if (str_ == NULL) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
579 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
580 LogError("Cannot convert an empty memory buffer to JSON"); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
581 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
582 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
583 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
584 if (!ReadJsonWithoutComments(target, str_)) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
585 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
586 LogError("Cannot convert some memory buffer to JSON"); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
587 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
588 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
589 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
590 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
591 |
22 | 592 void MemoryBuffer::DicomToJson(Json::Value& target, |
593 OrthancPluginDicomToJsonFormat format, | |
594 OrthancPluginDicomToJsonFlags flags, | |
595 uint32_t maxStringLength) | |
596 { | |
597 OrthancString str; | |
598 str.Assign(OrthancPluginDicomBufferToJson | |
599 (GetGlobalContext(), GetData(), GetSize(), format, flags, maxStringLength)); | |
600 str.ToJson(target); | |
601 } | |
602 | |
603 | |
604 bool MemoryBuffer::HttpGet(const std::string& url, | |
605 const std::string& username, | |
606 const std::string& password) | |
607 { | |
608 Clear(); | |
609 return CheckHttp(OrthancPluginHttpGet(GetGlobalContext(), &buffer_, url.c_str(), | |
610 username.empty() ? NULL : username.c_str(), | |
611 password.empty() ? NULL : password.c_str())); | |
612 } | |
613 | |
614 | |
615 bool MemoryBuffer::HttpPost(const std::string& url, | |
616 const std::string& body, | |
617 const std::string& username, | |
618 const std::string& password) | |
619 { | |
620 Clear(); | |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
621 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
622 if (body.size() > 0xffffffffu) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
623 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
624 LogError("Cannot handle body size > 4GB"); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
625 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
626 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
627 |
22 | 628 return CheckHttp(OrthancPluginHttpPost(GetGlobalContext(), &buffer_, url.c_str(), |
629 body.c_str(), body.size(), | |
630 username.empty() ? NULL : username.c_str(), | |
631 password.empty() ? NULL : password.c_str())); | |
632 } | |
633 | |
634 | |
635 bool MemoryBuffer::HttpPut(const std::string& url, | |
636 const std::string& body, | |
637 const std::string& username, | |
638 const std::string& password) | |
639 { | |
640 Clear(); | |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
641 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
642 if (body.size() > 0xffffffffu) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
643 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
644 LogError("Cannot handle body size > 4GB"); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
645 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
646 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
647 |
22 | 648 return CheckHttp(OrthancPluginHttpPut(GetGlobalContext(), &buffer_, url.c_str(), |
649 body.empty() ? NULL : body.c_str(), | |
650 body.size(), | |
651 username.empty() ? NULL : username.c_str(), | |
652 password.empty() ? NULL : password.c_str())); | |
653 } | |
654 | |
655 | |
656 void MemoryBuffer::GetDicomInstance(const std::string& instanceId) | |
657 { | |
658 Clear(); | |
659 Check(OrthancPluginGetDicomForInstance(GetGlobalContext(), &buffer_, instanceId.c_str())); | |
660 } | |
661 | |
662 | |
663 bool HttpDelete(const std::string& url, | |
664 const std::string& username, | |
665 const std::string& password) | |
666 { | |
667 OrthancPluginErrorCode error = OrthancPluginHttpDelete | |
668 (GetGlobalContext(), url.c_str(), | |
669 username.empty() ? NULL : username.c_str(), | |
670 password.empty() ? NULL : password.c_str()); | |
671 | |
672 if (error == OrthancPluginErrorCode_Success) | |
673 { | |
674 return true; | |
675 } | |
676 else if (error == OrthancPluginErrorCode_UnknownResource || | |
677 error == OrthancPluginErrorCode_InexistentItem) | |
678 { | |
679 return false; | |
680 } | |
681 else | |
682 { | |
683 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(error); | |
684 } | |
685 } | |
686 | |
687 | |
688 void LogError(const std::string& message) | |
689 { | |
690 if (HasGlobalContext()) | |
691 { | |
692 OrthancPluginLogError(GetGlobalContext(), message.c_str()); | |
693 } | |
694 } | |
695 | |
696 | |
697 void LogWarning(const std::string& message) | |
698 { | |
699 if (HasGlobalContext()) | |
700 { | |
701 OrthancPluginLogWarning(GetGlobalContext(), message.c_str()); | |
702 } | |
703 } | |
704 | |
705 | |
706 void LogInfo(const std::string& message) | |
707 { | |
708 if (HasGlobalContext()) | |
709 { | |
710 OrthancPluginLogInfo(GetGlobalContext(), message.c_str()); | |
711 } | |
712 } | |
713 | |
714 | |
715 void OrthancConfiguration::LoadConfiguration() | |
716 { | |
717 OrthancString str; | |
718 str.Assign(OrthancPluginGetConfiguration(GetGlobalContext())); | |
719 | |
720 if (str.GetContent() == NULL) | |
721 { | |
722 LogError("Cannot access the Orthanc configuration"); | |
723 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
724 } | |
725 | |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
726 str.ToJsonWithoutComments(configuration_); |
22 | 727 |
728 if (configuration_.type() != Json::objectValue) | |
729 { | |
730 LogError("Unable to read the Orthanc configuration"); | |
731 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
732 } | |
733 } | |
734 | |
735 | |
736 OrthancConfiguration::OrthancConfiguration() | |
737 { | |
738 LoadConfiguration(); | |
739 } | |
740 | |
741 | |
742 OrthancConfiguration::OrthancConfiguration(bool loadConfiguration) | |
743 { | |
744 if (loadConfiguration) | |
745 { | |
746 LoadConfiguration(); | |
747 } | |
748 else | |
749 { | |
750 configuration_ = Json::objectValue; | |
751 } | |
752 } | |
753 | |
64
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
754 OrthancConfiguration::OrthancConfiguration(const Json::Value& configuration, const std::string& path) : |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
755 configuration_(configuration), |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
756 path_(path) |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
757 { |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
758 } |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
759 |
22 | 760 |
761 std::string OrthancConfiguration::GetPath(const std::string& key) const | |
762 { | |
763 if (path_.empty()) | |
764 { | |
765 return key; | |
766 } | |
767 else | |
768 { | |
769 return path_ + "." + key; | |
770 } | |
771 } | |
772 | |
773 | |
774 bool OrthancConfiguration::IsSection(const std::string& key) const | |
775 { | |
776 assert(configuration_.type() == Json::objectValue); | |
777 | |
778 return (configuration_.isMember(key) && | |
779 configuration_[key].type() == Json::objectValue); | |
780 } | |
781 | |
782 | |
783 void OrthancConfiguration::GetSection(OrthancConfiguration& target, | |
784 const std::string& key) const | |
785 { | |
786 assert(configuration_.type() == Json::objectValue); | |
787 | |
788 target.path_ = GetPath(key); | |
789 | |
790 if (!configuration_.isMember(key)) | |
791 { | |
792 target.configuration_ = Json::objectValue; | |
793 } | |
794 else | |
795 { | |
796 if (configuration_[key].type() != Json::objectValue) | |
797 { | |
798 LogError("The configuration section \"" + target.path_ + | |
799 "\" is not an associative array as expected"); | |
800 | |
801 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
802 } | |
803 | |
804 target.configuration_ = configuration_[key]; | |
805 } | |
806 } | |
807 | |
808 | |
809 bool OrthancConfiguration::LookupStringValue(std::string& target, | |
810 const std::string& key) const | |
811 { | |
812 assert(configuration_.type() == Json::objectValue); | |
813 | |
814 if (!configuration_.isMember(key)) | |
815 { | |
816 return false; | |
817 } | |
818 | |
819 if (configuration_[key].type() != Json::stringValue) | |
820 { | |
821 LogError("The configuration option \"" + GetPath(key) + | |
822 "\" is not a string as expected"); | |
823 | |
824 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
825 } | |
826 | |
827 target = configuration_[key].asString(); | |
828 return true; | |
829 } | |
830 | |
831 | |
832 bool OrthancConfiguration::LookupIntegerValue(int& target, | |
833 const std::string& key) const | |
834 { | |
835 assert(configuration_.type() == Json::objectValue); | |
836 | |
837 if (!configuration_.isMember(key)) | |
838 { | |
839 return false; | |
840 } | |
841 | |
842 switch (configuration_[key].type()) | |
843 { | |
844 case Json::intValue: | |
845 target = configuration_[key].asInt(); | |
846 return true; | |
847 | |
848 case Json::uintValue: | |
849 target = configuration_[key].asUInt(); | |
850 return true; | |
851 | |
852 default: | |
853 LogError("The configuration option \"" + GetPath(key) + | |
854 "\" is not an integer as expected"); | |
855 | |
856 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
857 } | |
858 } | |
859 | |
860 | |
861 bool OrthancConfiguration::LookupUnsignedIntegerValue(unsigned int& target, | |
862 const std::string& key) const | |
863 { | |
864 int tmp; | |
865 if (!LookupIntegerValue(tmp, key)) | |
866 { | |
867 return false; | |
868 } | |
869 | |
870 if (tmp < 0) | |
871 { | |
872 LogError("The configuration option \"" + GetPath(key) + | |
873 "\" is not a positive integer as expected"); | |
874 | |
875 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
876 } | |
877 else | |
878 { | |
879 target = static_cast<unsigned int>(tmp); | |
880 return true; | |
881 } | |
882 } | |
883 | |
884 | |
885 bool OrthancConfiguration::LookupBooleanValue(bool& target, | |
886 const std::string& key) const | |
887 { | |
888 assert(configuration_.type() == Json::objectValue); | |
889 | |
890 if (!configuration_.isMember(key)) | |
891 { | |
892 return false; | |
893 } | |
894 | |
895 if (configuration_[key].type() != Json::booleanValue) | |
896 { | |
897 LogError("The configuration option \"" + GetPath(key) + | |
898 "\" is not a Boolean as expected"); | |
899 | |
900 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
901 } | |
902 | |
903 target = configuration_[key].asBool(); | |
904 return true; | |
905 } | |
906 | |
907 | |
908 bool OrthancConfiguration::LookupFloatValue(float& target, | |
909 const std::string& key) const | |
910 { | |
911 assert(configuration_.type() == Json::objectValue); | |
912 | |
913 if (!configuration_.isMember(key)) | |
914 { | |
915 return false; | |
916 } | |
917 | |
918 switch (configuration_[key].type()) | |
919 { | |
920 case Json::realValue: | |
921 target = configuration_[key].asFloat(); | |
922 return true; | |
923 | |
924 case Json::intValue: | |
925 target = static_cast<float>(configuration_[key].asInt()); | |
926 return true; | |
927 | |
928 case Json::uintValue: | |
929 target = static_cast<float>(configuration_[key].asUInt()); | |
930 return true; | |
931 | |
932 default: | |
933 LogError("The configuration option \"" + GetPath(key) + | |
934 "\" is not an integer as expected"); | |
935 | |
936 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
937 } | |
938 } | |
939 | |
940 | |
941 bool OrthancConfiguration::LookupListOfStrings(std::list<std::string>& target, | |
942 const std::string& key, | |
943 bool allowSingleString) const | |
944 { | |
945 assert(configuration_.type() == Json::objectValue); | |
946 | |
947 target.clear(); | |
948 | |
949 if (!configuration_.isMember(key)) | |
950 { | |
951 return false; | |
952 } | |
953 | |
954 switch (configuration_[key].type()) | |
955 { | |
956 case Json::arrayValue: | |
957 { | |
958 bool ok = true; | |
959 | |
960 for (Json::Value::ArrayIndex i = 0; ok && i < configuration_[key].size(); i++) | |
961 { | |
962 if (configuration_[key][i].type() == Json::stringValue) | |
963 { | |
964 target.push_back(configuration_[key][i].asString()); | |
965 } | |
966 else | |
967 { | |
968 ok = false; | |
969 } | |
970 } | |
971 | |
972 if (ok) | |
973 { | |
974 return true; | |
975 } | |
976 | |
977 break; | |
978 } | |
979 | |
980 case Json::stringValue: | |
981 if (allowSingleString) | |
982 { | |
983 target.push_back(configuration_[key].asString()); | |
984 return true; | |
985 } | |
986 | |
987 break; | |
988 | |
989 default: | |
990 break; | |
991 } | |
992 | |
993 LogError("The configuration option \"" + GetPath(key) + | |
994 "\" is not a list of strings as expected"); | |
995 | |
996 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
997 } | |
998 | |
999 | |
1000 bool OrthancConfiguration::LookupSetOfStrings(std::set<std::string>& target, | |
1001 const std::string& key, | |
1002 bool allowSingleString) const | |
1003 { | |
1004 std::list<std::string> lst; | |
1005 | |
1006 if (LookupListOfStrings(lst, key, allowSingleString)) | |
1007 { | |
1008 target.clear(); | |
1009 | |
1010 for (std::list<std::string>::const_iterator | |
1011 it = lst.begin(); it != lst.end(); ++it) | |
1012 { | |
1013 target.insert(*it); | |
1014 } | |
1015 | |
1016 return true; | |
1017 } | |
1018 else | |
1019 { | |
1020 return false; | |
1021 } | |
1022 } | |
1023 | |
1024 | |
1025 std::string OrthancConfiguration::GetStringValue(const std::string& key, | |
1026 const std::string& defaultValue) const | |
1027 { | |
1028 std::string tmp; | |
1029 if (LookupStringValue(tmp, key)) | |
1030 { | |
1031 return tmp; | |
1032 } | |
1033 else | |
1034 { | |
1035 return defaultValue; | |
1036 } | |
1037 } | |
1038 | |
1039 | |
1040 int OrthancConfiguration::GetIntegerValue(const std::string& key, | |
1041 int defaultValue) const | |
1042 { | |
1043 int tmp; | |
1044 if (LookupIntegerValue(tmp, key)) | |
1045 { | |
1046 return tmp; | |
1047 } | |
1048 else | |
1049 { | |
1050 return defaultValue; | |
1051 } | |
1052 } | |
1053 | |
1054 | |
1055 unsigned int OrthancConfiguration::GetUnsignedIntegerValue(const std::string& key, | |
1056 unsigned int defaultValue) const | |
1057 { | |
1058 unsigned int tmp; | |
1059 if (LookupUnsignedIntegerValue(tmp, key)) | |
1060 { | |
1061 return tmp; | |
1062 } | |
1063 else | |
1064 { | |
1065 return defaultValue; | |
1066 } | |
1067 } | |
1068 | |
1069 | |
1070 bool OrthancConfiguration::GetBooleanValue(const std::string& key, | |
1071 bool defaultValue) const | |
1072 { | |
1073 bool tmp; | |
1074 if (LookupBooleanValue(tmp, key)) | |
1075 { | |
1076 return tmp; | |
1077 } | |
1078 else | |
1079 { | |
1080 return defaultValue; | |
1081 } | |
1082 } | |
1083 | |
1084 | |
1085 float OrthancConfiguration::GetFloatValue(const std::string& key, | |
1086 float defaultValue) const | |
1087 { | |
1088 float tmp; | |
1089 if (LookupFloatValue(tmp, key)) | |
1090 { | |
1091 return tmp; | |
1092 } | |
1093 else | |
1094 { | |
1095 return defaultValue; | |
1096 } | |
1097 } | |
1098 | |
1099 | |
1100 void OrthancConfiguration::GetDictionary(std::map<std::string, std::string>& target, | |
1101 const std::string& key) const | |
1102 { | |
1103 assert(configuration_.type() == Json::objectValue); | |
1104 | |
1105 target.clear(); | |
1106 | |
1107 if (!configuration_.isMember(key)) | |
1108 { | |
1109 return; | |
1110 } | |
1111 | |
1112 if (configuration_[key].type() != Json::objectValue) | |
1113 { | |
1114 LogError("The configuration option \"" + GetPath(key) + | |
64
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1115 "\" is not an object as expected"); |
22 | 1116 |
1117 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
1118 } | |
1119 | |
1120 Json::Value::Members members = configuration_[key].getMemberNames(); | |
1121 | |
1122 for (size_t i = 0; i < members.size(); i++) | |
1123 { | |
1124 const Json::Value& value = configuration_[key][members[i]]; | |
1125 | |
1126 if (value.type() == Json::stringValue) | |
1127 { | |
1128 target[members[i]] = value.asString(); | |
1129 } | |
1130 else | |
1131 { | |
1132 LogError("The configuration option \"" + GetPath(key) + | |
1133 "\" is not a dictionary mapping strings to strings"); | |
1134 | |
1135 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
1136 } | |
1137 } | |
1138 } | |
1139 | |
1140 | |
1141 void OrthancImage::Clear() | |
1142 { | |
1143 if (image_ != NULL) | |
1144 { | |
1145 OrthancPluginFreeImage(GetGlobalContext(), image_); | |
1146 image_ = NULL; | |
1147 } | |
1148 } | |
1149 | |
1150 | |
1151 void OrthancImage::CheckImageAvailable() const | |
1152 { | |
1153 if (image_ == NULL) | |
1154 { | |
1155 LogError("Trying to access a NULL image"); | |
1156 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange); | |
1157 } | |
1158 } | |
1159 | |
1160 | |
1161 OrthancImage::OrthancImage() : | |
1162 image_(NULL) | |
1163 { | |
1164 } | |
1165 | |
1166 | |
1167 OrthancImage::OrthancImage(OrthancPluginImage* image) : | |
1168 image_(image) | |
1169 { | |
1170 } | |
1171 | |
1172 | |
1173 OrthancImage::OrthancImage(OrthancPluginPixelFormat format, | |
1174 uint32_t width, | |
1175 uint32_t height) | |
1176 { | |
1177 image_ = OrthancPluginCreateImage(GetGlobalContext(), format, width, height); | |
1178 | |
1179 if (image_ == NULL) | |
1180 { | |
1181 LogError("Cannot create an image"); | |
1182 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
1183 } | |
1184 } | |
1185 | |
1186 | |
1187 OrthancImage::OrthancImage(OrthancPluginPixelFormat format, | |
1188 uint32_t width, | |
1189 uint32_t height, | |
1190 uint32_t pitch, | |
1191 void* buffer) | |
1192 { | |
1193 image_ = OrthancPluginCreateImageAccessor | |
1194 (GetGlobalContext(), format, width, height, pitch, buffer); | |
1195 | |
1196 if (image_ == NULL) | |
1197 { | |
1198 LogError("Cannot create an image accessor"); | |
1199 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
1200 } | |
1201 } | |
1202 | |
1203 void OrthancImage::UncompressPngImage(const void* data, | |
1204 size_t size) | |
1205 { | |
1206 Clear(); | |
1207 | |
1208 image_ = OrthancPluginUncompressImage(GetGlobalContext(), data, size, OrthancPluginImageFormat_Png); | |
1209 | |
1210 if (image_ == NULL) | |
1211 { | |
1212 LogError("Cannot uncompress a PNG image"); | |
1213 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange); | |
1214 } | |
1215 } | |
1216 | |
1217 | |
1218 void OrthancImage::UncompressJpegImage(const void* data, | |
1219 size_t size) | |
1220 { | |
1221 Clear(); | |
1222 image_ = OrthancPluginUncompressImage(GetGlobalContext(), data, size, OrthancPluginImageFormat_Jpeg); | |
1223 if (image_ == NULL) | |
1224 { | |
1225 LogError("Cannot uncompress a JPEG image"); | |
1226 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange); | |
1227 } | |
1228 } | |
1229 | |
1230 | |
1231 void OrthancImage::DecodeDicomImage(const void* data, | |
1232 size_t size, | |
1233 unsigned int frame) | |
1234 { | |
1235 Clear(); | |
1236 image_ = OrthancPluginDecodeDicomImage(GetGlobalContext(), data, size, frame); | |
1237 if (image_ == NULL) | |
1238 { | |
1239 LogError("Cannot uncompress a DICOM image"); | |
1240 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange); | |
1241 } | |
1242 } | |
1243 | |
1244 | |
1245 OrthancPluginPixelFormat OrthancImage::GetPixelFormat() const | |
1246 { | |
1247 CheckImageAvailable(); | |
1248 return OrthancPluginGetImagePixelFormat(GetGlobalContext(), image_); | |
1249 } | |
1250 | |
1251 | |
1252 unsigned int OrthancImage::GetWidth() const | |
1253 { | |
1254 CheckImageAvailable(); | |
1255 return OrthancPluginGetImageWidth(GetGlobalContext(), image_); | |
1256 } | |
1257 | |
1258 | |
1259 unsigned int OrthancImage::GetHeight() const | |
1260 { | |
1261 CheckImageAvailable(); | |
1262 return OrthancPluginGetImageHeight(GetGlobalContext(), image_); | |
1263 } | |
1264 | |
1265 | |
1266 unsigned int OrthancImage::GetPitch() const | |
1267 { | |
1268 CheckImageAvailable(); | |
1269 return OrthancPluginGetImagePitch(GetGlobalContext(), image_); | |
1270 } | |
1271 | |
1272 | |
1273 void* OrthancImage::GetBuffer() const | |
1274 { | |
1275 CheckImageAvailable(); | |
1276 return OrthancPluginGetImageBuffer(GetGlobalContext(), image_); | |
1277 } | |
1278 | |
1279 | |
1280 void OrthancImage::CompressPngImage(MemoryBuffer& target) const | |
1281 { | |
1282 CheckImageAvailable(); | |
1283 | |
1284 OrthancPlugins::MemoryBuffer answer; | |
1285 OrthancPluginCompressPngImage(GetGlobalContext(), *answer, GetPixelFormat(), | |
1286 GetWidth(), GetHeight(), GetPitch(), GetBuffer()); | |
1287 | |
1288 target.Swap(answer); | |
1289 } | |
1290 | |
1291 | |
1292 void OrthancImage::CompressJpegImage(MemoryBuffer& target, | |
1293 uint8_t quality) const | |
1294 { | |
1295 CheckImageAvailable(); | |
1296 | |
1297 OrthancPlugins::MemoryBuffer answer; | |
1298 OrthancPluginCompressJpegImage(GetGlobalContext(), *answer, GetPixelFormat(), | |
1299 GetWidth(), GetHeight(), GetPitch(), GetBuffer(), quality); | |
1300 | |
1301 target.Swap(answer); | |
1302 } | |
1303 | |
1304 | |
1305 void OrthancImage::AnswerPngImage(OrthancPluginRestOutput* output) const | |
1306 { | |
1307 CheckImageAvailable(); | |
1308 OrthancPluginCompressAndAnswerPngImage(GetGlobalContext(), output, GetPixelFormat(), | |
1309 GetWidth(), GetHeight(), GetPitch(), GetBuffer()); | |
1310 } | |
1311 | |
1312 | |
1313 void OrthancImage::AnswerJpegImage(OrthancPluginRestOutput* output, | |
1314 uint8_t quality) const | |
1315 { | |
1316 CheckImageAvailable(); | |
1317 OrthancPluginCompressAndAnswerJpegImage(GetGlobalContext(), output, GetPixelFormat(), | |
1318 GetWidth(), GetHeight(), GetPitch(), GetBuffer(), quality); | |
1319 } | |
1320 | |
1321 | |
1322 OrthancPluginImage* OrthancImage::Release() | |
1323 { | |
1324 CheckImageAvailable(); | |
1325 OrthancPluginImage* tmp = image_; | |
1326 image_ = NULL; | |
1327 return tmp; | |
1328 } | |
1329 | |
1330 | |
1331 #if HAS_ORTHANC_PLUGIN_FIND_MATCHER == 1 | |
1332 FindMatcher::FindMatcher(const OrthancPluginWorklistQuery* worklist) : | |
1333 matcher_(NULL), | |
1334 worklist_(worklist) | |
1335 { | |
1336 if (worklist_ == NULL) | |
1337 { | |
1338 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange); | |
1339 } | |
1340 } | |
1341 | |
1342 | |
1343 void FindMatcher::SetupDicom(const void* query, | |
1344 uint32_t size) | |
1345 { | |
1346 worklist_ = NULL; | |
1347 | |
1348 matcher_ = OrthancPluginCreateFindMatcher(GetGlobalContext(), query, size); | |
1349 if (matcher_ == NULL) | |
1350 { | |
1351 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
1352 } | |
1353 } | |
1354 | |
1355 | |
1356 FindMatcher::~FindMatcher() | |
1357 { | |
1358 // The "worklist_" field | |
1359 | |
1360 if (matcher_ != NULL) | |
1361 { | |
1362 OrthancPluginFreeFindMatcher(GetGlobalContext(), matcher_); | |
1363 } | |
1364 } | |
1365 | |
1366 | |
1367 | |
1368 bool FindMatcher::IsMatch(const void* dicom, | |
1369 uint32_t size) const | |
1370 { | |
1371 int32_t result; | |
1372 | |
1373 if (matcher_ != NULL) | |
1374 { | |
1375 result = OrthancPluginFindMatcherIsMatch(GetGlobalContext(), matcher_, dicom, size); | |
1376 } | |
1377 else if (worklist_ != NULL) | |
1378 { | |
1379 result = OrthancPluginWorklistIsMatch(GetGlobalContext(), worklist_, dicom, size); | |
1380 } | |
1381 else | |
1382 { | |
1383 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
1384 } | |
1385 | |
1386 if (result == 0) | |
1387 { | |
1388 return false; | |
1389 } | |
1390 else if (result == 1) | |
1391 { | |
1392 return true; | |
1393 } | |
1394 else | |
1395 { | |
1396 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
1397 } | |
1398 } | |
1399 | |
1400 #endif /* HAS_ORTHANC_PLUGIN_FIND_MATCHER == 1 */ | |
1401 | |
1402 void AnswerJson(const Json::Value& value, | |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
1403 OrthancPluginRestOutput* output) |
22 | 1404 { |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
1405 std::string bodyString; |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
1406 WriteStyledJson(bodyString, value); |
22 | 1407 OrthancPluginAnswerBuffer(GetGlobalContext(), output, bodyString.c_str(), bodyString.size(), "application/json"); |
1408 } | |
1409 | |
1410 void AnswerString(const std::string& answer, | |
1411 const char* mimeType, | |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
1412 OrthancPluginRestOutput* output) |
22 | 1413 { |
1414 OrthancPluginAnswerBuffer(GetGlobalContext(), output, answer.c_str(), answer.size(), mimeType); | |
1415 } | |
1416 | |
1417 void AnswerHttpError(uint16_t httpError, OrthancPluginRestOutput *output) | |
1418 { | |
1419 OrthancPluginSendHttpStatusCode(GetGlobalContext(), output, httpError); | |
1420 } | |
1421 | |
1422 void AnswerMethodNotAllowed(OrthancPluginRestOutput *output, const char* allowedMethods) | |
1423 { | |
1424 OrthancPluginSendMethodNotAllowed(GetGlobalContext(), output, allowedMethods); | |
1425 } | |
1426 | |
1427 bool RestApiGetString(std::string& result, | |
1428 const std::string& uri, | |
1429 bool applyPlugins) | |
1430 { | |
1431 MemoryBuffer answer; | |
1432 if (!answer.RestApiGet(uri, applyPlugins)) | |
1433 { | |
1434 return false; | |
1435 } | |
1436 else | |
1437 { | |
1438 answer.ToString(result); | |
1439 return true; | |
1440 } | |
1441 } | |
1442 | |
1443 bool RestApiGetString(std::string& result, | |
1444 const std::string& uri, | |
1445 const std::map<std::string, std::string>& httpHeaders, | |
1446 bool applyPlugins) | |
1447 { | |
1448 MemoryBuffer answer; | |
1449 if (!answer.RestApiGet(uri, httpHeaders, applyPlugins)) | |
1450 { | |
1451 return false; | |
1452 } | |
1453 else | |
1454 { | |
1455 answer.ToString(result); | |
1456 return true; | |
1457 } | |
1458 } | |
1459 | |
1460 | |
64
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1461 bool RestApiGet(Json::Value& result, |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1462 const std::string& uri, |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1463 const std::map<std::string, std::string>& httpHeaders, |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1464 bool applyPlugins) |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1465 { |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1466 MemoryBuffer answer; |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1467 |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1468 if (!answer.RestApiGet(uri, httpHeaders, applyPlugins)) |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1469 { |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1470 return false; |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1471 } |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1472 else |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1473 { |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1474 if (!answer.IsEmpty()) |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1475 { |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1476 answer.ToJson(result); |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1477 } |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1478 return true; |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1479 } |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1480 } |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1481 |
22 | 1482 |
1483 bool RestApiGet(Json::Value& result, | |
1484 const std::string& uri, | |
1485 bool applyPlugins) | |
1486 { | |
1487 MemoryBuffer answer; | |
1488 | |
1489 if (!answer.RestApiGet(uri, applyPlugins)) | |
1490 { | |
1491 return false; | |
1492 } | |
1493 else | |
1494 { | |
1495 if (!answer.IsEmpty()) | |
1496 { | |
1497 answer.ToJson(result); | |
1498 } | |
1499 return true; | |
1500 } | |
1501 } | |
1502 | |
1503 | |
1504 bool RestApiPost(std::string& result, | |
1505 const std::string& uri, | |
1506 const void* body, | |
1507 size_t bodySize, | |
1508 bool applyPlugins) | |
1509 { | |
1510 MemoryBuffer answer; | |
1511 | |
1512 if (!answer.RestApiPost(uri, body, bodySize, applyPlugins)) | |
1513 { | |
1514 return false; | |
1515 } | |
1516 else | |
1517 { | |
1518 if (!answer.IsEmpty()) | |
1519 { | |
1520 result.assign(answer.GetData(), answer.GetSize()); | |
1521 } | |
1522 return true; | |
1523 } | |
1524 } | |
1525 | |
1526 | |
1527 bool RestApiPost(Json::Value& result, | |
1528 const std::string& uri, | |
1529 const void* body, | |
1530 size_t bodySize, | |
1531 bool applyPlugins) | |
1532 { | |
1533 MemoryBuffer answer; | |
1534 | |
1535 if (!answer.RestApiPost(uri, body, bodySize, applyPlugins)) | |
1536 { | |
1537 return false; | |
1538 } | |
1539 else | |
1540 { | |
1541 if (!answer.IsEmpty()) | |
1542 { | |
1543 answer.ToJson(result); | |
1544 } | |
1545 return true; | |
1546 } | |
1547 } | |
1548 | |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1549 #if HAS_ORTHANC_PLUGIN_GENERIC_CALL_REST_API == 1 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1550 bool RestApiPost(Json::Value& result, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1551 const std::string& uri, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1552 const Json::Value& body, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1553 const std::map<std::string, std::string>& httpHeaders, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1554 bool applyPlugins) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1555 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1556 MemoryBuffer answer; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1557 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1558 if (!answer.RestApiPost(uri, body, httpHeaders, applyPlugins)) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1559 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1560 return false; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1561 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1562 else |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1563 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1564 if (!answer.IsEmpty()) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1565 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1566 answer.ToJson(result); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1567 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1568 return true; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1569 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1570 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1571 #endif |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1572 |
22 | 1573 |
1574 bool RestApiPost(Json::Value& result, | |
1575 const std::string& uri, | |
1576 const Json::Value& body, | |
1577 bool applyPlugins) | |
1578 { | |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
1579 std::string s; |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
1580 WriteFastJson(s, body); |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
1581 return RestApiPost(result, uri, s, applyPlugins); |
22 | 1582 } |
1583 | |
1584 | |
1585 bool RestApiPut(Json::Value& result, | |
1586 const std::string& uri, | |
1587 const void* body, | |
1588 size_t bodySize, | |
1589 bool applyPlugins) | |
1590 { | |
1591 MemoryBuffer answer; | |
1592 | |
1593 if (!answer.RestApiPut(uri, body, bodySize, applyPlugins)) | |
1594 { | |
1595 return false; | |
1596 } | |
1597 else | |
1598 { | |
1599 if (!answer.IsEmpty()) // i.e, on a PUT to metadata/..., orthanc returns an empty response | |
1600 { | |
1601 answer.ToJson(result); | |
1602 } | |
1603 return true; | |
1604 } | |
1605 } | |
1606 | |
1607 | |
1608 bool RestApiPut(Json::Value& result, | |
1609 const std::string& uri, | |
1610 const Json::Value& body, | |
1611 bool applyPlugins) | |
1612 { | |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
1613 std::string s; |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
1614 WriteFastJson(s, body); |
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
1615 return RestApiPut(result, uri, s, applyPlugins); |
22 | 1616 } |
1617 | |
1618 | |
1619 bool RestApiDelete(const std::string& uri, | |
1620 bool applyPlugins) | |
1621 { | |
1622 OrthancPluginErrorCode error; | |
1623 | |
1624 if (applyPlugins) | |
1625 { | |
1626 error = OrthancPluginRestApiDeleteAfterPlugins(GetGlobalContext(), uri.c_str()); | |
1627 } | |
1628 else | |
1629 { | |
1630 error = OrthancPluginRestApiDelete(GetGlobalContext(), uri.c_str()); | |
1631 } | |
1632 | |
1633 if (error == OrthancPluginErrorCode_Success) | |
1634 { | |
1635 return true; | |
1636 } | |
1637 else if (error == OrthancPluginErrorCode_UnknownResource || | |
1638 error == OrthancPluginErrorCode_InexistentItem) | |
1639 { | |
1640 return false; | |
1641 } | |
1642 else | |
1643 { | |
1644 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(error); | |
1645 } | |
1646 } | |
1647 | |
1648 | |
1649 void ReportMinimalOrthancVersion(unsigned int major, | |
1650 unsigned int minor, | |
1651 unsigned int revision) | |
1652 { | |
1653 LogError("Your version of the Orthanc core (" + | |
1654 std::string(GetGlobalContext()->orthancVersion) + | |
1655 ") is too old to run this plugin (version " + | |
1656 boost::lexical_cast<std::string>(major) + "." + | |
1657 boost::lexical_cast<std::string>(minor) + "." + | |
1658 boost::lexical_cast<std::string>(revision) + | |
1659 " is required)"); | |
1660 } | |
1661 | |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1662 bool CheckMinimalVersion(const char* version, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1663 unsigned int major, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1664 unsigned int minor, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1665 unsigned int revision) |
22 | 1666 { |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1667 if (!strcmp(version, "mainline")) |
22 | 1668 { |
1669 // Assume compatibility with the mainline | |
1670 return true; | |
1671 } | |
1672 | |
64
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1673 #ifdef _MSC_VER |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1674 #define ORTHANC_SCANF sscanf_s |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1675 #else |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1676 #define ORTHANC_SCANF sscanf |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1677 #endif |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1678 |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1679 // Parse the version |
64
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1680 int aa, bb, cc = 0; |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1681 if ((ORTHANC_SCANF(version, "%4d.%4d.%4d", &aa, &bb, &cc) != 3 && |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
1682 ORTHANC_SCANF(version, "%4d.%4d", &aa, &bb) != 2) || |
22 | 1683 aa < 0 || |
1684 bb < 0 || | |
1685 cc < 0) | |
1686 { | |
1687 return false; | |
1688 } | |
1689 | |
1690 unsigned int a = static_cast<unsigned int>(aa); | |
1691 unsigned int b = static_cast<unsigned int>(bb); | |
1692 unsigned int c = static_cast<unsigned int>(cc); | |
1693 | |
1694 // Check the major version number | |
1695 | |
1696 if (a > major) | |
1697 { | |
1698 return true; | |
1699 } | |
1700 | |
1701 if (a < major) | |
1702 { | |
1703 return false; | |
1704 } | |
1705 | |
1706 // Check the minor version number | |
1707 assert(a == major); | |
1708 | |
1709 if (b > minor) | |
1710 { | |
1711 return true; | |
1712 } | |
1713 | |
1714 if (b < minor) | |
1715 { | |
1716 return false; | |
1717 } | |
1718 | |
1719 // Check the patch level version number | |
1720 assert(a == major && b == minor); | |
1721 | |
1722 if (c >= revision) | |
1723 { | |
1724 return true; | |
1725 } | |
1726 else | |
1727 { | |
1728 return false; | |
1729 } | |
1730 } | |
1731 | |
1732 | |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1733 bool CheckMinimalOrthancVersion(unsigned int major, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1734 unsigned int minor, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1735 unsigned int revision) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1736 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1737 if (!HasGlobalContext()) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1738 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1739 LogError("Bad Orthanc context in the plugin"); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1740 return false; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1741 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1742 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1743 return CheckMinimalVersion(GetGlobalContext()->orthancVersion, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1744 major, minor, revision); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1745 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1746 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
1747 |
22 | 1748 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 5, 0) |
1749 const char* AutodetectMimeType(const std::string& path) | |
1750 { | |
1751 const char* mime = OrthancPluginAutodetectMimeType(GetGlobalContext(), path.c_str()); | |
1752 | |
1753 if (mime == NULL) | |
1754 { | |
1755 // Should never happen, just for safety | |
1756 return "application/octet-stream"; | |
1757 } | |
1758 else | |
1759 { | |
1760 return mime; | |
1761 } | |
1762 } | |
1763 #endif | |
1764 | |
1765 | |
1766 #if HAS_ORTHANC_PLUGIN_PEERS == 1 | |
1767 size_t OrthancPeers::GetPeerIndex(const std::string& name) const | |
1768 { | |
1769 size_t index; | |
1770 if (LookupName(index, name)) | |
1771 { | |
1772 return index; | |
1773 } | |
1774 else | |
1775 { | |
1776 LogError("Inexistent peer: " + name); | |
1777 ORTHANC_PLUGINS_THROW_EXCEPTION(UnknownResource); | |
1778 } | |
1779 } | |
1780 | |
1781 | |
1782 OrthancPeers::OrthancPeers() : | |
1783 peers_(NULL), | |
1784 timeout_(0) | |
1785 { | |
1786 peers_ = OrthancPluginGetPeers(GetGlobalContext()); | |
1787 | |
1788 if (peers_ == NULL) | |
1789 { | |
1790 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin); | |
1791 } | |
1792 | |
1793 uint32_t count = OrthancPluginGetPeersCount(GetGlobalContext(), peers_); | |
1794 | |
1795 for (uint32_t i = 0; i < count; i++) | |
1796 { | |
1797 const char* name = OrthancPluginGetPeerName(GetGlobalContext(), peers_, i); | |
1798 if (name == NULL) | |
1799 { | |
1800 OrthancPluginFreePeers(GetGlobalContext(), peers_); | |
1801 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin); | |
1802 } | |
1803 | |
1804 index_[name] = i; | |
1805 } | |
1806 } | |
1807 | |
1808 | |
1809 OrthancPeers::~OrthancPeers() | |
1810 { | |
1811 if (peers_ != NULL) | |
1812 { | |
1813 OrthancPluginFreePeers(GetGlobalContext(), peers_); | |
1814 } | |
1815 } | |
1816 | |
1817 | |
1818 bool OrthancPeers::LookupName(size_t& target, | |
1819 const std::string& name) const | |
1820 { | |
1821 Index::const_iterator found = index_.find(name); | |
1822 | |
1823 if (found == index_.end()) | |
1824 { | |
1825 return false; | |
1826 } | |
1827 else | |
1828 { | |
1829 target = found->second; | |
1830 return true; | |
1831 } | |
1832 } | |
1833 | |
1834 | |
1835 std::string OrthancPeers::GetPeerName(size_t index) const | |
1836 { | |
1837 if (index >= index_.size()) | |
1838 { | |
1839 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
1840 } | |
1841 else | |
1842 { | |
1843 const char* s = OrthancPluginGetPeerName(GetGlobalContext(), peers_, static_cast<uint32_t>(index)); | |
1844 if (s == NULL) | |
1845 { | |
1846 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin); | |
1847 } | |
1848 else | |
1849 { | |
1850 return s; | |
1851 } | |
1852 } | |
1853 } | |
1854 | |
1855 | |
1856 std::string OrthancPeers::GetPeerUrl(size_t index) const | |
1857 { | |
1858 if (index >= index_.size()) | |
1859 { | |
1860 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
1861 } | |
1862 else | |
1863 { | |
1864 const char* s = OrthancPluginGetPeerUrl(GetGlobalContext(), peers_, static_cast<uint32_t>(index)); | |
1865 if (s == NULL) | |
1866 { | |
1867 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin); | |
1868 } | |
1869 else | |
1870 { | |
1871 return s; | |
1872 } | |
1873 } | |
1874 } | |
1875 | |
1876 | |
1877 std::string OrthancPeers::GetPeerUrl(const std::string& name) const | |
1878 { | |
1879 return GetPeerUrl(GetPeerIndex(name)); | |
1880 } | |
1881 | |
1882 | |
1883 bool OrthancPeers::LookupUserProperty(std::string& value, | |
1884 size_t index, | |
1885 const std::string& key) const | |
1886 { | |
1887 if (index >= index_.size()) | |
1888 { | |
1889 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
1890 } | |
1891 else | |
1892 { | |
1893 const char* s = OrthancPluginGetPeerUserProperty(GetGlobalContext(), peers_, static_cast<uint32_t>(index), key.c_str()); | |
1894 if (s == NULL) | |
1895 { | |
1896 return false; | |
1897 } | |
1898 else | |
1899 { | |
1900 value.assign(s); | |
1901 return true; | |
1902 } | |
1903 } | |
1904 } | |
1905 | |
1906 | |
1907 bool OrthancPeers::LookupUserProperty(std::string& value, | |
1908 const std::string& peer, | |
1909 const std::string& key) const | |
1910 { | |
1911 return LookupUserProperty(value, GetPeerIndex(peer), key); | |
1912 } | |
1913 | |
1914 | |
1915 bool OrthancPeers::DoGet(MemoryBuffer& target, | |
1916 size_t index, | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
1917 const std::string& uri, |
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
1918 const std::map<std::string, std::string>& headers) const |
22 | 1919 { |
1920 if (index >= index_.size()) | |
1921 { | |
1922 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
1923 } | |
1924 | |
1925 OrthancPlugins::MemoryBuffer answer; | |
1926 uint16_t status; | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
1927 PluginHttpHeaders pluginHeaders(headers); |
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
1928 |
22 | 1929 OrthancPluginErrorCode code = OrthancPluginCallPeerApi |
1930 (GetGlobalContext(), *answer, NULL, &status, peers_, | |
1931 static_cast<uint32_t>(index), OrthancPluginHttpMethod_Get, uri.c_str(), | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
1932 pluginHeaders.GetSize(), pluginHeaders.GetKeys(), pluginHeaders.GetValues(), NULL, 0, timeout_); |
22 | 1933 |
1934 if (code == OrthancPluginErrorCode_Success) | |
1935 { | |
1936 target.Swap(answer); | |
1937 return (status == 200); | |
1938 } | |
1939 else | |
1940 { | |
1941 return false; | |
1942 } | |
1943 } | |
1944 | |
1945 | |
1946 bool OrthancPeers::DoGet(MemoryBuffer& target, | |
1947 const std::string& name, | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
1948 const std::string& uri, |
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
1949 const std::map<std::string, std::string>& headers) const |
22 | 1950 { |
1951 size_t index; | |
1952 return (LookupName(index, name) && | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
1953 DoGet(target, index, uri, headers)); |
22 | 1954 } |
1955 | |
1956 | |
1957 bool OrthancPeers::DoGet(Json::Value& target, | |
1958 size_t index, | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
1959 const std::string& uri, |
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
1960 const std::map<std::string, std::string>& headers) const |
22 | 1961 { |
1962 MemoryBuffer buffer; | |
1963 | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
1964 if (DoGet(buffer, index, uri, headers)) |
22 | 1965 { |
1966 buffer.ToJson(target); | |
1967 return true; | |
1968 } | |
1969 else | |
1970 { | |
1971 return false; | |
1972 } | |
1973 } | |
1974 | |
1975 | |
1976 bool OrthancPeers::DoGet(Json::Value& target, | |
1977 const std::string& name, | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
1978 const std::string& uri, |
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
1979 const std::map<std::string, std::string>& headers) const |
22 | 1980 { |
1981 MemoryBuffer buffer; | |
1982 | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
1983 if (DoGet(buffer, name, uri, headers)) |
22 | 1984 { |
1985 buffer.ToJson(target); | |
1986 return true; | |
1987 } | |
1988 else | |
1989 { | |
1990 return false; | |
1991 } | |
1992 } | |
1993 | |
1994 | |
1995 bool OrthancPeers::DoPost(MemoryBuffer& target, | |
1996 const std::string& name, | |
1997 const std::string& uri, | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
1998 const std::string& body, |
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
1999 const std::map<std::string, std::string>& headers) const |
22 | 2000 { |
2001 size_t index; | |
2002 return (LookupName(index, name) && | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2003 DoPost(target, index, uri, body, headers)); |
22 | 2004 } |
2005 | |
2006 | |
2007 bool OrthancPeers::DoPost(Json::Value& target, | |
2008 size_t index, | |
2009 const std::string& uri, | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2010 const std::string& body, |
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2011 const std::map<std::string, std::string>& headers) const |
22 | 2012 { |
2013 MemoryBuffer buffer; | |
2014 | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2015 if (DoPost(buffer, index, uri, body, headers)) |
22 | 2016 { |
2017 buffer.ToJson(target); | |
2018 return true; | |
2019 } | |
2020 else | |
2021 { | |
2022 return false; | |
2023 } | |
2024 } | |
2025 | |
2026 | |
2027 bool OrthancPeers::DoPost(Json::Value& target, | |
2028 const std::string& name, | |
2029 const std::string& uri, | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2030 const std::string& body, |
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2031 const std::map<std::string, std::string>& headers) const |
22 | 2032 { |
2033 MemoryBuffer buffer; | |
2034 | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2035 if (DoPost(buffer, name, uri, body, headers)) |
22 | 2036 { |
2037 buffer.ToJson(target); | |
2038 return true; | |
2039 } | |
2040 else | |
2041 { | |
2042 return false; | |
2043 } | |
2044 } | |
2045 | |
2046 | |
2047 bool OrthancPeers::DoPost(MemoryBuffer& target, | |
2048 size_t index, | |
2049 const std::string& uri, | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2050 const std::string& body, |
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2051 const std::map<std::string, std::string>& headers) const |
22 | 2052 { |
2053 if (index >= index_.size()) | |
2054 { | |
2055 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
2056 } | |
2057 | |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
2058 if (body.size() > 0xffffffffu) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
2059 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
2060 LogError("Cannot handle body size > 4GB"); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
2061 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
2062 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
2063 |
22 | 2064 OrthancPlugins::MemoryBuffer answer; |
2065 uint16_t status; | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2066 PluginHttpHeaders pluginHeaders(headers); |
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2067 |
22 | 2068 OrthancPluginErrorCode code = OrthancPluginCallPeerApi |
2069 (GetGlobalContext(), *answer, NULL, &status, peers_, | |
2070 static_cast<uint32_t>(index), OrthancPluginHttpMethod_Post, uri.c_str(), | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2071 pluginHeaders.GetSize(), pluginHeaders.GetKeys(), pluginHeaders.GetValues(), body.empty() ? NULL : body.c_str(), body.size(), timeout_); |
22 | 2072 |
2073 if (code == OrthancPluginErrorCode_Success) | |
2074 { | |
2075 target.Swap(answer); | |
2076 return (status == 200); | |
2077 } | |
2078 else | |
2079 { | |
2080 return false; | |
2081 } | |
2082 } | |
2083 | |
2084 | |
2085 bool OrthancPeers::DoPut(size_t index, | |
2086 const std::string& uri, | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2087 const std::string& body, |
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2088 const std::map<std::string, std::string>& headers) const |
22 | 2089 { |
2090 if (index >= index_.size()) | |
2091 { | |
2092 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
2093 } | |
2094 | |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
2095 if (body.size() > 0xffffffffu) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
2096 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
2097 LogError("Cannot handle body size > 4GB"); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
2098 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
2099 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
2100 |
22 | 2101 OrthancPlugins::MemoryBuffer answer; |
2102 uint16_t status; | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2103 PluginHttpHeaders pluginHeaders(headers); |
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2104 |
22 | 2105 OrthancPluginErrorCode code = OrthancPluginCallPeerApi |
2106 (GetGlobalContext(), *answer, NULL, &status, peers_, | |
2107 static_cast<uint32_t>(index), OrthancPluginHttpMethod_Put, uri.c_str(), | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2108 pluginHeaders.GetSize(), pluginHeaders.GetKeys(), pluginHeaders.GetValues(), body.empty() ? NULL : body.c_str(), body.size(), timeout_); |
22 | 2109 |
2110 if (code == OrthancPluginErrorCode_Success) | |
2111 { | |
2112 return (status == 200); | |
2113 } | |
2114 else | |
2115 { | |
2116 return false; | |
2117 } | |
2118 } | |
2119 | |
2120 | |
2121 bool OrthancPeers::DoPut(const std::string& name, | |
2122 const std::string& uri, | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2123 const std::string& body, |
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2124 const std::map<std::string, std::string>& headers) const |
22 | 2125 { |
2126 size_t index; | |
2127 return (LookupName(index, name) && | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2128 DoPut(index, uri, body, headers)); |
22 | 2129 } |
2130 | |
2131 | |
2132 bool OrthancPeers::DoDelete(size_t index, | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2133 const std::string& uri, |
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2134 const std::map<std::string, std::string>& headers) const |
22 | 2135 { |
2136 if (index >= index_.size()) | |
2137 { | |
2138 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
2139 } | |
2140 | |
2141 OrthancPlugins::MemoryBuffer answer; | |
2142 uint16_t status; | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2143 PluginHttpHeaders pluginHeaders(headers); |
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2144 |
22 | 2145 OrthancPluginErrorCode code = OrthancPluginCallPeerApi |
2146 (GetGlobalContext(), *answer, NULL, &status, peers_, | |
2147 static_cast<uint32_t>(index), OrthancPluginHttpMethod_Delete, uri.c_str(), | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2148 pluginHeaders.GetSize(), pluginHeaders.GetKeys(), pluginHeaders.GetValues(), NULL, 0, timeout_); |
22 | 2149 |
2150 if (code == OrthancPluginErrorCode_Success) | |
2151 { | |
2152 return (status == 200); | |
2153 } | |
2154 else | |
2155 { | |
2156 return false; | |
2157 } | |
2158 } | |
2159 | |
2160 | |
2161 bool OrthancPeers::DoDelete(const std::string& name, | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2162 const std::string& uri, |
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2163 const std::map<std::string, std::string>& headers) const |
22 | 2164 { |
2165 size_t index; | |
2166 return (LookupName(index, name) && | |
44
f4e828607f02
Added 'SenderTransferID' option that is added as an HTTP header in outgoing requests in PushMode
Alain Mazy <am@osimis.io>
parents:
40
diff
changeset
|
2167 DoDelete(index, uri, headers)); |
22 | 2168 } |
2169 #endif | |
2170 | |
2171 | |
2172 | |
2173 | |
2174 | |
2175 /****************************************************************** | |
2176 ** JOBS | |
2177 ******************************************************************/ | |
2178 | |
2179 #if HAS_ORTHANC_PLUGIN_JOB == 1 | |
2180 void OrthancJob::CallbackFinalize(void* job) | |
2181 { | |
2182 if (job != NULL) | |
2183 { | |
2184 delete reinterpret_cast<OrthancJob*>(job); | |
2185 } | |
2186 } | |
2187 | |
2188 | |
2189 float OrthancJob::CallbackGetProgress(void* job) | |
2190 { | |
2191 assert(job != NULL); | |
2192 | |
2193 try | |
2194 { | |
2195 return reinterpret_cast<OrthancJob*>(job)->progress_; | |
2196 } | |
2197 catch (...) | |
2198 { | |
2199 return 0; | |
2200 } | |
2201 } | |
2202 | |
2203 | |
54
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2204 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 11, 3) |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2205 static OrthancPluginErrorCode CopyStringToMemoryBuffer(OrthancPluginMemoryBuffer* target, |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2206 const std::string& source) |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2207 { |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2208 if (OrthancPluginCreateMemoryBuffer(globalContext_, target, source.size()) != OrthancPluginErrorCode_Success) |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2209 { |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2210 return OrthancPluginErrorCode_NotEnoughMemory; |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2211 } |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2212 else |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2213 { |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2214 if (!source.empty()) |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2215 { |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2216 memcpy(target->data, source.c_str(), source.size()); |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2217 } |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2218 |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2219 return OrthancPluginErrorCode_Success; |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2220 } |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2221 } |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2222 #endif |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2223 |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2224 |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2225 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 11, 3) |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2226 OrthancPluginErrorCode OrthancJob::CallbackGetContent(OrthancPluginMemoryBuffer* target, |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2227 void* job) |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2228 { |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2229 assert(job != NULL); |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2230 OrthancJob& that = *reinterpret_cast<OrthancJob*>(job); |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2231 return CopyStringToMemoryBuffer(target, that.content_); |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2232 } |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2233 #else |
22 | 2234 const char* OrthancJob::CallbackGetContent(void* job) |
2235 { | |
2236 assert(job != NULL); | |
2237 | |
2238 try | |
2239 { | |
2240 return reinterpret_cast<OrthancJob*>(job)->content_.c_str(); | |
2241 } | |
2242 catch (...) | |
2243 { | |
2244 return 0; | |
2245 } | |
2246 } | |
54
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2247 #endif |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2248 |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2249 |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2250 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 11, 3) |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2251 int32_t OrthancJob::CallbackGetSerialized(OrthancPluginMemoryBuffer* target, |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2252 void* job) |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2253 { |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2254 assert(job != NULL); |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2255 OrthancJob& that = *reinterpret_cast<OrthancJob*>(job); |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2256 |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2257 if (that.hasSerialized_) |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2258 { |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2259 if (CopyStringToMemoryBuffer(target, that.serialized_) == OrthancPluginErrorCode_Success) |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2260 { |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2261 return 1; |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2262 } |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2263 else |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2264 { |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2265 return -1; |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2266 } |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2267 } |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2268 else |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2269 { |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2270 return 0; |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2271 } |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2272 } |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2273 #else |
22 | 2274 const char* OrthancJob::CallbackGetSerialized(void* job) |
2275 { | |
2276 assert(job != NULL); | |
2277 | |
2278 try | |
2279 { | |
2280 const OrthancJob& tmp = *reinterpret_cast<OrthancJob*>(job); | |
2281 | |
2282 if (tmp.hasSerialized_) | |
2283 { | |
2284 return tmp.serialized_.c_str(); | |
2285 } | |
2286 else | |
2287 { | |
2288 return NULL; | |
2289 } | |
2290 } | |
2291 catch (...) | |
2292 { | |
2293 return 0; | |
2294 } | |
2295 } | |
54
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2296 #endif |
22 | 2297 |
2298 | |
2299 OrthancPluginJobStepStatus OrthancJob::CallbackStep(void* job) | |
2300 { | |
2301 assert(job != NULL); | |
2302 | |
2303 try | |
2304 { | |
2305 return reinterpret_cast<OrthancJob*>(job)->Step(); | |
2306 } | |
2307 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS&) | |
2308 { | |
2309 return OrthancPluginJobStepStatus_Failure; | |
2310 } | |
2311 catch (...) | |
2312 { | |
2313 return OrthancPluginJobStepStatus_Failure; | |
2314 } | |
2315 } | |
2316 | |
2317 | |
2318 OrthancPluginErrorCode OrthancJob::CallbackStop(void* job, | |
2319 OrthancPluginJobStopReason reason) | |
2320 { | |
2321 assert(job != NULL); | |
2322 | |
2323 try | |
2324 { | |
2325 reinterpret_cast<OrthancJob*>(job)->Stop(reason); | |
2326 return OrthancPluginErrorCode_Success; | |
2327 } | |
2328 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) | |
2329 { | |
2330 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); | |
2331 } | |
2332 catch (...) | |
2333 { | |
2334 return OrthancPluginErrorCode_Plugin; | |
2335 } | |
2336 } | |
2337 | |
2338 | |
2339 OrthancPluginErrorCode OrthancJob::CallbackReset(void* job) | |
2340 { | |
2341 assert(job != NULL); | |
2342 | |
2343 try | |
2344 { | |
2345 reinterpret_cast<OrthancJob*>(job)->Reset(); | |
2346 return OrthancPluginErrorCode_Success; | |
2347 } | |
2348 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) | |
2349 { | |
2350 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); | |
2351 } | |
2352 catch (...) | |
2353 { | |
2354 return OrthancPluginErrorCode_Plugin; | |
2355 } | |
2356 } | |
2357 | |
2358 | |
2359 void OrthancJob::ClearContent() | |
2360 { | |
2361 Json::Value empty = Json::objectValue; | |
2362 UpdateContent(empty); | |
2363 } | |
2364 | |
2365 | |
2366 void OrthancJob::UpdateContent(const Json::Value& content) | |
2367 { | |
2368 if (content.type() != Json::objectValue) | |
2369 { | |
2370 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_BadFileFormat); | |
2371 } | |
2372 else | |
2373 { | |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
2374 WriteFastJson(content_, content); |
22 | 2375 } |
2376 } | |
2377 | |
2378 | |
2379 void OrthancJob::ClearSerialized() | |
2380 { | |
2381 hasSerialized_ = false; | |
2382 serialized_.clear(); | |
2383 } | |
2384 | |
2385 | |
2386 void OrthancJob::UpdateSerialized(const Json::Value& serialized) | |
2387 { | |
2388 if (serialized.type() != Json::objectValue) | |
2389 { | |
2390 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_BadFileFormat); | |
2391 } | |
2392 else | |
2393 { | |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
2394 WriteFastJson(serialized_, serialized); |
22 | 2395 hasSerialized_ = true; |
2396 } | |
2397 } | |
2398 | |
2399 | |
2400 void OrthancJob::UpdateProgress(float progress) | |
2401 { | |
2402 if (progress < 0 || | |
2403 progress > 1) | |
2404 { | |
2405 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); | |
2406 } | |
2407 | |
2408 progress_ = progress; | |
2409 } | |
2410 | |
2411 | |
2412 OrthancJob::OrthancJob(const std::string& jobType) : | |
2413 jobType_(jobType), | |
2414 progress_(0) | |
2415 { | |
2416 ClearContent(); | |
2417 ClearSerialized(); | |
2418 } | |
2419 | |
2420 | |
2421 OrthancPluginJob* OrthancJob::Create(OrthancJob* job) | |
2422 { | |
2423 if (job == NULL) | |
2424 { | |
2425 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_NullPointer); | |
2426 } | |
2427 | |
54
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2428 OrthancPluginJob* orthanc = |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2429 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 11, 3) |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2430 OrthancPluginCreateJob2 |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2431 #else |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2432 OrthancPluginCreateJob |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2433 #endif |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2434 (GetGlobalContext(), job, CallbackFinalize, job->jobType_.c_str(), |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2435 CallbackGetProgress, CallbackGetContent, CallbackGetSerialized, |
5915547fa6f2
upgraded SDK and framework to 1.11.3
Alain Mazy <am@osimis.io>
parents:
44
diff
changeset
|
2436 CallbackStep, CallbackStop, CallbackReset); |
22 | 2437 |
2438 if (orthanc == NULL) | |
2439 { | |
2440 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin); | |
2441 } | |
2442 else | |
2443 { | |
2444 return orthanc; | |
2445 } | |
2446 } | |
2447 | |
2448 | |
2449 std::string OrthancJob::Submit(OrthancJob* job, | |
2450 int priority) | |
2451 { | |
2452 if (job == NULL) | |
2453 { | |
2454 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_NullPointer); | |
2455 } | |
2456 | |
2457 OrthancPluginJob* orthanc = Create(job); | |
2458 | |
2459 char* id = OrthancPluginSubmitJob(GetGlobalContext(), orthanc, priority); | |
2460 | |
2461 if (id == NULL) | |
2462 { | |
2463 LogError("Plugin cannot submit job"); | |
2464 OrthancPluginFreeJob(GetGlobalContext(), orthanc); | |
2465 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin); | |
2466 } | |
2467 else | |
2468 { | |
2469 std::string tmp(id); | |
2470 tmp.assign(id); | |
2471 OrthancPluginFreeString(GetGlobalContext(), id); | |
2472 | |
2473 return tmp; | |
2474 } | |
2475 } | |
2476 | |
2477 | |
2478 void OrthancJob::SubmitAndWait(Json::Value& result, | |
2479 OrthancJob* job /* takes ownership */, | |
2480 int priority) | |
2481 { | |
2482 std::string id = Submit(job, priority); | |
2483 | |
2484 for (;;) | |
2485 { | |
2486 boost::this_thread::sleep(boost::posix_time::milliseconds(100)); | |
2487 | |
2488 Json::Value status; | |
2489 if (!RestApiGet(status, "/jobs/" + id, false) || | |
2490 !status.isMember("State") || | |
2491 status["State"].type() != Json::stringValue) | |
2492 { | |
2493 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_InexistentItem); | |
2494 } | |
2495 | |
2496 const std::string state = status["State"].asString(); | |
2497 if (state == "Success") | |
2498 { | |
2499 if (status.isMember("Content")) | |
2500 { | |
2501 result = status["Content"]; | |
2502 } | |
2503 else | |
2504 { | |
2505 result = Json::objectValue; | |
2506 } | |
2507 | |
2508 return; | |
2509 } | |
2510 else if (state == "Running") | |
2511 { | |
2512 continue; | |
2513 } | |
2514 else if (!status.isMember("ErrorCode") || | |
2515 status["ErrorCode"].type() != Json::intValue) | |
2516 { | |
2517 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_InternalError); | |
2518 } | |
2519 else | |
2520 { | |
2521 if (!status.isMember("ErrorDescription") || | |
2522 status["ErrorDescription"].type() != Json::stringValue) | |
2523 { | |
2524 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(status["ErrorCode"].asInt()); | |
2525 } | |
2526 else | |
2527 { | |
2528 #if HAS_ORTHANC_EXCEPTION == 1 | |
2529 throw Orthanc::OrthancException(static_cast<Orthanc::ErrorCode>(status["ErrorCode"].asInt()), | |
2530 status["ErrorDescription"].asString()); | |
2531 #else | |
2532 LogError("Exception while executing the job: " + status["ErrorDescription"].asString()); | |
2533 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(status["ErrorCode"].asInt()); | |
2534 #endif | |
2535 } | |
2536 } | |
2537 } | |
2538 } | |
2539 | |
2540 | |
2541 void OrthancJob::SubmitFromRestApiPost(OrthancPluginRestOutput* output, | |
2542 const Json::Value& body, | |
2543 OrthancJob* job) | |
2544 { | |
2545 static const char* KEY_SYNCHRONOUS = "Synchronous"; | |
2546 static const char* KEY_ASYNCHRONOUS = "Asynchronous"; | |
2547 static const char* KEY_PRIORITY = "Priority"; | |
2548 | |
2549 boost::movelib::unique_ptr<OrthancJob> protection(job); | |
2550 | |
2551 if (body.type() != Json::objectValue) | |
2552 { | |
2553 #if HAS_ORTHANC_EXCEPTION == 1 | |
2554 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, | |
2555 "Expected a JSON object in the body"); | |
2556 #else | |
2557 LogError("Expected a JSON object in the body"); | |
2558 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
2559 #endif | |
2560 } | |
2561 | |
2562 bool synchronous = true; | |
2563 | |
2564 if (body.isMember(KEY_SYNCHRONOUS)) | |
2565 { | |
2566 if (body[KEY_SYNCHRONOUS].type() != Json::booleanValue) | |
2567 { | |
2568 #if HAS_ORTHANC_EXCEPTION == 1 | |
2569 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, | |
2570 "Option \"" + std::string(KEY_SYNCHRONOUS) + | |
2571 "\" must be Boolean"); | |
2572 #else | |
2573 LogError("Option \"" + std::string(KEY_SYNCHRONOUS) + "\" must be Boolean"); | |
2574 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
2575 #endif | |
2576 } | |
2577 else | |
2578 { | |
2579 synchronous = body[KEY_SYNCHRONOUS].asBool(); | |
2580 } | |
2581 } | |
2582 | |
2583 if (body.isMember(KEY_ASYNCHRONOUS)) | |
2584 { | |
2585 if (body[KEY_ASYNCHRONOUS].type() != Json::booleanValue) | |
2586 { | |
2587 #if HAS_ORTHANC_EXCEPTION == 1 | |
2588 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, | |
2589 "Option \"" + std::string(KEY_ASYNCHRONOUS) + | |
2590 "\" must be Boolean"); | |
2591 #else | |
2592 LogError("Option \"" + std::string(KEY_ASYNCHRONOUS) + "\" must be Boolean"); | |
2593 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
2594 #endif | |
2595 } | |
2596 else | |
2597 { | |
2598 synchronous = !body[KEY_ASYNCHRONOUS].asBool(); | |
2599 } | |
2600 } | |
2601 | |
2602 int priority = 0; | |
2603 | |
2604 if (body.isMember(KEY_PRIORITY)) | |
2605 { | |
2606 if (body[KEY_PRIORITY].type() != Json::booleanValue) | |
2607 { | |
2608 #if HAS_ORTHANC_EXCEPTION == 1 | |
2609 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, | |
2610 "Option \"" + std::string(KEY_PRIORITY) + | |
2611 "\" must be an integer"); | |
2612 #else | |
2613 LogError("Option \"" + std::string(KEY_PRIORITY) + "\" must be an integer"); | |
2614 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
2615 #endif | |
2616 } | |
2617 else | |
2618 { | |
2619 priority = !body[KEY_PRIORITY].asInt(); | |
2620 } | |
2621 } | |
2622 | |
2623 Json::Value result; | |
2624 | |
2625 if (synchronous) | |
2626 { | |
2627 OrthancPlugins::OrthancJob::SubmitAndWait(result, protection.release(), priority); | |
2628 } | |
2629 else | |
2630 { | |
2631 std::string id = OrthancPlugins::OrthancJob::Submit(protection.release(), priority); | |
2632 | |
2633 result = Json::objectValue; | |
2634 result["ID"] = id; | |
2635 result["Path"] = "/jobs/" + id; | |
2636 } | |
2637 | |
2638 std::string s = result.toStyledString(); | |
2639 OrthancPluginAnswerBuffer(OrthancPlugins::GetGlobalContext(), output, s.c_str(), | |
2640 s.size(), "application/json"); | |
2641 } | |
2642 | |
2643 #endif | |
2644 | |
2645 | |
2646 | |
2647 | |
2648 /****************************************************************** | |
2649 ** METRICS | |
2650 ******************************************************************/ | |
2651 | |
2652 #if HAS_ORTHANC_PLUGIN_METRICS == 1 | |
2653 MetricsTimer::MetricsTimer(const char* name) : | |
2654 name_(name) | |
2655 { | |
2656 start_ = boost::posix_time::microsec_clock::universal_time(); | |
2657 } | |
2658 | |
2659 MetricsTimer::~MetricsTimer() | |
2660 { | |
2661 const boost::posix_time::ptime stop = boost::posix_time::microsec_clock::universal_time(); | |
2662 const boost::posix_time::time_duration diff = stop - start_; | |
2663 OrthancPluginSetMetricsValue(GetGlobalContext(), name_.c_str(), static_cast<float>(diff.total_milliseconds()), | |
2664 OrthancPluginMetricsType_Timer); | |
2665 } | |
2666 #endif | |
2667 | |
2668 | |
2669 | |
2670 | |
2671 /****************************************************************** | |
2672 ** HTTP CLIENT | |
2673 ******************************************************************/ | |
2674 | |
2675 #if HAS_ORTHANC_PLUGIN_HTTP_CLIENT == 1 | |
2676 class HttpClient::RequestBodyWrapper : public boost::noncopyable | |
2677 { | |
2678 private: | |
2679 static RequestBodyWrapper& GetObject(void* body) | |
2680 { | |
2681 assert(body != NULL); | |
2682 return *reinterpret_cast<RequestBodyWrapper*>(body); | |
2683 } | |
2684 | |
2685 IRequestBody& body_; | |
2686 bool done_; | |
2687 std::string chunk_; | |
2688 | |
2689 public: | |
2690 RequestBodyWrapper(IRequestBody& body) : | |
2691 body_(body), | |
2692 done_(false) | |
2693 { | |
2694 } | |
2695 | |
2696 static uint8_t IsDone(void* body) | |
2697 { | |
2698 return GetObject(body).done_; | |
2699 } | |
2700 | |
2701 static const void* GetChunkData(void* body) | |
2702 { | |
2703 return GetObject(body).chunk_.c_str(); | |
2704 } | |
2705 | |
2706 static uint32_t GetChunkSize(void* body) | |
2707 { | |
2708 return static_cast<uint32_t>(GetObject(body).chunk_.size()); | |
2709 } | |
2710 | |
2711 static OrthancPluginErrorCode Next(void* body) | |
2712 { | |
2713 RequestBodyWrapper& that = GetObject(body); | |
2714 | |
2715 if (that.done_) | |
2716 { | |
2717 return OrthancPluginErrorCode_BadSequenceOfCalls; | |
2718 } | |
2719 else | |
2720 { | |
2721 try | |
2722 { | |
2723 that.done_ = !that.body_.ReadNextChunk(that.chunk_); | |
2724 return OrthancPluginErrorCode_Success; | |
2725 } | |
2726 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) | |
2727 { | |
2728 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); | |
2729 } | |
2730 catch (...) | |
2731 { | |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
2732 return OrthancPluginErrorCode_Plugin; |
22 | 2733 } |
2734 } | |
2735 } | |
2736 }; | |
2737 | |
2738 | |
2739 #if HAS_ORTHANC_PLUGIN_CHUNKED_HTTP_CLIENT == 1 | |
2740 static OrthancPluginErrorCode AnswerAddHeaderCallback(void* answer, | |
2741 const char* key, | |
2742 const char* value) | |
2743 { | |
2744 assert(answer != NULL && key != NULL && value != NULL); | |
2745 | |
2746 try | |
2747 { | |
2748 reinterpret_cast<HttpClient::IAnswer*>(answer)->AddHeader(key, value); | |
2749 return OrthancPluginErrorCode_Success; | |
2750 } | |
2751 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) | |
2752 { | |
2753 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); | |
2754 } | |
2755 catch (...) | |
2756 { | |
2757 return OrthancPluginErrorCode_Plugin; | |
2758 } | |
2759 } | |
2760 #endif | |
2761 | |
2762 | |
2763 #if HAS_ORTHANC_PLUGIN_CHUNKED_HTTP_CLIENT == 1 | |
2764 static OrthancPluginErrorCode AnswerAddChunkCallback(void* answer, | |
2765 const void* data, | |
2766 uint32_t size) | |
2767 { | |
2768 assert(answer != NULL); | |
2769 | |
2770 try | |
2771 { | |
2772 reinterpret_cast<HttpClient::IAnswer*>(answer)->AddChunk(data, size); | |
2773 return OrthancPluginErrorCode_Success; | |
2774 } | |
2775 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) | |
2776 { | |
2777 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); | |
2778 } | |
2779 catch (...) | |
2780 { | |
2781 return OrthancPluginErrorCode_Plugin; | |
2782 } | |
2783 } | |
2784 #endif | |
2785 | |
2786 | |
2787 HttpClient::HttpClient() : | |
2788 httpStatus_(0), | |
2789 method_(OrthancPluginHttpMethod_Get), | |
2790 timeout_(0), | |
2791 pkcs11_(false), | |
2792 chunkedBody_(NULL), | |
2793 allowChunkedTransfers_(true) | |
2794 { | |
2795 } | |
2796 | |
2797 | |
2798 void HttpClient::AddHeaders(const HttpHeaders& headers) | |
2799 { | |
2800 for (HttpHeaders::const_iterator it = headers.begin(); | |
2801 it != headers.end(); ++it) | |
2802 { | |
2803 headers_[it->first] = it->second; | |
2804 } | |
2805 } | |
2806 | |
2807 | |
2808 void HttpClient::SetCredentials(const std::string& username, | |
2809 const std::string& password) | |
2810 { | |
2811 username_ = username; | |
2812 password_ = password; | |
2813 } | |
2814 | |
2815 | |
2816 void HttpClient::ClearCredentials() | |
2817 { | |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
2818 username_.clear(); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
2819 password_.clear(); |
22 | 2820 } |
2821 | |
2822 | |
2823 void HttpClient::SetCertificate(const std::string& certificateFile, | |
2824 const std::string& keyFile, | |
2825 const std::string& keyPassword) | |
2826 { | |
2827 certificateFile_ = certificateFile; | |
2828 certificateKeyFile_ = keyFile; | |
2829 certificateKeyPassword_ = keyPassword; | |
2830 } | |
2831 | |
2832 | |
2833 void HttpClient::ClearCertificate() | |
2834 { | |
2835 certificateFile_.clear(); | |
2836 certificateKeyFile_.clear(); | |
2837 certificateKeyPassword_.clear(); | |
2838 } | |
2839 | |
2840 | |
2841 void HttpClient::ClearBody() | |
2842 { | |
2843 fullBody_.clear(); | |
2844 chunkedBody_ = NULL; | |
2845 } | |
2846 | |
2847 | |
2848 void HttpClient::SwapBody(std::string& body) | |
2849 { | |
2850 fullBody_.swap(body); | |
2851 chunkedBody_ = NULL; | |
2852 } | |
2853 | |
2854 | |
2855 void HttpClient::SetBody(const std::string& body) | |
2856 { | |
2857 fullBody_ = body; | |
2858 chunkedBody_ = NULL; | |
2859 } | |
2860 | |
2861 | |
2862 void HttpClient::SetBody(IRequestBody& body) | |
2863 { | |
2864 fullBody_.clear(); | |
2865 chunkedBody_ = &body; | |
2866 } | |
2867 | |
2868 | |
2869 namespace | |
2870 { | |
2871 class HeadersWrapper : public boost::noncopyable | |
2872 { | |
2873 private: | |
2874 std::vector<const char*> headersKeys_; | |
2875 std::vector<const char*> headersValues_; | |
2876 | |
2877 public: | |
2878 HeadersWrapper(const HttpClient::HttpHeaders& headers) | |
2879 { | |
2880 headersKeys_.reserve(headers.size()); | |
2881 headersValues_.reserve(headers.size()); | |
2882 | |
2883 for (HttpClient::HttpHeaders::const_iterator it = headers.begin(); it != headers.end(); ++it) | |
2884 { | |
2885 headersKeys_.push_back(it->first.c_str()); | |
2886 headersValues_.push_back(it->second.c_str()); | |
2887 } | |
2888 } | |
2889 | |
2890 void AddStaticString(const char* key, | |
2891 const char* value) | |
2892 { | |
2893 headersKeys_.push_back(key); | |
2894 headersValues_.push_back(value); | |
2895 } | |
2896 | |
2897 uint32_t GetCount() const | |
2898 { | |
2899 return headersKeys_.size(); | |
2900 } | |
2901 | |
2902 const char* const* GetKeys() const | |
2903 { | |
2904 return headersKeys_.empty() ? NULL : &headersKeys_[0]; | |
2905 } | |
2906 | |
2907 const char* const* GetValues() const | |
2908 { | |
2909 return headersValues_.empty() ? NULL : &headersValues_[0]; | |
2910 } | |
2911 }; | |
2912 | |
2913 | |
2914 class MemoryRequestBody : public HttpClient::IRequestBody | |
2915 { | |
2916 private: | |
2917 std::string body_; | |
2918 bool done_; | |
2919 | |
2920 public: | |
2921 MemoryRequestBody(const std::string& body) : | |
2922 body_(body), | |
2923 done_(false) | |
2924 { | |
2925 if (body_.empty()) | |
2926 { | |
2927 done_ = true; | |
2928 } | |
2929 } | |
2930 | |
2931 virtual bool ReadNextChunk(std::string& chunk) | |
2932 { | |
2933 if (done_) | |
2934 { | |
2935 return false; | |
2936 } | |
2937 else | |
2938 { | |
2939 chunk.swap(body_); | |
2940 done_ = true; | |
2941 return true; | |
2942 } | |
2943 } | |
2944 }; | |
2945 | |
2946 | |
2947 // This class mimics Orthanc::ChunkedBuffer | |
2948 class ChunkedBuffer : public boost::noncopyable | |
2949 { | |
2950 private: | |
2951 typedef std::list<std::string*> Content; | |
2952 | |
2953 Content content_; | |
2954 size_t size_; | |
2955 | |
2956 public: | |
2957 ChunkedBuffer() : | |
2958 size_(0) | |
2959 { | |
2960 } | |
2961 | |
2962 ~ChunkedBuffer() | |
2963 { | |
2964 Clear(); | |
2965 } | |
2966 | |
2967 void Clear() | |
2968 { | |
2969 for (Content::iterator it = content_.begin(); it != content_.end(); ++it) | |
2970 { | |
2971 assert(*it != NULL); | |
2972 delete *it; | |
2973 } | |
2974 | |
35 | 2975 size_ = 0; |
22 | 2976 content_.clear(); |
2977 } | |
2978 | |
35 | 2979 /** |
2980 * Since Orthanc 1.9.3, this function also clears the content of | |
2981 * the ChunkedBuffer in order to mimic the behavior of the | |
2982 * original class "Orthanc::ChunkedBuffer". This prevents the | |
2983 * forgetting of calling "Clear()" in order to reduce memory | |
2984 * consumption. | |
2985 **/ | |
2986 void Flatten(std::string& target) | |
22 | 2987 { |
2988 target.resize(size_); | |
2989 | |
2990 size_t pos = 0; | |
2991 | |
2992 for (Content::const_iterator it = content_.begin(); it != content_.end(); ++it) | |
2993 { | |
2994 assert(*it != NULL); | |
2995 size_t s = (*it)->size(); | |
2996 | |
2997 if (s != 0) | |
2998 { | |
2999 memcpy(&target[pos], (*it)->c_str(), s); | |
3000 pos += s; | |
3001 } | |
35 | 3002 |
3003 delete *it; | |
22 | 3004 } |
3005 | |
35 | 3006 assert(pos == target.size()); |
3007 | |
3008 size_ = 0; | |
3009 content_.clear(); | |
22 | 3010 } |
3011 | |
3012 void AddChunk(const void* data, | |
3013 size_t size) | |
3014 { | |
3015 content_.push_back(new std::string(reinterpret_cast<const char*>(data), size)); | |
3016 size_ += size; | |
3017 } | |
3018 | |
3019 void AddChunk(const std::string& chunk) | |
3020 { | |
3021 content_.push_back(new std::string(chunk)); | |
3022 size_ += chunk.size(); | |
3023 } | |
3024 }; | |
3025 | |
3026 | |
3027 #if HAS_ORTHANC_PLUGIN_CHUNKED_HTTP_CLIENT == 1 | |
3028 class MemoryAnswer : public HttpClient::IAnswer | |
3029 { | |
3030 private: | |
3031 HttpClient::HttpHeaders headers_; | |
3032 ChunkedBuffer body_; | |
3033 | |
3034 public: | |
3035 const HttpClient::HttpHeaders& GetHeaders() const | |
3036 { | |
3037 return headers_; | |
3038 } | |
3039 | |
35 | 3040 ChunkedBuffer& GetBody() |
22 | 3041 { |
3042 return body_; | |
3043 } | |
3044 | |
3045 virtual void AddHeader(const std::string& key, | |
3046 const std::string& value) | |
3047 { | |
3048 headers_[key] = value; | |
3049 } | |
3050 | |
3051 virtual void AddChunk(const void* data, | |
3052 size_t size) | |
3053 { | |
3054 body_.AddChunk(data, size); | |
3055 } | |
3056 }; | |
3057 #endif | |
3058 } | |
3059 | |
3060 | |
3061 #if HAS_ORTHANC_PLUGIN_CHUNKED_HTTP_CLIENT == 1 | |
3062 void HttpClient::ExecuteWithStream(uint16_t& httpStatus, | |
3063 IAnswer& answer, | |
3064 IRequestBody& body) const | |
3065 { | |
3066 HeadersWrapper h(headers_); | |
3067 | |
3068 if (method_ == OrthancPluginHttpMethod_Post || | |
3069 method_ == OrthancPluginHttpMethod_Put) | |
3070 { | |
3071 // Automatically set the "Transfer-Encoding" header if absent | |
3072 bool found = false; | |
3073 | |
3074 for (HttpHeaders::const_iterator it = headers_.begin(); it != headers_.end(); ++it) | |
3075 { | |
3076 if (boost::iequals(it->first, "Transfer-Encoding")) | |
3077 { | |
3078 found = true; | |
3079 break; | |
3080 } | |
3081 } | |
3082 | |
3083 if (!found) | |
3084 { | |
3085 h.AddStaticString("Transfer-Encoding", "chunked"); | |
3086 } | |
3087 } | |
3088 | |
3089 RequestBodyWrapper request(body); | |
3090 | |
3091 OrthancPluginErrorCode error = OrthancPluginChunkedHttpClient( | |
3092 GetGlobalContext(), | |
3093 &answer, | |
3094 AnswerAddChunkCallback, | |
3095 AnswerAddHeaderCallback, | |
3096 &httpStatus, | |
3097 method_, | |
3098 url_.c_str(), | |
3099 h.GetCount(), | |
3100 h.GetKeys(), | |
3101 h.GetValues(), | |
3102 &request, | |
3103 RequestBodyWrapper::IsDone, | |
3104 RequestBodyWrapper::GetChunkData, | |
3105 RequestBodyWrapper::GetChunkSize, | |
3106 RequestBodyWrapper::Next, | |
3107 username_.empty() ? NULL : username_.c_str(), | |
3108 password_.empty() ? NULL : password_.c_str(), | |
3109 timeout_, | |
3110 certificateFile_.empty() ? NULL : certificateFile_.c_str(), | |
3111 certificateFile_.empty() ? NULL : certificateKeyFile_.c_str(), | |
3112 certificateFile_.empty() ? NULL : certificateKeyPassword_.c_str(), | |
3113 pkcs11_ ? 1 : 0); | |
3114 | |
3115 if (error != OrthancPluginErrorCode_Success) | |
3116 { | |
3117 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(error); | |
3118 } | |
3119 } | |
3120 #endif | |
3121 | |
3122 | |
3123 void HttpClient::ExecuteWithoutStream(uint16_t& httpStatus, | |
3124 HttpHeaders& answerHeaders, | |
3125 std::string& answerBody, | |
3126 const std::string& body) const | |
3127 { | |
3128 HeadersWrapper headers(headers_); | |
3129 | |
3130 MemoryBuffer answerBodyBuffer, answerHeadersBuffer; | |
3131 | |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3132 if (body.size() > 0xffffffffu) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3133 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3134 LogError("Cannot handle body size > 4GB"); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3135 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3136 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3137 |
22 | 3138 OrthancPluginErrorCode error = OrthancPluginHttpClient( |
3139 GetGlobalContext(), | |
3140 *answerBodyBuffer, | |
3141 *answerHeadersBuffer, | |
3142 &httpStatus, | |
3143 method_, | |
3144 url_.c_str(), | |
3145 headers.GetCount(), | |
3146 headers.GetKeys(), | |
3147 headers.GetValues(), | |
3148 body.empty() ? NULL : body.c_str(), | |
3149 body.size(), | |
3150 username_.empty() ? NULL : username_.c_str(), | |
3151 password_.empty() ? NULL : password_.c_str(), | |
3152 timeout_, | |
3153 certificateFile_.empty() ? NULL : certificateFile_.c_str(), | |
3154 certificateFile_.empty() ? NULL : certificateKeyFile_.c_str(), | |
3155 certificateFile_.empty() ? NULL : certificateKeyPassword_.c_str(), | |
3156 pkcs11_ ? 1 : 0); | |
3157 | |
3158 if (error != OrthancPluginErrorCode_Success) | |
3159 { | |
3160 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(error); | |
3161 } | |
3162 | |
3163 Json::Value v; | |
3164 answerHeadersBuffer.ToJson(v); | |
3165 | |
3166 if (v.type() != Json::objectValue) | |
3167 { | |
3168 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
3169 } | |
3170 | |
3171 Json::Value::Members members = v.getMemberNames(); | |
3172 answerHeaders.clear(); | |
3173 | |
3174 for (size_t i = 0; i < members.size(); i++) | |
3175 { | |
3176 const Json::Value& h = v[members[i]]; | |
3177 if (h.type() != Json::stringValue) | |
3178 { | |
3179 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
3180 } | |
3181 else | |
3182 { | |
3183 answerHeaders[members[i]] = h.asString(); | |
3184 } | |
3185 } | |
3186 | |
3187 answerBodyBuffer.ToString(answerBody); | |
3188 } | |
3189 | |
3190 | |
3191 void HttpClient::Execute(IAnswer& answer) | |
3192 { | |
3193 #if HAS_ORTHANC_PLUGIN_CHUNKED_HTTP_CLIENT == 1 | |
3194 if (allowChunkedTransfers_) | |
3195 { | |
3196 if (chunkedBody_ != NULL) | |
3197 { | |
3198 ExecuteWithStream(httpStatus_, answer, *chunkedBody_); | |
3199 } | |
3200 else | |
3201 { | |
3202 MemoryRequestBody wrapper(fullBody_); | |
3203 ExecuteWithStream(httpStatus_, answer, wrapper); | |
3204 } | |
3205 | |
3206 return; | |
3207 } | |
3208 #endif | |
3209 | |
3210 // Compatibility mode for Orthanc SDK <= 1.5.6 or if chunked | |
3211 // transfers are disabled. This results in higher memory usage | |
3212 // (all chunks from the answer body are sent at once) | |
3213 | |
3214 HttpHeaders answerHeaders; | |
3215 std::string answerBody; | |
3216 Execute(answerHeaders, answerBody); | |
3217 | |
3218 for (HttpHeaders::const_iterator it = answerHeaders.begin(); | |
3219 it != answerHeaders.end(); ++it) | |
3220 { | |
3221 answer.AddHeader(it->first, it->second); | |
3222 } | |
3223 | |
3224 if (!answerBody.empty()) | |
3225 { | |
3226 answer.AddChunk(answerBody.c_str(), answerBody.size()); | |
3227 } | |
3228 } | |
3229 | |
3230 | |
3231 void HttpClient::Execute(HttpHeaders& answerHeaders /* out */, | |
3232 std::string& answerBody /* out */) | |
3233 { | |
3234 #if HAS_ORTHANC_PLUGIN_CHUNKED_HTTP_CLIENT == 1 | |
3235 if (allowChunkedTransfers_) | |
3236 { | |
3237 MemoryAnswer answer; | |
3238 Execute(answer); | |
3239 answerHeaders = answer.GetHeaders(); | |
3240 answer.GetBody().Flatten(answerBody); | |
3241 return; | |
3242 } | |
3243 #endif | |
3244 | |
3245 // Compatibility mode for Orthanc SDK <= 1.5.6 or if chunked | |
3246 // transfers are disabled. This results in higher memory usage | |
3247 // (all chunks from the request body are sent at once) | |
3248 | |
3249 if (chunkedBody_ != NULL) | |
3250 { | |
3251 ChunkedBuffer buffer; | |
3252 | |
3253 std::string chunk; | |
3254 while (chunkedBody_->ReadNextChunk(chunk)) | |
3255 { | |
3256 buffer.AddChunk(chunk); | |
3257 } | |
3258 | |
3259 std::string body; | |
3260 buffer.Flatten(body); | |
3261 | |
3262 ExecuteWithoutStream(httpStatus_, answerHeaders, answerBody, body); | |
3263 } | |
3264 else | |
3265 { | |
3266 ExecuteWithoutStream(httpStatus_, answerHeaders, answerBody, fullBody_); | |
3267 } | |
3268 } | |
3269 | |
3270 | |
3271 void HttpClient::Execute(HttpHeaders& answerHeaders /* out */, | |
3272 Json::Value& answerBody /* out */) | |
3273 { | |
3274 std::string body; | |
3275 Execute(answerHeaders, body); | |
3276 | |
31
cfeda58d0c8e
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
3277 if (!ReadJson(answerBody, body)) |
22 | 3278 { |
3279 LogError("Cannot convert HTTP answer body to JSON"); | |
3280 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); | |
3281 } | |
3282 } | |
3283 | |
3284 | |
3285 void HttpClient::Execute() | |
3286 { | |
3287 HttpHeaders answerHeaders; | |
3288 std::string body; | |
3289 Execute(answerHeaders, body); | |
3290 } | |
3291 | |
3292 #endif /* HAS_ORTHANC_PLUGIN_HTTP_CLIENT == 1 */ | |
3293 | |
3294 | |
3295 | |
3296 | |
3297 | |
3298 /****************************************************************** | |
3299 ** CHUNKED HTTP SERVER | |
3300 ******************************************************************/ | |
3301 | |
3302 namespace Internals | |
3303 { | |
3304 void NullRestCallback(OrthancPluginRestOutput* output, | |
3305 const char* url, | |
3306 const OrthancPluginHttpRequest* request) | |
3307 { | |
3308 } | |
3309 | |
3310 IChunkedRequestReader *NullChunkedRestCallback(const char* url, | |
3311 const OrthancPluginHttpRequest* request) | |
3312 { | |
3313 return NULL; | |
3314 } | |
3315 | |
3316 | |
3317 #if HAS_ORTHANC_PLUGIN_CHUNKED_HTTP_SERVER == 1 | |
3318 | |
3319 OrthancPluginErrorCode ChunkedRequestReaderAddChunk( | |
3320 OrthancPluginServerChunkedRequestReader* reader, | |
3321 const void* data, | |
3322 uint32_t size) | |
3323 { | |
3324 try | |
3325 { | |
3326 if (reader == NULL) | |
3327 { | |
3328 return OrthancPluginErrorCode_InternalError; | |
3329 } | |
3330 | |
3331 reinterpret_cast<IChunkedRequestReader*>(reader)->AddChunk(data, size); | |
3332 return OrthancPluginErrorCode_Success; | |
3333 } | |
3334 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) | |
3335 { | |
3336 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); | |
3337 } | |
3338 catch (boost::bad_lexical_cast&) | |
3339 { | |
3340 return OrthancPluginErrorCode_BadFileFormat; | |
3341 } | |
3342 catch (...) | |
3343 { | |
3344 return OrthancPluginErrorCode_Plugin; | |
3345 } | |
3346 } | |
3347 | |
3348 | |
3349 OrthancPluginErrorCode ChunkedRequestReaderExecute( | |
3350 OrthancPluginServerChunkedRequestReader* reader, | |
3351 OrthancPluginRestOutput* output) | |
3352 { | |
3353 try | |
3354 { | |
3355 if (reader == NULL) | |
3356 { | |
3357 return OrthancPluginErrorCode_InternalError; | |
3358 } | |
3359 | |
3360 reinterpret_cast<IChunkedRequestReader*>(reader)->Execute(output); | |
3361 return OrthancPluginErrorCode_Success; | |
3362 } | |
3363 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) | |
3364 { | |
3365 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); | |
3366 } | |
3367 catch (boost::bad_lexical_cast&) | |
3368 { | |
3369 return OrthancPluginErrorCode_BadFileFormat; | |
3370 } | |
3371 catch (...) | |
3372 { | |
3373 return OrthancPluginErrorCode_Plugin; | |
3374 } | |
3375 } | |
3376 | |
3377 | |
3378 void ChunkedRequestReaderFinalize( | |
3379 OrthancPluginServerChunkedRequestReader* reader) | |
3380 { | |
3381 if (reader != NULL) | |
3382 { | |
3383 delete reinterpret_cast<IChunkedRequestReader*>(reader); | |
3384 } | |
3385 } | |
3386 | |
3387 #else | |
3388 | |
3389 OrthancPluginErrorCode ChunkedRestCompatibility(OrthancPluginRestOutput* output, | |
3390 const char* url, | |
3391 const OrthancPluginHttpRequest* request, | |
3392 RestCallback GetHandler, | |
3393 ChunkedRestCallback PostHandler, | |
3394 RestCallback DeleteHandler, | |
3395 ChunkedRestCallback PutHandler) | |
3396 { | |
3397 try | |
3398 { | |
3399 std::string allowed; | |
3400 | |
3401 if (GetHandler != Internals::NullRestCallback) | |
3402 { | |
3403 allowed += "GET"; | |
3404 } | |
3405 | |
3406 if (PostHandler != Internals::NullChunkedRestCallback) | |
3407 { | |
3408 if (!allowed.empty()) | |
3409 { | |
3410 allowed += ","; | |
3411 } | |
3412 | |
3413 allowed += "POST"; | |
3414 } | |
3415 | |
3416 if (DeleteHandler != Internals::NullRestCallback) | |
3417 { | |
3418 if (!allowed.empty()) | |
3419 { | |
3420 allowed += ","; | |
3421 } | |
3422 | |
3423 allowed += "DELETE"; | |
3424 } | |
3425 | |
3426 if (PutHandler != Internals::NullChunkedRestCallback) | |
3427 { | |
3428 if (!allowed.empty()) | |
3429 { | |
3430 allowed += ","; | |
3431 } | |
3432 | |
3433 allowed += "PUT"; | |
3434 } | |
3435 | |
3436 switch (request->method) | |
3437 { | |
3438 case OrthancPluginHttpMethod_Get: | |
3439 if (GetHandler == Internals::NullRestCallback) | |
3440 { | |
3441 OrthancPluginSendMethodNotAllowed(GetGlobalContext(), output, allowed.c_str()); | |
3442 } | |
3443 else | |
3444 { | |
3445 GetHandler(output, url, request); | |
3446 } | |
3447 | |
3448 break; | |
3449 | |
3450 case OrthancPluginHttpMethod_Post: | |
3451 if (PostHandler == Internals::NullChunkedRestCallback) | |
3452 { | |
3453 OrthancPluginSendMethodNotAllowed(GetGlobalContext(), output, allowed.c_str()); | |
3454 } | |
3455 else | |
3456 { | |
3457 boost::movelib::unique_ptr<IChunkedRequestReader> reader(PostHandler(url, request)); | |
3458 if (reader.get() == NULL) | |
3459 { | |
3460 ORTHANC_PLUGINS_THROW_EXCEPTION(Plugin); | |
3461 } | |
3462 else | |
3463 { | |
3464 reader->AddChunk(request->body, request->bodySize); | |
3465 reader->Execute(output); | |
3466 } | |
3467 } | |
3468 | |
3469 break; | |
3470 | |
3471 case OrthancPluginHttpMethod_Delete: | |
3472 if (DeleteHandler == Internals::NullRestCallback) | |
3473 { | |
3474 OrthancPluginSendMethodNotAllowed(GetGlobalContext(), output, allowed.c_str()); | |
3475 } | |
3476 else | |
3477 { | |
3478 DeleteHandler(output, url, request); | |
3479 } | |
3480 | |
3481 break; | |
3482 | |
3483 case OrthancPluginHttpMethod_Put: | |
3484 if (PutHandler == Internals::NullChunkedRestCallback) | |
3485 { | |
3486 OrthancPluginSendMethodNotAllowed(GetGlobalContext(), output, allowed.c_str()); | |
3487 } | |
3488 else | |
3489 { | |
3490 boost::movelib::unique_ptr<IChunkedRequestReader> reader(PutHandler(url, request)); | |
3491 if (reader.get() == NULL) | |
3492 { | |
3493 ORTHANC_PLUGINS_THROW_EXCEPTION(Plugin); | |
3494 } | |
3495 else | |
3496 { | |
3497 reader->AddChunk(request->body, request->bodySize); | |
3498 reader->Execute(output); | |
3499 } | |
3500 } | |
3501 | |
3502 break; | |
3503 | |
3504 default: | |
3505 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); | |
3506 } | |
3507 | |
3508 return OrthancPluginErrorCode_Success; | |
3509 } | |
3510 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) | |
3511 { | |
3512 #if HAS_ORTHANC_EXCEPTION == 1 && HAS_ORTHANC_PLUGIN_EXCEPTION_DETAILS == 1 | |
3513 if (HasGlobalContext() && | |
3514 e.HasDetails()) | |
3515 { | |
3516 // The "false" instructs Orthanc not to log the detailed | |
3517 // error message. This is to avoid duplicating the details, | |
3518 // because "OrthancException" already does it on construction. | |
3519 OrthancPluginSetHttpErrorDetails | |
3520 (GetGlobalContext(), output, e.GetDetails(), false); | |
3521 } | |
3522 #endif | |
3523 | |
3524 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); | |
3525 } | |
3526 catch (boost::bad_lexical_cast&) | |
3527 { | |
3528 return OrthancPluginErrorCode_BadFileFormat; | |
3529 } | |
3530 catch (...) | |
3531 { | |
3532 return OrthancPluginErrorCode_Plugin; | |
3533 } | |
3534 } | |
3535 #endif | |
3536 } | |
3537 | |
3538 | |
3539 #if HAS_ORTHANC_PLUGIN_STORAGE_COMMITMENT_SCP == 1 | |
3540 OrthancPluginErrorCode IStorageCommitmentScpHandler::Lookup( | |
3541 OrthancPluginStorageCommitmentFailureReason* target, | |
3542 void* rawHandler, | |
3543 const char* sopClassUid, | |
3544 const char* sopInstanceUid) | |
3545 { | |
3546 assert(target != NULL && | |
3547 rawHandler != NULL); | |
3548 | |
3549 try | |
3550 { | |
3551 IStorageCommitmentScpHandler& handler = *reinterpret_cast<IStorageCommitmentScpHandler*>(rawHandler); | |
3552 *target = handler.Lookup(sopClassUid, sopInstanceUid); | |
3553 return OrthancPluginErrorCode_Success; | |
3554 } | |
3555 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) | |
3556 { | |
3557 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); | |
3558 } | |
3559 catch (...) | |
3560 { | |
3561 return OrthancPluginErrorCode_Plugin; | |
3562 } | |
3563 } | |
3564 #endif | |
3565 | |
3566 | |
3567 #if HAS_ORTHANC_PLUGIN_STORAGE_COMMITMENT_SCP == 1 | |
3568 void IStorageCommitmentScpHandler::Destructor(void* rawHandler) | |
3569 { | |
3570 assert(rawHandler != NULL); | |
3571 delete reinterpret_cast<IStorageCommitmentScpHandler*>(rawHandler); | |
3572 } | |
3573 #endif | |
3574 | |
3575 | |
3576 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 6, 1) | |
3577 DicomInstance::DicomInstance(const OrthancPluginDicomInstance* instance) : | |
3578 toFree_(false), | |
3579 instance_(instance) | |
3580 { | |
3581 } | |
3582 #else | |
3583 DicomInstance::DicomInstance(OrthancPluginDicomInstance* instance) : | |
3584 toFree_(false), | |
3585 instance_(instance) | |
3586 { | |
3587 } | |
3588 #endif | |
3589 | |
3590 | |
3591 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 7, 0) | |
3592 DicomInstance::DicomInstance(const void* buffer, | |
3593 size_t size) : | |
3594 toFree_(true), | |
3595 instance_(OrthancPluginCreateDicomInstance(GetGlobalContext(), buffer, size)) | |
3596 { | |
3597 if (instance_ == NULL) | |
3598 { | |
3599 ORTHANC_PLUGINS_THROW_EXCEPTION(NullPointer); | |
3600 } | |
3601 } | |
3602 #endif | |
3603 | |
3604 | |
3605 DicomInstance::~DicomInstance() | |
3606 { | |
3607 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 7, 0) | |
3608 if (toFree_ && | |
3609 instance_ != NULL) | |
3610 { | |
3611 OrthancPluginFreeDicomInstance( | |
3612 GetGlobalContext(), const_cast<OrthancPluginDicomInstance*>(instance_)); | |
3613 } | |
3614 #endif | |
3615 } | |
3616 | |
3617 | |
3618 std::string DicomInstance::GetRemoteAet() const | |
3619 { | |
3620 const char* s = OrthancPluginGetInstanceRemoteAet(GetGlobalContext(), instance_); | |
3621 if (s == NULL) | |
3622 { | |
3623 ORTHANC_PLUGINS_THROW_EXCEPTION(Plugin); | |
3624 } | |
3625 else | |
3626 { | |
3627 return std::string(s); | |
3628 } | |
3629 } | |
3630 | |
3631 | |
3632 void DicomInstance::GetJson(Json::Value& target) const | |
3633 { | |
3634 OrthancString s; | |
3635 s.Assign(OrthancPluginGetInstanceJson(GetGlobalContext(), instance_)); | |
3636 s.ToJson(target); | |
3637 } | |
3638 | |
3639 | |
3640 void DicomInstance::GetSimplifiedJson(Json::Value& target) const | |
3641 { | |
3642 OrthancString s; | |
3643 s.Assign(OrthancPluginGetInstanceSimplifiedJson(GetGlobalContext(), instance_)); | |
3644 s.ToJson(target); | |
3645 } | |
3646 | |
3647 | |
3648 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 6, 1) | |
3649 std::string DicomInstance::GetTransferSyntaxUid() const | |
3650 { | |
3651 OrthancString s; | |
3652 s.Assign(OrthancPluginGetInstanceTransferSyntaxUid(GetGlobalContext(), instance_)); | |
3653 | |
3654 std::string result; | |
3655 s.ToString(result); | |
3656 return result; | |
3657 } | |
3658 #endif | |
3659 | |
3660 | |
3661 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 6, 1) | |
3662 bool DicomInstance::HasPixelData() const | |
3663 { | |
3664 int32_t result = OrthancPluginHasInstancePixelData(GetGlobalContext(), instance_); | |
3665 if (result < 0) | |
3666 { | |
3667 ORTHANC_PLUGINS_THROW_EXCEPTION(Plugin); | |
3668 } | |
3669 else | |
3670 { | |
3671 return (result != 0); | |
3672 } | |
3673 } | |
3674 #endif | |
3675 | |
3676 | |
3677 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 7, 0) | |
3678 void DicomInstance::GetRawFrame(std::string& target, | |
3679 unsigned int frameIndex) const | |
3680 { | |
3681 MemoryBuffer buffer; | |
3682 OrthancPluginErrorCode code = OrthancPluginGetInstanceRawFrame( | |
3683 GetGlobalContext(), *buffer, instance_, frameIndex); | |
3684 | |
3685 if (code == OrthancPluginErrorCode_Success) | |
3686 { | |
3687 buffer.ToString(target); | |
3688 } | |
3689 else | |
3690 { | |
3691 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(code); | |
3692 } | |
3693 } | |
3694 #endif | |
3695 | |
3696 | |
3697 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 7, 0) | |
3698 OrthancImage* DicomInstance::GetDecodedFrame(unsigned int frameIndex) const | |
3699 { | |
3700 OrthancPluginImage* image = OrthancPluginGetInstanceDecodedFrame( | |
3701 GetGlobalContext(), instance_, frameIndex); | |
3702 | |
3703 if (image == NULL) | |
3704 { | |
3705 ORTHANC_PLUGINS_THROW_EXCEPTION(Plugin); | |
3706 } | |
3707 else | |
3708 { | |
3709 return new OrthancImage(image); | |
3710 } | |
3711 } | |
3712 #endif | |
3713 | |
3714 | |
3715 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 7, 0) | |
3716 void DicomInstance::Serialize(std::string& target) const | |
3717 { | |
3718 MemoryBuffer buffer; | |
3719 OrthancPluginErrorCode code = OrthancPluginSerializeDicomInstance( | |
3720 GetGlobalContext(), *buffer, instance_); | |
3721 | |
3722 if (code == OrthancPluginErrorCode_Success) | |
3723 { | |
3724 buffer.ToString(target); | |
3725 } | |
3726 else | |
3727 { | |
3728 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(code); | |
3729 } | |
3730 } | |
3731 #endif | |
3732 | |
3733 | |
3734 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 7, 0) | |
3735 DicomInstance* DicomInstance::Transcode(const void* buffer, | |
3736 size_t size, | |
3737 const std::string& transferSyntax) | |
3738 { | |
3739 OrthancPluginDicomInstance* instance = OrthancPluginTranscodeDicomInstance( | |
3740 GetGlobalContext(), buffer, size, transferSyntax.c_str()); | |
3741 | |
3742 if (instance == NULL) | |
3743 { | |
3744 ORTHANC_PLUGINS_THROW_EXCEPTION(Plugin); | |
3745 } | |
3746 else | |
3747 { | |
3748 boost::movelib::unique_ptr<DicomInstance> result(new DicomInstance(instance)); | |
3749 result->toFree_ = true; | |
3750 return result.release(); | |
3751 } | |
3752 } | |
3753 #endif | |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3754 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3755 |
64
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3756 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 1) |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3757 DicomInstance* DicomInstance::Load(const std::string& instanceId, |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3758 OrthancPluginLoadDicomInstanceMode mode) |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3759 { |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3760 OrthancPluginDicomInstance* instance = OrthancPluginLoadDicomInstance( |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3761 GetGlobalContext(), instanceId.c_str(), mode); |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3762 |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3763 if (instance == NULL) |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3764 { |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3765 ORTHANC_PLUGINS_THROW_EXCEPTION(Plugin); |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3766 } |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3767 else |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3768 { |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3769 boost::movelib::unique_ptr<DicomInstance> result(new DicomInstance(instance)); |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3770 result->toFree_ = true; |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3771 return result.release(); |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3772 } |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3773 } |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3774 #endif |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3775 |
5fb01c588287
updated to Orthanc Framework 1.12.1
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
3776 |
40
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3777 #if HAS_ORTHANC_PLUGIN_WEBDAV == 1 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3778 static std::vector<std::string> WebDavConvertPath(uint32_t pathSize, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3779 const char* const* pathItems) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3780 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3781 std::vector<std::string> result(pathSize); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3782 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3783 for (uint32_t i = 0; i < pathSize; i++) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3784 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3785 result[i] = pathItems[i]; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3786 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3787 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3788 return result; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3789 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3790 #endif |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3791 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3792 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3793 #if HAS_ORTHANC_PLUGIN_WEBDAV == 1 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3794 static OrthancPluginErrorCode WebDavIsExistingFolder(uint8_t* isExisting, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3795 uint32_t pathSize, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3796 const char* const* pathItems, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3797 void* payload) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3798 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3799 IWebDavCollection& that = *reinterpret_cast<IWebDavCollection*>(payload); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3800 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3801 try |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3802 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3803 *isExisting = (that.IsExistingFolder(WebDavConvertPath(pathSize, pathItems)) ? 1 : 0); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3804 return OrthancPluginErrorCode_Success; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3805 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3806 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3807 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3808 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3809 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3810 catch (...) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3811 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3812 return OrthancPluginErrorCode_Plugin; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3813 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3814 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3815 #endif |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3816 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3817 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3818 #if HAS_ORTHANC_PLUGIN_WEBDAV == 1 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3819 static OrthancPluginErrorCode WebDavListFolder(uint8_t* isExisting, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3820 OrthancPluginWebDavCollection* collection, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3821 OrthancPluginWebDavAddFile addFile, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3822 OrthancPluginWebDavAddFolder addFolder, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3823 uint32_t pathSize, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3824 const char* const* pathItems, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3825 void* payload) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3826 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3827 IWebDavCollection& that = *reinterpret_cast<IWebDavCollection*>(payload); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3828 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3829 try |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3830 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3831 std::list<IWebDavCollection::FileInfo> files; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3832 std::list<IWebDavCollection::FolderInfo> subfolders; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3833 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3834 if (!that.ListFolder(files, subfolders, WebDavConvertPath(pathSize, pathItems))) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3835 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3836 *isExisting = 0; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3837 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3838 else |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3839 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3840 *isExisting = 1; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3841 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3842 for (std::list<IWebDavCollection::FileInfo>::const_iterator |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3843 it = files.begin(); it != files.end(); ++it) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3844 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3845 OrthancPluginErrorCode code = addFile( |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3846 collection, it->GetName().c_str(), it->GetContentSize(), |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3847 it->GetMimeType().c_str(), it->GetDateTime().c_str()); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3848 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3849 if (code != OrthancPluginErrorCode_Success) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3850 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3851 return code; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3852 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3853 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3854 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3855 for (std::list<IWebDavCollection::FolderInfo>::const_iterator it = |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3856 subfolders.begin(); it != subfolders.end(); ++it) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3857 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3858 OrthancPluginErrorCode code = addFolder( |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3859 collection, it->GetName().c_str(), it->GetDateTime().c_str()); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3860 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3861 if (code != OrthancPluginErrorCode_Success) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3862 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3863 return code; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3864 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3865 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3866 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3867 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3868 return OrthancPluginErrorCode_Success; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3869 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3870 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3871 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3872 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3873 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3874 catch (...) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3875 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3876 return OrthancPluginErrorCode_Plugin; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3877 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3878 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3879 #endif |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3880 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3881 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3882 #if HAS_ORTHANC_PLUGIN_WEBDAV == 1 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3883 static OrthancPluginErrorCode WebDavRetrieveFile(OrthancPluginWebDavCollection* collection, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3884 OrthancPluginWebDavRetrieveFile retrieveFile, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3885 uint32_t pathSize, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3886 const char* const* pathItems, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3887 void* payload) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3888 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3889 IWebDavCollection& that = *reinterpret_cast<IWebDavCollection*>(payload); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3890 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3891 try |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3892 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3893 std::string content, mime, dateTime; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3894 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3895 if (that.GetFile(content, mime, dateTime, WebDavConvertPath(pathSize, pathItems))) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3896 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3897 return retrieveFile(collection, content.empty() ? NULL : content.c_str(), |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3898 content.size(), mime.c_str(), dateTime.c_str()); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3899 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3900 else |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3901 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3902 // Inexisting file |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3903 return OrthancPluginErrorCode_Success; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3904 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3905 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3906 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3907 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3908 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3909 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3910 catch (...) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3911 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3912 return OrthancPluginErrorCode_InternalError; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3913 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3914 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3915 #endif |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3916 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3917 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3918 #if HAS_ORTHANC_PLUGIN_WEBDAV == 1 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3919 static OrthancPluginErrorCode WebDavStoreFileCallback(uint8_t* isReadOnly, /* out */ |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3920 uint32_t pathSize, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3921 const char* const* pathItems, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3922 const void* data, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3923 uint64_t size, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3924 void* payload) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3925 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3926 IWebDavCollection& that = *reinterpret_cast<IWebDavCollection*>(payload); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3927 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3928 try |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3929 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3930 if (static_cast<uint64_t>(static_cast<size_t>(size)) != size) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3931 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3932 ORTHANC_PLUGINS_THROW_EXCEPTION(NotEnoughMemory); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3933 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3934 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3935 *isReadOnly = (that.StoreFile(WebDavConvertPath(pathSize, pathItems), data, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3936 static_cast<size_t>(size)) ? 1 : 0); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3937 return OrthancPluginErrorCode_Success; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3938 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3939 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3940 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3941 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3942 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3943 catch (...) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3944 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3945 return OrthancPluginErrorCode_InternalError; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3946 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3947 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3948 #endif |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3949 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3950 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3951 #if HAS_ORTHANC_PLUGIN_WEBDAV == 1 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3952 static OrthancPluginErrorCode WebDavCreateFolderCallback(uint8_t* isReadOnly, /* out */ |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3953 uint32_t pathSize, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3954 const char* const* pathItems, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3955 void* payload) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3956 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3957 IWebDavCollection& that = *reinterpret_cast<IWebDavCollection*>(payload); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3958 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3959 try |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3960 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3961 *isReadOnly = (that.CreateFolder(WebDavConvertPath(pathSize, pathItems)) ? 1 : 0); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3962 return OrthancPluginErrorCode_Success; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3963 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3964 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3965 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3966 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3967 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3968 catch (...) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3969 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3970 return OrthancPluginErrorCode_InternalError; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3971 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3972 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3973 #endif |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3974 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3975 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3976 #if HAS_ORTHANC_PLUGIN_WEBDAV == 1 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3977 static OrthancPluginErrorCode WebDavDeleteItemCallback(uint8_t* isReadOnly, /* out */ |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3978 uint32_t pathSize, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3979 const char* const* pathItems, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3980 void* payload) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3981 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3982 IWebDavCollection& that = *reinterpret_cast<IWebDavCollection*>(payload); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3983 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3984 try |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3985 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3986 *isReadOnly = (that.DeleteItem(WebDavConvertPath(pathSize, pathItems)) ? 1 : 0); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3987 return OrthancPluginErrorCode_Success; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3988 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3989 catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3990 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3991 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3992 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3993 catch (...) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3994 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3995 return OrthancPluginErrorCode_InternalError; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3996 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3997 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3998 #endif |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
3999 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4000 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4001 #if HAS_ORTHANC_PLUGIN_WEBDAV == 1 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4002 void IWebDavCollection::Register(const std::string& uri, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4003 IWebDavCollection& collection) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4004 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4005 OrthancPluginErrorCode code = OrthancPluginRegisterWebDavCollection( |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4006 GetGlobalContext(), uri.c_str(), WebDavIsExistingFolder, WebDavListFolder, WebDavRetrieveFile, |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4007 WebDavStoreFileCallback, WebDavCreateFolderCallback, WebDavDeleteItemCallback, &collection); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4008 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4009 if (code != OrthancPluginErrorCode_Success) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4010 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4011 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(code); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4012 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4013 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4014 #endif |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4015 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4016 void GetHttpHeaders(std::map<std::string, std::string>& result, const OrthancPluginHttpRequest* request) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4017 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4018 result.clear(); |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4019 |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4020 for (uint32_t i = 0; i < request->headersCount; ++i) |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4021 { |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4022 result[request->headersKeys[i]] = request->headersValues[i]; |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4023 } |
1256194e1c08
sync orthanc + sdk 1.5.0 + added more info in error logs
Alain Mazy <am@osimis.io>
parents:
35
diff
changeset
|
4024 } |
22 | 4025 } |