orthanc: OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp annotate

annotate OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp @ 4444:11ea0a05115b

new function in OrthancPluginCppWrapper: ReadJsonWithoutComments()

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 13 Jan 2021 09:19:32 +0100
parents	d9473bd5ed43
children	5e6b5fef92f8

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

Mercurial > hg > orthanc

annotate OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp @ 4444:11ea0a05115b