annotate OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp @ 4961:1b76853e1797 more-tags

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