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