orthanc: Plugins/Engine/OrthancPlugins.cpp annotate

annotate Plugins/Engine/OrthancPlugins.cpp @ 3503:46cf170ba121

ImageProcessing::SeparableConvolution()

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 27 Aug 2019 12:10:13 +0200
parents	dd1e68f2d0c0
children	69e49fc044f8

rev	line source
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1882 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1282 diff changeset	4 * Department, University Hospital of Liege, Belgium
3060 4e43e67f8ecf preparing for 2019 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2984 diff changeset	5 * Copyright (C) 2017-2019 Osimis S.A., Belgium
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 *
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * In addition, as a special exception, the copyright holders of this
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * program give permission to link the code of its release with the
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * the linked executables. You must obey the GNU General Public License
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * modify file(s) with this exception, you may extend this exception to
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * you do not wish to do so, delete this exception statement from your
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 * version. If you delete this exception statement from all source files
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 * in the program, then also delete it here.
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 *
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * This program is distributed in the hope that it will be useful, but
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
1625 c17b1142caab reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1624 diff changeset	34 #include "../../OrthancServer/PrecompiledHeadersServer.h"
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	35 #include "OrthancPlugins.h"
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2135 diff changeset	37 #if ORTHANC_ENABLE_PLUGINS != 1
1632 eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1630 diff changeset	38 #error The plugin support is disabled
eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1630 diff changeset	39 #endif
eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1630 diff changeset	40
3118 8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	41 #if !defined(DCMTK_VERSION_NUMBER)
8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	42 # error The macro DCMTK_VERSION_NUMBER must be defined
8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	43 #endif
8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	44
1632 eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1630 diff changeset	45
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	46 #include "../../Core/Compression/GzipCompressor.h"
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	47 #include "../../Core/Compression/ZlibCompressor.h"
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	48 #include "../../Core/DicomFormat/DicomArray.h"
3205 6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	49 #include "../../Core/DicomParsing/DicomWebJsonVisitor.h"
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	50 #include "../../Core/DicomParsing/FromDcmtkBridge.h"
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	51 #include "../../Core/DicomParsing/Internals/DicomImageDecoder.h"
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	52 #include "../../Core/DicomParsing/ToDcmtkBridge.h"
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	53 #include "../../Core/HttpServer/HttpToolbox.h"
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	54 #include "../../Core/Images/Image.h"
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	55 #include "../../Core/Images/ImageProcessing.h"
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	56 #include "../../Core/Images/JpegReader.h"
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	57 #include "../../Core/Images/JpegWriter.h"
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	58 #include "../../Core/Images/PngReader.h"
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	59 #include "../../Core/Images/PngWriter.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1466 diff changeset	60 #include "../../Core/Logging.h"
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	61 #include "../../Core/MetricsRegistry.h"
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	62 #include "../../Core/OrthancException.h"
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	63 #include "../../Core/SerializationToolbox.h"
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	64 #include "../../Core/Toolbox.h"
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	65 #include "../../OrthancServer/DefaultDicomImageDecoder.h"
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	66 #include "../../OrthancServer/OrthancConfiguration.h"
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	67 #include "../../OrthancServer/OrthancFindRequestHandler.h"
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	68 #include "../../OrthancServer/Search/HierarchicalMatcher.h"
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	69 #include "../../OrthancServer/ServerContext.h"
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	70 #include "../../OrthancServer/ServerToolbox.h"
1625 c17b1142caab reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1624 diff changeset	71 #include "PluginsEnumerations.h"
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	72 #include "PluginsJob.h"
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74 #include <boost/regex.hpp>
1861 a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	75 #include <dcmtk/dcmdata/dcdict.h>
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	76 #include <dcmtk/dcmdata/dcdicent.h>
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	78 #define ERROR_MESSAGE_64BIT "A 64bit version of the Orthanc API is necessary"
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	79
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80 namespace Orthanc
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81 {
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	82 static void CopyToMemoryBuffer(OrthancPluginMemoryBuffer& target,
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	83 const void* data,
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	84 size_t size)
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	85 {
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	86 if (static_cast<uint32_t>(size) != size)
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	87 {
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	88 throw OrthancException(ErrorCode_NotEnoughMemory, ERROR_MESSAGE_64BIT);
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	89 }
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	90
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	91 target.size = size;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	92
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	93 if (size == 0)
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	94 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	95 target.data = NULL;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	96 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	97 else
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	98 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	99 target.data = malloc(size);
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	100 if (target.data != NULL)
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	101 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	102 memcpy(target.data, data, size);
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	103 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	104 else
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	105 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	106 throw OrthancException(ErrorCode_NotEnoughMemory);
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	107 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	108 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	109 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	110
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	111
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	112 static void CopyToMemoryBuffer(OrthancPluginMemoryBuffer& target,
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	113 const std::string& str)
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	114 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	115 if (str.size() == 0)
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	116 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	117 target.size = 0;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	118 target.data = NULL;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	119 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	120 else
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	121 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	122 CopyToMemoryBuffer(target, str.c_str(), str.size());
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	123 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	124 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	125
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	126
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	127 static char* CopyString(const std::string& str)
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	128 {
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	129 if (static_cast<uint32_t>(str.size()) != str.size())
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	130 {
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	131 throw OrthancException(ErrorCode_NotEnoughMemory, ERROR_MESSAGE_64BIT);
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	132 }
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	133
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	134 char result = reinterpret_cast<char>(malloc(str.size() + 1));
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	135 if (result == NULL)
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	136 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	137 throw OrthancException(ErrorCode_NotEnoughMemory);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	138 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	139
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	140 if (str.size() == 0)
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	141 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	142 result[0] = '\0';
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	143 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	144 else
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	145 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	146 memcpy(result, &str[0], str.size() + 1);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	147 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	148
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	149 return result;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	150 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	151
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	152
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	153 namespace
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	154 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	155 class PluginStorageArea : public IStorageArea
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	156 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	157 private:
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	158 _OrthancPluginRegisterStorageArea callbacks_;
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	159 PluginsErrorDictionary& errorDictionary_;
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	160
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	161 void Free(void* buffer) const
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	162 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	163 if (buffer != NULL)
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	164 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	165 callbacks_.free(buffer);
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	166 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	167 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	168
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	169 public:
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	170 PluginStorageArea(const _OrthancPluginRegisterStorageArea& callbacks,
2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	171 PluginsErrorDictionary& errorDictionary) :
2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	172 callbacks_(callbacks),
2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	173 errorDictionary_(errorDictionary)
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	174 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	175 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	176
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	177
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	178 virtual void Create(const std::string& uuid,
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	179 const void* content,
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	180 size_t size,
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	181 FileContentType type)
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	182 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	183 OrthancPluginErrorCode error = callbacks_.create
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	184 (uuid.c_str(), content, size, Plugins::Convert(type));
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	185
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	186 if (error != OrthancPluginErrorCode_Success)
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	187 {
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	188 errorDictionary_.LogError(error, true);
1646 da799f767e5d simplification in error casting with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	189 throw OrthancException(static_cast<ErrorCode>(error));
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	190 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	191 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	192
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	193
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	194 virtual void Read(std::string& content,
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	195 const std::string& uuid,
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	196 FileContentType type)
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	197 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	198 void* buffer = NULL;
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	199 int64_t size = 0;
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	200
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	201 OrthancPluginErrorCode error = callbacks_.read
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	202 (&buffer, &size, uuid.c_str(), Plugins::Convert(type));
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	203
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	204 if (error != OrthancPluginErrorCode_Success)
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	205 {
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	206 errorDictionary_.LogError(error, true);
1646 da799f767e5d simplification in error casting with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	207 throw OrthancException(static_cast<ErrorCode>(error));
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	208 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	209
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	210 try
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	211 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	212 content.resize(static_cast<size_t>(size));
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	213 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	214 catch (...)
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	215 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	216 Free(buffer);
1643 87c77b9b3679 provision for error codes in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	217 throw OrthancException(ErrorCode_NotEnoughMemory);
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	218 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	219
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	220 if (size > 0)
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	221 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	222 memcpy(&content[0], buffer, static_cast<size_t>(size));
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	223 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	224
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	225 Free(buffer);
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	226 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	227
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	228
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	229 virtual void Remove(const std::string& uuid,
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	230 FileContentType type)
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	231 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	232 OrthancPluginErrorCode error = callbacks_.remove
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	233 (uuid.c_str(), Plugins::Convert(type));
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	234
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	235 if (error != OrthancPluginErrorCode_Success)
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	236 {
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	237 errorDictionary_.LogError(error, true);
1646 da799f767e5d simplification in error casting with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	238 throw OrthancException(static_cast<ErrorCode>(error));
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	239 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	240 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	241 };
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	242
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	243
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	244 class StorageAreaFactory : public boost::noncopyable
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	245 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	246 private:
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	247 SharedLibrary& sharedLibrary_;
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	248 _OrthancPluginRegisterStorageArea callbacks_;
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	249 PluginsErrorDictionary& errorDictionary_;
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	250
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	251 public:
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	252 StorageAreaFactory(SharedLibrary& sharedLibrary,
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	253 const _OrthancPluginRegisterStorageArea& callbacks,
2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	254 PluginsErrorDictionary& errorDictionary) :
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	255 sharedLibrary_(sharedLibrary),
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	256 callbacks_(callbacks),
2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	257 errorDictionary_(errorDictionary)
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	258 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	259 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	260
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	261 SharedLibrary& GetSharedLibrary()
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	262 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	263 return sharedLibrary_;
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	264 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	265
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	266 IStorageArea* Create() const
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	267 {
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	268 return new PluginStorageArea(callbacks_, errorDictionary_);
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	269 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	270 };
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	271
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	272
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	273 class OrthancPeers : public boost::noncopyable
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	274 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	275 private:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	276 std::vector<std::string> names_;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	277 std::vector<WebServiceParameters> parameters_;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	278
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	279 void CheckIndex(size_t i) const
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	280 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	281 assert(names_.size() == parameters_.size());
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	282 if (i >= names_.size())
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	283 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	284 throw OrthancException(ErrorCode_ParameterOutOfRange);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	285 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	286 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	287
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	288 public:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	289 OrthancPeers()
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	290 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	291 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	292
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	293 std::set<std::string> peers;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	294 lock.GetConfiguration().GetListOfOrthancPeers(peers);
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	295
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	296 names_.reserve(peers.size());
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	297 parameters_.reserve(peers.size());
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	298
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	299 for (std::set<std::string>::const_iterator
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	300 it = peers.begin(); it != peers.end(); ++it)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	301 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	302 WebServiceParameters peer;
2944 f395460af74d simplifying OrthancConfiguration for modalities/peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	303 if (lock.GetConfiguration().LookupOrthancPeer(peer, *it))
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	304 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	305 names_.push_back(*it);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	306 parameters_.push_back(peer);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	307 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	308 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	309 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	310
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	311 size_t GetPeersCount() const
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	312 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	313 return names_.size();
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	314 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	315
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	316 const std::string& GetPeerName(size_t i) const
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	317 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	318 CheckIndex(i);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	319 return names_[i];
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	320 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	321
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	322 const WebServiceParameters& GetPeerParameters(size_t i) const
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	323 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	324 CheckIndex(i);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	325 return parameters_[i];
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	326 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	327 };
3205 6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	328
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	329
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	330 class DicomWebBinaryFormatter : public DicomWebJsonVisitor::IBinaryFormatter
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	331 {
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	332 private:
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	333 OrthancPluginDicomWebBinaryCallback callback_;
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	334 DicomWebJsonVisitor::BinaryMode currentMode_;
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	335 std::string currentBulkDataUri_;
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	336
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	337 static void Setter(OrthancPluginDicomWebNode* node,
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	338 OrthancPluginDicomWebBinaryMode mode,
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	339 const char* bulkDataUri)
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	340 {
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	341 DicomWebBinaryFormatter& that = reinterpret_cast<DicomWebBinaryFormatter>(node);
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	342
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	343 switch (mode)
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	344 {
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	345 case OrthancPluginDicomWebBinaryMode_Ignore:
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	346 that.currentMode_ = DicomWebJsonVisitor::BinaryMode_Ignore;
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	347 break;
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	348
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	349 case OrthancPluginDicomWebBinaryMode_InlineBinary:
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	350 that.currentMode_ = DicomWebJsonVisitor::BinaryMode_InlineBinary;
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	351 break;
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	352
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	353 case OrthancPluginDicomWebBinaryMode_BulkDataUri:
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	354 if (bulkDataUri == NULL)
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	355 {
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	356 throw OrthancException(ErrorCode_NullPointer);
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	357 }
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	358
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	359 that.currentBulkDataUri_ = bulkDataUri;
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	360 that.currentMode_ = DicomWebJsonVisitor::BinaryMode_BulkDataUri;
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	361 break;
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	362
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	363 default:
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	364 throw OrthancException(ErrorCode_ParameterOutOfRange);
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	365 }
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	366 }
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	367
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	368 public:
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	369 DicomWebBinaryFormatter(const _OrthancPluginEncodeDicomWeb& parameters) :
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	370 callback_(parameters.callback)
3205 6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	371 {
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	372 }
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	373
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	374 virtual DicomWebJsonVisitor::BinaryMode Format(std::string& bulkDataUri,
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	375 const std::vector<DicomTag>& parentTags,
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	376 const std::vector<size_t>& parentIndexes,
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	377 const DicomTag& tag,
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	378 ValueRepresentation vr)
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	379 {
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	380 if (callback_ == NULL)
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	381 {
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	382 return DicomWebJsonVisitor::BinaryMode_InlineBinary;
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	383 }
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	384 else
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	385 {
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	386 assert(parentTags.size() == parentIndexes.size());
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	387 std::vector<uint16_t> groups(parentTags.size());
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	388 std::vector<uint16_t> elements(parentTags.size());
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	389 std::vector<uint32_t> indexes(parentTags.size());
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	390
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	391 for (size_t i = 0; i < parentTags.size(); i++)
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	392 {
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	393 groups[i] = parentTags[i].GetGroup();
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	394 elements[i] = parentTags[i].GetElement();
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	395 indexes[i] = static_cast<uint32_t>(parentIndexes[i]);
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	396 }
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	397 bool empty = parentTags.empty();
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	398
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	399 currentMode_ = DicomWebJsonVisitor::BinaryMode_Ignore;
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	400
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	401 callback_(reinterpret_cast<OrthancPluginDicomWebNode*>(this),
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	402 DicomWebBinaryFormatter::Setter,
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	403 static_cast<uint32_t>(parentTags.size()),
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	404 (empty ? NULL : &groups[0]),
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	405 (empty ? NULL : &elements[0]),
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	406 (empty ? NULL : &indexes[0]),
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	407 tag.GetGroup(),
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	408 tag.GetElement(),
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	409 Plugins::Convert(vr));
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	410
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	411 bulkDataUri = currentBulkDataUri_;
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	412 return currentMode_;
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	413 }
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	414 }
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	415 };
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	416 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	417
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	418
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	419 class OrthancPlugins::PImpl
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	420 {
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	421 private:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	422 boost::mutex contextMutex_;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	423 ServerContext* context_;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	424
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	425
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	426 public:
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	427 class PluginHttpOutput : public boost::noncopyable
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	428 {
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	429 private:
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	430 HttpOutput& output_;
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	431 std::auto_ptr<std::string> errorDetails_;
2960 74a5a7fd6e0e log flag to OrthancPluginSetHttpErrorDetails Sebastien Jodogne <s.jodogne@gmail.com> parents: 2957 diff changeset	432 bool logDetails_;
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	433
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	434 public:
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	435 PluginHttpOutput(HttpOutput& output) :
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	436 output_(output),
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	437 logDetails_(false)
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	438 {
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	439 }
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	440
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	441 HttpOutput& GetOutput()
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	442 {
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	443 return output_;
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	444 }
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	445
2960 74a5a7fd6e0e log flag to OrthancPluginSetHttpErrorDetails Sebastien Jodogne <s.jodogne@gmail.com> parents: 2957 diff changeset	446 void SetErrorDetails(const std::string& details,
74a5a7fd6e0e log flag to OrthancPluginSetHttpErrorDetails Sebastien Jodogne <s.jodogne@gmail.com> parents: 2957 diff changeset	447 bool logDetails)
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	448 {
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	449 errorDetails_.reset(new std::string(details));
2960 74a5a7fd6e0e log flag to OrthancPluginSetHttpErrorDetails Sebastien Jodogne <s.jodogne@gmail.com> parents: 2957 diff changeset	450 logDetails_ = logDetails;
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	451 }
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	452
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	453 bool HasErrorDetails() const
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	454 {
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	455 return errorDetails_.get() != NULL;
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	456 }
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	457
2960 74a5a7fd6e0e log flag to OrthancPluginSetHttpErrorDetails Sebastien Jodogne <s.jodogne@gmail.com> parents: 2957 diff changeset	458 bool IsLogDetails() const
74a5a7fd6e0e log flag to OrthancPluginSetHttpErrorDetails Sebastien Jodogne <s.jodogne@gmail.com> parents: 2957 diff changeset	459 {
74a5a7fd6e0e log flag to OrthancPluginSetHttpErrorDetails Sebastien Jodogne <s.jodogne@gmail.com> parents: 2957 diff changeset	460 return logDetails_;
74a5a7fd6e0e log flag to OrthancPluginSetHttpErrorDetails Sebastien Jodogne <s.jodogne@gmail.com> parents: 2957 diff changeset	461 }
74a5a7fd6e0e log flag to OrthancPluginSetHttpErrorDetails Sebastien Jodogne <s.jodogne@gmail.com> parents: 2957 diff changeset	462
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	463 const std::string& GetErrorDetails() const
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	464 {
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	465 if (errorDetails_.get() == NULL)
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	466 {
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	467 throw OrthancException(ErrorCode_BadSequenceOfCalls);
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	468 }
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	469 else
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	470 {
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	471 return *errorDetails_;
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	472 }
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	473 }
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	474
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	475 void Close(OrthancPluginErrorCode error,
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	476 PluginsErrorDictionary& dictionary)
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	477 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	478 if (error == OrthancPluginErrorCode_Success)
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	479 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	480 if (GetOutput().IsWritingMultipart())
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	481 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	482 GetOutput().CloseMultipart();
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	483 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	484 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	485 else
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	486 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	487 dictionary.LogError(error, false);
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	488
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	489 if (HasErrorDetails())
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	490 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	491 throw OrthancException(static_cast<ErrorCode>(error),
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	492 GetErrorDetails(),
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	493 IsLogDetails());
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	494 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	495 else
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	496 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	497 throw OrthancException(static_cast<ErrorCode>(error));
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	498 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	499 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	500 }
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	501 };
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	502
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	503
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	504 class RestCallback : public boost::noncopyable
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	505 {
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	506 private:
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	507 boost::regex regex_;
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	508 OrthancPluginRestCallback callback_;
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	509 bool lock_;
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	510
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	511 OrthancPluginErrorCode InvokeInternal(PluginHttpOutput& output,
1628 77c4cc4def0f OrthancPluginErrorCode in REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1627 diff changeset	512 const std::string& flatUri,
77c4cc4def0f OrthancPluginErrorCode in REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1627 diff changeset	513 const OrthancPluginHttpRequest& request)
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	514 {
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	515 return callback_(reinterpret_cast<OrthancPluginRestOutput*>(&output),
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	516 flatUri.c_str(),
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	517 &request);
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	518 }
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	519
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	520 public:
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	521 RestCallback(const char* regex,
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	522 OrthancPluginRestCallback callback,
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	523 bool lockRestCallbacks) :
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	524 regex_(regex),
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	525 callback_(callback),
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	526 lock_(lockRestCallbacks)
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	527 {
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	528 }
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	529
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	530 const boost::regex& GetRegularExpression() const
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	531 {
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	532 return regex_;
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	533 }
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	534
1628 77c4cc4def0f OrthancPluginErrorCode in REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1627 diff changeset	535 OrthancPluginErrorCode Invoke(boost::recursive_mutex& restCallbackMutex,
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	536 PluginHttpOutput& output,
1628 77c4cc4def0f OrthancPluginErrorCode in REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1627 diff changeset	537 const std::string& flatUri,
77c4cc4def0f OrthancPluginErrorCode in REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1627 diff changeset	538 const OrthancPluginHttpRequest& request)
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	539 {
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	540 if (lock_)
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	541 {
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	542 boost::recursive_mutex::scoped_lock lock(restCallbackMutex);
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	543 return InvokeInternal(output, flatUri, request);
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	544 }
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	545 else
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	546 {
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	547 return InvokeInternal(output, flatUri, request);
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	548 }
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	549 }
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	550 };
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	551
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	552
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	553 class ChunkedRestCallback : public boost::noncopyable
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	554 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	555 private:
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	556 _OrthancPluginChunkedRestCallback parameters_;
3415 2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	557 boost::regex regex_;
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	558
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	559 public:
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	560 ChunkedRestCallback(_OrthancPluginChunkedRestCallback parameters) :
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	561 parameters_(parameters),
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	562 regex_(parameters.pathRegularExpression)
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	563 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	564 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	565
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	566 const boost::regex& GetRegularExpression() const
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	567 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	568 return regex_;
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	569 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	570
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	571 const _OrthancPluginChunkedRestCallback& GetParameters() const
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	572 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	573 return parameters_;
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	574 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	575 };
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	576
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	577
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	578 class ServerContextLock
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	579 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	580 private:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	581 boost::mutex::scoped_lock lock_;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	582 ServerContext* context_;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	583
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	584 public:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	585 ServerContextLock(PImpl& that) :
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	586 lock_(that.contextMutex_),
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	587 context_(that.context_)
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	588 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	589 if (context_ == NULL)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	590 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	591 throw OrthancException(ErrorCode_DatabaseNotInitialized);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	592 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	593 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	594
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	595 ServerContext& GetContext()
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	596 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	597 assert(context_ != NULL);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	598 return *context_;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	599 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	600 };
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	601
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	602
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	603 void SetServerContext(ServerContext* context)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	604 {
2836 7133ad478eea fix Debian warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2827 diff changeset	605 boost::mutex::scoped_lock lock(contextMutex_);
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	606 context_ = context;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	607 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	608
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	609
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	610 typedef std::pair<std::string, _OrthancPluginProperty> Property;
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	611 typedef std::list<RestCallback*> RestCallbacks;
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	612 typedef std::list<ChunkedRestCallback*> ChunkedRestCallbacks;
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	613 typedef std::list<OrthancPluginOnStoredInstanceCallback> OnStoredCallbacks;
a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	614 typedef std::list<OrthancPluginOnChangeCallback> OnChangeCallbacks;
1961 ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	615 typedef std::list<OrthancPluginIncomingHttpRequestFilter> IncomingHttpRequestFilters;
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	616 typedef std::list<OrthancPluginIncomingHttpRequestFilter2> IncomingHttpRequestFilters2;
2012 50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	617 typedef std::list<OrthancPluginDecodeImageCallback> DecodeImageCallbacks;
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	618 typedef std::list<OrthancPluginJobsUnserializer> JobsUnserializers;
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	619 typedef std::list<OrthancPluginRefreshMetricsCallback> RefreshMetricsCallbacks;
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	620 typedef std::map<Property, std::string> Properties;
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	621
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	622 PluginsManager manager_;
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	623
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	624 RestCallbacks restCallbacks_;
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	625 ChunkedRestCallbacks chunkedRestCallbacks_;
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	626 OnStoredCallbacks onStoredCallbacks_;
a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	627 OnChangeCallbacks onChangeCallbacks_;
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	628 OrthancPluginFindCallback findCallback_;
1825 f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	629 OrthancPluginWorklistCallback worklistCallback_;
2012 50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	630 DecodeImageCallbacks decodeImageCallbacks_;
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	631 JobsUnserializers jobsUnserializers_;
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	632 _OrthancPluginMoveCallback moveCallbacks_;
1961 ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	633 IncomingHttpRequestFilters incomingHttpRequestFilters_;
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	634 IncomingHttpRequestFilters2 incomingHttpRequestFilters2_;
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	635 RefreshMetricsCallbacks refreshMetricsCallbacks_;
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	636 std::auto_ptr<StorageAreaFactory> storageArea_;
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	637
1466 0cd0f2ad3599 Fix potential deadlock in the callbacks of plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	638 boost::recursive_mutex restCallbackMutex_;
0cd0f2ad3599 Fix potential deadlock in the callbacks of plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	639 boost::recursive_mutex storedCallbackMutex_;
0cd0f2ad3599 Fix potential deadlock in the callbacks of plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	640 boost::recursive_mutex changeCallbackMutex_;
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	641 boost::mutex findCallbackMutex_;
1825 f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	642 boost::mutex worklistCallbackMutex_;
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	643 boost::mutex decodeImageCallbackMutex_;
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	644 boost::mutex jobsUnserializersMutex_;
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	645 boost::mutex refreshMetricsMutex_;
1553 7c4b487b3b4a ensure mutual exclusion in InvokeService Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	646 boost::recursive_mutex invokeServiceMutex_;
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	647
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	648 Properties properties_;
1280 d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	649 int argc_;
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	650 char** argv_;
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	651 std::auto_ptr<OrthancPluginDatabase> database_;
1644 939b921b2c81 plugin error dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1643 diff changeset	652 PluginsErrorDictionary dictionary_;
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	653
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	654 PImpl() :
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	655 context_(NULL),
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	656 findCallback_(NULL),
1825 f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	657 worklistCallback_(NULL),
1280 d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	658 argc_(1),
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	659 argv_(NULL)
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	660 {
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	661 memset(&moveCallbacks_, 0, sizeof(moveCallbacks_));
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	662 }
a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	663 };
a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	664
a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	665
a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	666
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	667 class OrthancPlugins::WorklistHandler : public IWorklistRequestHandler
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	668 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	669 private:
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	670 OrthancPlugins& that_;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	671 std::auto_ptr<HierarchicalMatcher> matcher_;
2827 d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	672 std::auto_ptr<ParsedDicomFile> filtered_;
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	673 ParsedDicomFile* currentQuery_;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	674
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	675 void Reset()
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	676 {
2827 d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	677 matcher_.reset();
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	678 filtered_.reset();
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	679 currentQuery_ = NULL;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	680 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	681
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	682 public:
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	683 WorklistHandler(OrthancPlugins& that) : that_(that)
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	684 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	685 Reset();
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	686 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	687
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	688 virtual void Handle(DicomFindAnswers& answers,
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	689 ParsedDicomFile& query,
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	690 const std::string& remoteIp,
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	691 const std::string& remoteAet,
2256 de1ba22fd28a simplification wrt. modality manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	692 const std::string& calledAet,
de1ba22fd28a simplification wrt. modality manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	693 ModalityManufacturer manufacturer)
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	694 {
2827 d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	695 static const char* LUA_CALLBACK = "IncomingWorklistRequestFilter";
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	696
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	697 {
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	698 PImpl::ServerContextLock lock(*that_.pimpl_);
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	699 LuaScripting::Lock lua(lock.GetContext().GetLuaScripting());
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	700
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	701 if (!lua.GetLua().IsExistingFunction(LUA_CALLBACK))
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	702 {
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	703 currentQuery_ = &query;
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	704 }
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	705 else
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	706 {
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	707 Json::Value source, origin;
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	708 query.DatasetToJson(source, DicomToJsonFormat_Short, DicomToJsonFlags_None, 0);
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	709
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	710 OrthancFindRequestHandler::FormatOrigin
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	711 (origin, remoteIp, remoteAet, calledAet, manufacturer);
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	712
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	713 LuaFunctionCall call(lua.GetLua(), LUA_CALLBACK);
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	714 call.PushJson(source);
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	715 call.PushJson(origin);
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	716
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	717 Json::Value target;
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	718 call.ExecuteToJson(target, true);
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	719
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	720 filtered_.reset(ParsedDicomFile::CreateFromJson(target, DicomFromJsonFlags_None));
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	721 currentQuery_ = filtered_.get();
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	722 }
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	723 }
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	724
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	725 matcher_.reset(new HierarchicalMatcher(*currentQuery_));
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2823 diff changeset	726
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	727 {
1825 f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	728 boost::mutex::scoped_lock lock(that_.pimpl_->worklistCallbackMutex_);
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	729
1825 f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	730 if (that_.pimpl_->worklistCallback_)
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	731 {
1825 f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	732 OrthancPluginErrorCode error = that_.pimpl_->worklistCallback_
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	733 (reinterpret_cast<OrthancPluginWorklistAnswers*>(&answers),
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	734 reinterpret_cast<const OrthancPluginWorklistQuery*>(this),
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	735 remoteAet.c_str(),
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	736 calledAet.c_str());
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	737
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	738 if (error != OrthancPluginErrorCode_Success)
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	739 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	740 Reset();
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	741 that_.GetErrorDictionary().LogError(error, true);
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	742 throw OrthancException(static_cast<ErrorCode>(error));
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	743 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	744 }
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	745
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	746 Reset();
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	747 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	748 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	749
1812 8e5600e699c0 rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1810 diff changeset	750 void GetDicomQuery(OrthancPluginMemoryBuffer& target) const
1802 138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	751 {
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	752 if (currentQuery_ == NULL)
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	753 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	754 throw OrthancException(ErrorCode_Plugin);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	755 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	756
1802 138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	757 std::string dicom;
138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	758 currentQuery_->SaveToMemoryBuffer(dicom);
138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	759 CopyToMemoryBuffer(target, dicom.c_str(), dicom.size());
138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	760 }
138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	761
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	762 bool IsMatch(const void* dicom,
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	763 size_t size) const
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	764 {
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	765 if (matcher_.get() == NULL)
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	766 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	767 throw OrthancException(ErrorCode_Plugin);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	768 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	769
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	770 ParsedDicomFile f(dicom, size);
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	771 return matcher_->Match(f);
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	772 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	773
1802 138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	774 void AddAnswer(OrthancPluginWorklistAnswers* answers,
138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	775 const void* dicom,
138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	776 size_t size) const
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	777 {
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	778 if (matcher_.get() == NULL)
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	779 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	780 throw OrthancException(ErrorCode_Plugin);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	781 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	782
1802 138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	783 ParsedDicomFile f(dicom, size);
138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	784 std::auto_ptr<ParsedDicomFile> summary(matcher_->Extract(f));
138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	785 reinterpret_cast<DicomFindAnswers>(answers)->Add(summary);
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	786 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	787 };
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	788
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	789
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	790 class OrthancPlugins::FindHandler : public IFindRequestHandler
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	791 {
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	792 private:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	793 OrthancPlugins& that_;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	794 std::auto_ptr<DicomArray> currentQuery_;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	795
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	796 void Reset()
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	797 {
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	798 currentQuery_.reset(NULL);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	799 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	800
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	801 public:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	802 FindHandler(OrthancPlugins& that) : that_(that)
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	803 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	804 Reset();
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	805 }
a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	806
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	807 virtual void Handle(DicomFindAnswers& answers,
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	808 const DicomMap& input,
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	809 const std::list<DicomTag>& sequencesToReturn,
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	810 const std::string& remoteIp,
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	811 const std::string& remoteAet,
2256 de1ba22fd28a simplification wrt. modality manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	812 const std::string& calledAet,
de1ba22fd28a simplification wrt. modality manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	813 ModalityManufacturer manufacturer)
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	814 {
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	815 DicomMap tmp;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	816 tmp.Assign(input);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	817
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	818 for (std::list<DicomTag>::const_iterator it = sequencesToReturn.begin();
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	819 it != sequencesToReturn.end(); ++it)
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	820 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	821 if (!input.HasTag(*it))
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	822 {
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	823 tmp.SetValue(*it, "", false);
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	824 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	825 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	826
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	827 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	828 boost::mutex::scoped_lock lock(that_.pimpl_->findCallbackMutex_);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	829 currentQuery_.reset(new DicomArray(tmp));
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	830
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	831 if (that_.pimpl_->findCallback_)
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	832 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	833 OrthancPluginErrorCode error = that_.pimpl_->findCallback_
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	834 (reinterpret_cast<OrthancPluginFindAnswers*>(&answers),
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	835 reinterpret_cast<const OrthancPluginFindQuery*>(this),
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	836 remoteAet.c_str(),
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	837 calledAet.c_str());
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	838
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	839 if (error != OrthancPluginErrorCode_Success)
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	840 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	841 Reset();
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	842 that_.GetErrorDictionary().LogError(error, true);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	843 throw OrthancException(static_cast<ErrorCode>(error));
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	844 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	845 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	846
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	847 Reset();
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	848 }
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	849 }
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	850
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	851 void Invoke(_OrthancPluginService service,
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	852 const _OrthancPluginFindOperation& operation) const
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	853 {
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	854 if (currentQuery_.get() == NULL)
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	855 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	856 throw OrthancException(ErrorCode_Plugin);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	857 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	858
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	859 switch (service)
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	860 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	861 case _OrthancPluginService_GetFindQuerySize:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	862 *operation.resultUint32 = currentQuery_->GetSize();
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	863 break;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	864
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	865 case _OrthancPluginService_GetFindQueryTag:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	866 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	867 const DicomTag& tag = currentQuery_->GetElement(operation.index).GetTag();
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	868 *operation.resultGroup = tag.GetGroup();
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	869 *operation.resultElement = tag.GetElement();
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	870 break;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	871 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	872
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	873 case _OrthancPluginService_GetFindQueryTagName:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	874 {
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	875 const DicomElement& element = currentQuery_->GetElement(operation.index);
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	876 *operation.resultString = CopyString(FromDcmtkBridge::GetTagName(element));
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	877 break;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	878 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	879
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	880 case _OrthancPluginService_GetFindQueryValue:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	881 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	882 *operation.resultString = CopyString(currentQuery_->GetElement(operation.index).GetValue().GetContent());
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	883 break;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	884 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	885
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	886 default:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	887 throw OrthancException(ErrorCode_InternalError);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	888 }
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	889 }
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	890 };
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	891
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	892
a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	893
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	894 class OrthancPlugins::MoveHandler : public IMoveRequestHandler
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	895 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	896 private:
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	897 class Driver : public IMoveRequestIterator
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	898 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	899 private:
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	900 void* driver_;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	901 unsigned int count_;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	902 unsigned int pos_;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	903 OrthancPluginApplyMove apply_;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	904 OrthancPluginFreeMove free_;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	905
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	906 public:
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	907 Driver(void* driver,
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	908 unsigned int count,
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	909 OrthancPluginApplyMove apply,
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	910 OrthancPluginFreeMove free) :
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	911 driver_(driver),
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	912 count_(count),
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	913 pos_(0),
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	914 apply_(apply),
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	915 free_(free)
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	916 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	917 if (driver_ == NULL)
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	918 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	919 throw OrthancException(ErrorCode_Plugin);
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	920 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	921 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	922
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	923 virtual ~Driver()
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	924 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	925 if (driver_ != NULL)
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	926 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	927 free_(driver_);
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	928 driver_ = NULL;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	929 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	930 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	931
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	932 virtual unsigned int GetSubOperationCount() const
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	933 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	934 return count_;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	935 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	936
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	937 virtual Status DoNext()
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	938 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	939 if (pos_ >= count_)
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	940 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	941 throw OrthancException(ErrorCode_BadSequenceOfCalls);
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	942 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	943 else
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	944 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	945 OrthancPluginErrorCode error = apply_(driver_);
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	946 if (error != OrthancPluginErrorCode_Success)
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	947 {
2956 bfee0b9f3209 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	948 LOG(ERROR) << "Error while doing C-Move from plugin: "
bfee0b9f3209 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	949 << EnumerationToString(static_cast<ErrorCode>(error));
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	950 return Status_Failure;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	951 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	952 else
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	953 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	954 pos_++;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	955 return Status_Success;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	956 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	957 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	958 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	959 };
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	960
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	961
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	962 _OrthancPluginMoveCallback params_;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	963
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	964
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	965 static std::string ReadTag(const DicomMap& input,
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	966 const DicomTag& tag)
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	967 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	968 const DicomValue* value = input.TestAndGetValue(tag);
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	969 if (value != NULL &&
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	970 !value->IsBinary() &&
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	971 !value->IsNull())
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	972 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	973 return value->GetContent();
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	974 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	975 else
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	976 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	977 return std::string();
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	978 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	979 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	980
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	981
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	982
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	983 public:
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	984 MoveHandler(OrthancPlugins& that)
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	985 {
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	986 boost::recursive_mutex::scoped_lock lock(that.pimpl_->invokeServiceMutex_);
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	987 params_ = that.pimpl_->moveCallbacks_;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	988
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	989 if (params_.callback == NULL \|\|
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	990 params_.getMoveSize == NULL \|\|
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	991 params_.applyMove == NULL \|\|
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	992 params_.freeMove == NULL)
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	993 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	994 throw OrthancException(ErrorCode_Plugin);
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	995 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	996 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	997
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	998 virtual IMoveRequestIterator* Handle(const std::string& targetAet,
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	999 const DicomMap& input,
2222 21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 2215 diff changeset	1000 const std::string& originatorIp,
21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 2215 diff changeset	1001 const std::string& originatorAet,
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1002 const std::string& calledAet,
2222 21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 2215 diff changeset	1003 uint16_t originatorId)
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1004 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1005 std::string levelString = ReadTag(input, DICOM_TAG_QUERY_RETRIEVE_LEVEL);
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1006 std::string patientId = ReadTag(input, DICOM_TAG_PATIENT_ID);
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1007 std::string accessionNumber = ReadTag(input, DICOM_TAG_ACCESSION_NUMBER);
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1008 std::string studyInstanceUid = ReadTag(input, DICOM_TAG_STUDY_INSTANCE_UID);
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1009 std::string seriesInstanceUid = ReadTag(input, DICOM_TAG_SERIES_INSTANCE_UID);
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1010 std::string sopInstanceUid = ReadTag(input, DICOM_TAG_SOP_INSTANCE_UID);
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1011
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1012 OrthancPluginResourceType level = OrthancPluginResourceType_None;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1013
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1014 if (!levelString.empty())
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1015 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1016 level = Plugins::Convert(StringToResourceType(levelString.c_str()));
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1017 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1018
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1019 void* driver = params_.callback(level,
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1020 patientId.empty() ? NULL : patientId.c_str(),
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1021 accessionNumber.empty() ? NULL : accessionNumber.c_str(),
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1022 studyInstanceUid.empty() ? NULL : studyInstanceUid.c_str(),
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1023 seriesInstanceUid.empty() ? NULL : seriesInstanceUid.c_str(),
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1024 sopInstanceUid.empty() ? NULL : sopInstanceUid.c_str(),
2222 21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 2215 diff changeset	1025 originatorAet.c_str(),
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1026 calledAet.c_str(),
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1027 targetAet.c_str(),
2222 21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 2215 diff changeset	1028 originatorId);
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1029
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1030 if (driver == NULL)
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1031 {
2956 bfee0b9f3209 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	1032 throw OrthancException(ErrorCode_Plugin,
bfee0b9f3209 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	1033 "Plugin cannot create a driver for an incoming C-MOVE request");
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1034 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1035
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1036 unsigned int size = params_.getMoveSize(driver);
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1037
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1038 return new Driver(driver, size, params_.applyMove, params_.freeMove);
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1039 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1040 };
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1041
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1042
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1043
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1044 class OrthancPlugins::HttpClientChunkedRequest : public HttpClient::IRequestBody
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1045 {
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1046 private:
3413 f09bfdea3fc3 rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 3407 diff changeset	1047 const _OrthancPluginChunkedHttpClient& params_;
f09bfdea3fc3 rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 3407 diff changeset	1048 PluginsErrorDictionary& errorDictionary_;
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1049
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1050 public:
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1051 HttpClientChunkedRequest(const _OrthancPluginChunkedHttpClient& params,
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1052 PluginsErrorDictionary& errorDictionary) :
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1053 params_(params),
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1054 errorDictionary_(errorDictionary)
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1055 {
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1056 }
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1057
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1058 virtual bool ReadNextChunk(std::string& chunk)
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1059 {
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1060 if (params_.requestIsDone(params_.request))
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1061 {
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1062 return false;
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1063 }
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1064 else
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1065 {
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1066 size_t size = params_.requestChunkSize(params_.request);
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1067
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1068 chunk.resize(size);
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1069
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1070 if (size != 0)
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1071 {
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1072 const void* data = params_.requestChunkData(params_.request);
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1073 memcpy(&chunk[0], data, size);
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1074 }
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1075
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1076 OrthancPluginErrorCode error = params_.requestNext(params_.request);
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1077
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1078 if (error != OrthancPluginErrorCode_Success)
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1079 {
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1080 errorDictionary_.LogError(error, true);
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1081 throw OrthancException(static_cast<ErrorCode>(error));
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1082 }
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1083 else
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1084 {
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1085 return true;
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1086 }
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1087 }
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1088 }
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	1089 };
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1090
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1091
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1092 class OrthancPlugins::HttpClientChunkedAnswer : public HttpClient::IAnswer
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1093 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1094 private:
3413 f09bfdea3fc3 rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 3407 diff changeset	1095 const _OrthancPluginChunkedHttpClient& params_;
f09bfdea3fc3 rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 3407 diff changeset	1096 PluginsErrorDictionary& errorDictionary_;
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1097
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1098 public:
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1099 HttpClientChunkedAnswer(const _OrthancPluginChunkedHttpClient& params,
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1100 PluginsErrorDictionary& errorDictionary) :
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1101 params_(params),
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1102 errorDictionary_(errorDictionary)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1103 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1104 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1105
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1106 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	1107 const std::string& value)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1108 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1109 OrthancPluginErrorCode error = params_.answerAddHeader(params_.answer, key.c_str(), value.c_str());
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1110
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1111 if (error != OrthancPluginErrorCode_Success)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1112 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1113 errorDictionary_.LogError(error, true);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1114 throw OrthancException(static_cast<ErrorCode>(error));
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1115 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1116 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1117
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1118 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	1119 size_t size)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1120 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1121 OrthancPluginErrorCode error = params_.answerAddChunk(params_.answer, data, size);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1122
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1123 if (error != OrthancPluginErrorCode_Success)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1124 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1125 errorDictionary_.LogError(error, true);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1126 throw OrthancException(static_cast<ErrorCode>(error));
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1127 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1128 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1129 };
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1130
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	1131
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	1132 OrthancPlugins::OrthancPlugins()
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1133 {
1821 580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	1134 /* Sanity check of the compiler */
1579 b93c398f934d check the size of the enumerations in the plugin engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 1578 diff changeset	1135 if (sizeof(int32_t) != sizeof(OrthancPluginErrorCode) \|\|
b93c398f934d check the size of the enumerations in the plugin engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 1578 diff changeset	1136 sizeof(int32_t) != sizeof(OrthancPluginHttpMethod) \|\|
b93c398f934d check the size of the enumerations in the plugin engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 1578 diff changeset	1137 sizeof(int32_t) != sizeof(_OrthancPluginService) \|\|
b93c398f934d check the size of the enumerations in the plugin engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 1578 diff changeset	1138 sizeof(int32_t) != sizeof(_OrthancPluginProperty) \|\|
b93c398f934d check the size of the enumerations in the plugin engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 1578 diff changeset	1139 sizeof(int32_t) != sizeof(OrthancPluginPixelFormat) \|\|
b93c398f934d check the size of the enumerations in the plugin engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 1578 diff changeset	1140 sizeof(int32_t) != sizeof(OrthancPluginContentType) \|\|
b93c398f934d check the size of the enumerations in the plugin engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 1578 diff changeset	1141 sizeof(int32_t) != sizeof(OrthancPluginResourceType) \|\|
b93c398f934d check the size of the enumerations in the plugin engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 1578 diff changeset	1142 sizeof(int32_t) != sizeof(OrthancPluginChangeType) \|\|
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1143 sizeof(int32_t) != sizeof(OrthancPluginImageFormat) \|\|
1579 b93c398f934d check the size of the enumerations in the plugin engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 1578 diff changeset	1144 sizeof(int32_t) != sizeof(OrthancPluginCompressionType) \|\|
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1145 sizeof(int32_t) != sizeof(OrthancPluginValueRepresentation) \|\|
1740 5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	1146 sizeof(int32_t) != sizeof(OrthancPluginDicomToJsonFlags) \|\|
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	1147 sizeof(int32_t) != sizeof(OrthancPluginDicomToJsonFormat) \|\|
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	1148 sizeof(int32_t) != sizeof(OrthancPluginCreateDicomFlags) \|\|
1740 5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	1149 sizeof(int32_t) != sizeof(_OrthancPluginDatabaseAnswerType) \|\|
1760 51db4a25a741 LookupIdentifier is plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1744 diff changeset	1150 sizeof(int32_t) != sizeof(OrthancPluginIdentifierConstraint) \|\|
1815 2abfdca9b915 OrthancPluginGetInstanceOrigin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1810 diff changeset	1151 sizeof(int32_t) != sizeof(OrthancPluginInstanceOrigin) \|\|
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1152 sizeof(int32_t) != sizeof(OrthancPluginJobStepStatus) \|\|
3209 f6374c36a671 documentation of DICOMweb in SDK, compatibility with DCMTK 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3205 diff changeset	1153 sizeof(int32_t) != sizeof(OrthancPluginConstraintType) \|\|
f6374c36a671 documentation of DICOMweb in SDK, compatibility with DCMTK 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3205 diff changeset	1154 sizeof(int32_t) != sizeof(OrthancPluginMetricsType) \|\|
f6374c36a671 documentation of DICOMweb in SDK, compatibility with DCMTK 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3205 diff changeset	1155 sizeof(int32_t) != sizeof(OrthancPluginDicomWebBinaryMode) \|\|
1740 5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	1156 static_cast<int>(OrthancPluginDicomToJsonFlags_IncludeBinary) != static_cast<int>(DicomToJsonFlags_IncludeBinary) \|\|
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	1157 static_cast<int>(OrthancPluginDicomToJsonFlags_IncludePrivateTags) != static_cast<int>(DicomToJsonFlags_IncludePrivateTags) \|\|
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	1158 static_cast<int>(OrthancPluginDicomToJsonFlags_IncludeUnknownTags) != static_cast<int>(DicomToJsonFlags_IncludeUnknownTags) \|\|
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	1159 static_cast<int>(OrthancPluginDicomToJsonFlags_IncludePixelData) != static_cast<int>(DicomToJsonFlags_IncludePixelData) \|\|
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	1160 static_cast<int>(OrthancPluginDicomToJsonFlags_ConvertBinaryToNull) != static_cast<int>(DicomToJsonFlags_ConvertBinaryToNull) \|\|
1821 580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	1161 static_cast<int>(OrthancPluginDicomToJsonFlags_ConvertBinaryToAscii) != static_cast<int>(DicomToJsonFlags_ConvertBinaryToAscii) \|\|
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	1162 static_cast<int>(OrthancPluginCreateDicomFlags_DecodeDataUriScheme) != static_cast<int>(DicomFromJsonFlags_DecodeDataUriScheme) \|\|
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	1163 static_cast<int>(OrthancPluginCreateDicomFlags_GenerateIdentifiers) != static_cast<int>(DicomFromJsonFlags_GenerateIdentifiers))
1821 580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	1164
1578 09715095fc53 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	1165 {
09715095fc53 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	1166 throw OrthancException(ErrorCode_Plugin);
09715095fc53 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	1167 }
09715095fc53 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	1168
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	1169 pimpl_.reset(new PImpl());
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	1170 pimpl_->manager_.RegisterServiceProvider(*this);
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1171 }
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1172
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1173
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	1174 void OrthancPlugins::SetServerContext(ServerContext& context)
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	1175 {
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1176 pimpl_->SetServerContext(&context);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	1177 }
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	1178
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	1179
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1180 void OrthancPlugins::ResetServerContext()
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1181 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1182 pimpl_->SetServerContext(NULL);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1183 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1184
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	1185
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1186 OrthancPlugins::~OrthancPlugins()
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1187 {
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1188 for (PImpl::RestCallbacks::iterator it = pimpl_->restCallbacks_.begin();
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1189 it != pimpl_->restCallbacks_.end(); ++it)
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1190 {
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	1191 delete *it;
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1192 }
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1193
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1194 for (PImpl::ChunkedRestCallbacks::iterator it = pimpl_->chunkedRestCallbacks_.begin();
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1195 it != pimpl_->chunkedRestCallbacks_.end(); ++it)
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1196 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1197 delete *it;
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1198 }
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1199 }
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1200
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1201
1041 2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	1202 static void ArgumentsToPlugin(std::vector<const char*>& keys,
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	1203 std::vector<const char*>& values,
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	1204 const IHttpHandler::Arguments& arguments)
1041 2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	1205 {
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	1206 keys.resize(arguments.size());
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	1207 values.resize(arguments.size());
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	1208
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	1209 size_t pos = 0;
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	1210 for (IHttpHandler::Arguments::const_iterator
1041 2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	1211 it = arguments.begin(); it != arguments.end(); ++it)
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	1212 {
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	1213 keys[pos] = it->first.c_str();
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	1214 values[pos] = it->second.c_str();
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	1215 pos++;
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	1216 }
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	1217 }
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	1218
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	1219
1363 feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	1220 static void ArgumentsToPlugin(std::vector<const char*>& keys,
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	1221 std::vector<const char*>& values,
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	1222 const IHttpHandler::GetArguments& arguments)
1363 feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	1223 {
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	1224 keys.resize(arguments.size());
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	1225 values.resize(arguments.size());
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	1226
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	1227 for (size_t i = 0; i < arguments.size(); i++)
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	1228 {
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	1229 keys[i] = arguments[i].first.c_str();
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	1230 values[i] = arguments[i].second.c_str();
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	1231 }
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	1232 }
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	1233
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	1234
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1235 namespace
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1236 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1237 class RestCallbackMatcher : public boost::noncopyable
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1238 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1239 private:
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1240 std::string flatUri_;
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1241 std::vector<std::string> groups_;
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1242 std::vector<const char*> cgroups_;
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1243
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1244 public:
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1245 RestCallbackMatcher(const UriComponents& uri) :
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1246 flatUri_(Toolbox::FlattenUri(uri))
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1247 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1248 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1249
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1250 bool IsMatch(const boost::regex& re)
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1251 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1252 // Check whether the regular expression associated to this
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1253 // callback matches the URI
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1254 boost::cmatch what;
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1255
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1256 if (boost::regex_match(flatUri_.c_str(), what, re))
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1257 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1258 // Extract the value of the free parameters of the regular expression
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1259 if (what.size() > 1)
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1260 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1261 groups_.resize(what.size() - 1);
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1262 cgroups_.resize(what.size() - 1);
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1263 for (size_t i = 1; i < what.size(); i++)
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1264 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1265 groups_[i - 1] = what[i];
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1266 cgroups_[i - 1] = groups_[i - 1].c_str();
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1267 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1268 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1269
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1270 return true;
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1271 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1272 else
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1273 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1274 // Not a match
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1275 return false;
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1276 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1277 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1278
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1279 uint32_t GetGroupsCount() const
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1280 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1281 return cgroups_.size();
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1282 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1283
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1284 const char* const* GetGroups() const
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1285 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1286 return cgroups_.empty() ? NULL : &cgroups_[0];
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1287 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1288
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1289 const std::string& GetFlatUri() const
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1290 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1291 return flatUri_;
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1292 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1293 };
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1294
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1295
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1296 // WARNING - The lifetime of this internal object must be smaller
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1297 // than "matcher", "headers" and "getArguments" objects
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1298 class HttpRequestConverter
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1299 {
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1300 private:
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1301 std::vector<const char*> getKeys_;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1302 std::vector<const char*> getValues_;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1303 std::vector<const char*> headersKeys_;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1304 std::vector<const char*> headersValues_;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1305 OrthancPluginHttpRequest converted_;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1306
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1307 public:
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1308 HttpRequestConverter(const RestCallbackMatcher& matcher,
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1309 HttpMethod method,
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1310 const IHttpHandler::Arguments& headers)
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1311 {
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1312 memset(&converted_, 0, sizeof(OrthancPluginHttpRequest));
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1313
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1314 ArgumentsToPlugin(headersKeys_, headersValues_, headers);
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1315 assert(headersKeys_.size() == headersValues_.size());
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1316
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1317 switch (method)
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1318 {
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1319 case HttpMethod_Get:
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1320 converted_.method = OrthancPluginHttpMethod_Get;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1321 break;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1322
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1323 case HttpMethod_Post:
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1324 converted_.method = OrthancPluginHttpMethod_Post;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1325 break;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1326
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1327 case HttpMethod_Delete:
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1328 converted_.method = OrthancPluginHttpMethod_Delete;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1329 break;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1330
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1331 case HttpMethod_Put:
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1332 converted_.method = OrthancPluginHttpMethod_Put;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1333 break;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1334
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1335 default:
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1336 throw OrthancException(ErrorCode_InternalError);
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1337 }
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1338
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1339 converted_.groups = matcher.GetGroups();
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1340 converted_.groupsCount = matcher.GetGroupsCount();
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1341 converted_.getCount = 0;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1342 converted_.getKeys = NULL;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1343 converted_.getValues = NULL;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1344 converted_.body = NULL;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1345 converted_.bodySize = 0;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1346 converted_.headersCount = headers.size();
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1347
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1348 if (headers.size() > 0)
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1349 {
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1350 converted_.headersKeys = &headersKeys_[0];
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1351 converted_.headersValues = &headersValues_[0];
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1352 }
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1353 }
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1354
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1355 void SetGetArguments(const IHttpHandler::GetArguments& getArguments)
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1356 {
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1357 ArgumentsToPlugin(getKeys_, getValues_, getArguments);
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1358 assert(getKeys_.size() == getValues_.size());
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1359
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1360 converted_.getCount = getArguments.size();
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1361
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1362 if (getArguments.size() > 0)
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1363 {
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1364 converted_.getKeys = &getKeys_[0];
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1365 converted_.getValues = &getValues_[0];
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1366 }
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1367 }
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1368
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1369 OrthancPluginHttpRequest& GetRequest()
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1370 {
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1371 return converted_;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1372 }
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1373 };
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1374 }
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1375
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1376
3415 2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1377 static std::string GetAllowedMethods(_OrthancPluginChunkedRestCallback parameters)
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1378 {
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1379 std::string s;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1380
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1381 if (parameters.getHandler != NULL)
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1382 {
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1383 s += "GET";
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1384 }
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1385
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1386 if (parameters.postHandler != NULL)
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1387 {
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1388 if (!s.empty())
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1389 {
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1390 s+= ",";
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1391 }
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1392
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1393 s += "POST";
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1394 }
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1395
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1396 if (parameters.deleteHandler != NULL)
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1397 {
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1398 if (!s.empty())
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1399 {
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1400 s+= ",";
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1401 }
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1402
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1403 s += "DELETE";
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1404 }
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1405
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1406 if (parameters.putHandler != NULL)
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1407 {
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1408 if (!s.empty())
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1409 {
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1410 s+= ",";
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1411 }
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1412
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1413 s += "PUT";
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1414 }
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1415
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1416 return s;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1417 }
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1418
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1419
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1420 bool OrthancPlugins::HandleChunkedGetDelete(HttpOutput& output,
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1421 HttpMethod method,
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1422 const UriComponents& uri,
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1423 const Arguments& headers,
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1424 const GetArguments& getArguments)
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1425 {
3415 2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1426 RestCallbackMatcher matcher(uri);
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1427
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1428 PImpl::ChunkedRestCallback* callback = NULL;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1429
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1430 // Loop over the callbacks registered by the plugins
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1431 for (PImpl::ChunkedRestCallbacks::const_iterator it = pimpl_->chunkedRestCallbacks_.begin();
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1432 it != pimpl_->chunkedRestCallbacks_.end(); ++it)
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1433 {
3415 2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1434 if (matcher.IsMatch((*it)->GetRegularExpression()))
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1435 {
3415 2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1436 callback = *it;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1437 break;
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1438 }
3415 2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1439 }
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1440
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1441 if (callback == NULL)
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1442 {
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1443 return false;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1444 }
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1445 else
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1446 {
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1447 LOG(INFO) << "Delegating HTTP request to plugin for URI: " << matcher.GetFlatUri();
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1448
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1449 OrthancPluginRestCallback handler;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1450
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1451 switch (method)
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1452 {
3415 2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1453 case HttpMethod_Get:
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1454 handler = callback->GetParameters().getHandler;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1455 break;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1456
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1457 case HttpMethod_Delete:
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1458 handler = callback->GetParameters().deleteHandler;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1459 break;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1460
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1461 default:
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1462 handler = NULL;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1463 break;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1464 }
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1465
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1466 if (handler == NULL)
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1467 {
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1468 output.SendMethodNotAllowed(GetAllowedMethods(callback->GetParameters()));
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1469 }
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1470 else
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1471 {
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1472 HttpRequestConverter converter(matcher, method, headers);
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1473 converter.SetGetArguments(getArguments);
3415 2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1474
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1475 PImpl::PluginHttpOutput pluginOutput(output);
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1476
3415 2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1477 OrthancPluginErrorCode error = handler(
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1478 reinterpret_cast<OrthancPluginRestOutput*>(&pluginOutput),
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1479 matcher.GetFlatUri().c_str(), &converter.GetRequest());
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1480
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1481 pluginOutput.Close(error, GetErrorDictionary());
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1482 }
3415 2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1483
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	1484 return true;
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1485 }
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1486 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1487
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1488
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1489 bool OrthancPlugins::Handle(HttpOutput& output,
1571 3232f1c995a5 provide the origin of the requests to HTTP handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1554 diff changeset	1490 RequestOrigin /origin/,
3232f1c995a5 provide the origin of the requests to HTTP handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1554 diff changeset	1491 const char* /remoteIp/,
3232f1c995a5 provide the origin of the requests to HTTP handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1554 diff changeset	1492 const char* /username/,
1329 272cb2019a4c fix recovery tool Sebastien Jodogne <s.jodogne@gmail.com> parents: 1328 diff changeset	1493 HttpMethod method,
272cb2019a4c fix recovery tool Sebastien Jodogne <s.jodogne@gmail.com> parents: 1328 diff changeset	1494 const UriComponents& uri,
272cb2019a4c fix recovery tool Sebastien Jodogne <s.jodogne@gmail.com> parents: 1328 diff changeset	1495 const Arguments& headers,
1363 feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	1496 const GetArguments& getArguments,
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3399 diff changeset	1497 const void* bodyData,
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	1498 size_t bodySize)
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1499 {
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1500 RestCallbackMatcher matcher(uri);
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1501
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	1502 PImpl::RestCallback* callback = NULL;
901 7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	1503
1041 2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	1504 // Loop over the callbacks registered by the plugins
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1505 for (PImpl::RestCallbacks::const_iterator it = pimpl_->restCallbacks_.begin();
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1506 it != pimpl_->restCallbacks_.end(); ++it)
901 7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	1507 {
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1508 if (matcher.IsMatch((*it)->GetRegularExpression()))
901 7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	1509 {
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	1510 callback = *it;
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1511 break;
901 7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	1512 }
7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	1513 }
7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	1514
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	1515 if (callback == NULL)
901 7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	1516 {
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1517 // Callback not found, try to find a chunked callback
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1518 return HandleChunkedGetDelete(output, method, uri, headers, getArguments);
901 7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	1519 }
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1520
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1521 LOG(INFO) << "Delegating HTTP request to plugin for URI: " << matcher.GetFlatUri();
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1522
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1523 HttpRequestConverter converter(matcher, method, headers);
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1524 converter.SetGetArguments(getArguments);
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1525 converter.GetRequest().body = bodyData;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1526 converter.GetRequest().bodySize = bodySize;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1527
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1528 PImpl::PluginHttpOutput pluginOutput(output);
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	1529
901 7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	1530 assert(callback != NULL);
2960 74a5a7fd6e0e log flag to OrthancPluginSetHttpErrorDetails Sebastien Jodogne <s.jodogne@gmail.com> parents: 2957 diff changeset	1531 OrthancPluginErrorCode error = callback->Invoke
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1532 (pimpl_->restCallbackMutex_, pluginOutput, matcher.GetFlatUri(), converter.GetRequest());
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1533
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1534 pluginOutput.Close(error, GetErrorDictionary());
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1535 return true;
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1536 }
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	1537
bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	1538
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	1539 void OrthancPlugins::SignalStoredInstance(const std::string& instanceId,
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	1540 DicomInstanceToStore& instance,
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	1541 const Json::Value& simplifiedTags)
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1542 {
1466 0cd0f2ad3599 Fix potential deadlock in the callbacks of plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	1543 boost::recursive_mutex::scoped_lock lock(pimpl_->storedCallbackMutex_);
1185 cbd1f05b4ef2 plugin callbacks are executed in mutual exclusion Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	1544
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1545 for (PImpl::OnStoredCallbacks::const_iterator
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1546 callback = pimpl_->onStoredCallbacks_.begin();
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1547 callback != pimpl_->onStoredCallbacks_.end(); ++callback)
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1548 {
1627 da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1549 OrthancPluginErrorCode error = (*callback)
da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1550 (reinterpret_cast<OrthancPluginDicomInstance*>(&instance),
da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1551 instanceId.c_str());
da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1552
da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1553 if (error != OrthancPluginErrorCode_Success)
da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1554 {
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	1555 GetErrorDictionary().LogError(error, true);
1646 da799f767e5d simplification in error casting with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	1556 throw OrthancException(static_cast<ErrorCode>(error));
1627 da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1557 }
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1558 }
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1559 }
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1560
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1561
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1562
1741 06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1563 void OrthancPlugins::SignalChangeInternal(OrthancPluginChangeType changeType,
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1564 OrthancPluginResourceType resourceType,
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1565 const char* resource)
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1566 {
1627 da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1567 boost::recursive_mutex::scoped_lock lock(pimpl_->changeCallbackMutex_);
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	1568
1627 da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1569 for (std::list<OrthancPluginOnChangeCallback>::const_iterator
da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1570 callback = pimpl_->onChangeCallbacks_.begin();
da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1571 callback != pimpl_->onChangeCallbacks_.end(); ++callback)
da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1572 {
1741 06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1573 OrthancPluginErrorCode error = (*callback) (changeType, resourceType, resource);
1627 da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1574
da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1575 if (error != OrthancPluginErrorCode_Success)
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	1576 {
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	1577 GetErrorDictionary().LogError(error, true);
1646 da799f767e5d simplification in error casting with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	1578 throw OrthancException(static_cast<ErrorCode>(error));
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	1579 }
1178 c71d25e6a63c improvement Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	1580 }
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1581 }
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1582
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1583
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1584
1741 06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1585 void OrthancPlugins::SignalChange(const ServerIndexChange& change)
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1586 {
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1587 SignalChangeInternal(Plugins::Convert(change.GetChangeType()),
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1588 Plugins::Convert(change.GetResourceType()),
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1589 change.GetPublicId().c_str());
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1590 }
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1591
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1592
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1593
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	1594 void OrthancPlugins::RegisterRestCallback(const void* parameters,
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	1595 bool lock)
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1596 {
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1597 const _OrthancPluginRestCallback& p =
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1598 reinterpret_cast<const _OrthancPluginRestCallback>(parameters);
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1599
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	1600 LOG(INFO) << "Plugin has registered a REST callback "
2820 3e048b243d20 typo Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1601 << (lock ? "with" : "without")
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	1602 << " mutual exclusion on: "
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	1603 << p.pathRegularExpression;
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	1604
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	1605 pimpl_->restCallbacks_.push_back(new PImpl::RestCallback(p.pathRegularExpression, p.callback, lock));
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1606 }
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1607
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1608
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1609 void OrthancPlugins::RegisterChunkedRestCallback(const void* parameters)
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1610 {
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1611 const _OrthancPluginChunkedRestCallback& p =
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1612 reinterpret_cast<const _OrthancPluginChunkedRestCallback>(parameters);
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1613
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1614 LOG(INFO) << "Plugin has registered a REST callback for chunked streams on: "
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1615 << p.pathRegularExpression;
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1616
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	1617 pimpl_->chunkedRestCallbacks_.push_back(new PImpl::ChunkedRestCallback(p));
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1618 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	1619
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1620
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1621 void OrthancPlugins::RegisterOnStoredInstanceCallback(const void* parameters)
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1622 {
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1623 const _OrthancPluginOnStoredInstanceCallback& p =
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1624 reinterpret_cast<const _OrthancPluginOnStoredInstanceCallback>(parameters);
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1625
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1626 LOG(INFO) << "Plugin has registered an OnStoredInstance callback";
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1627 pimpl_->onStoredCallbacks_.push_back(p.callback);
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1628 }
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1629
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1630
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1631 void OrthancPlugins::RegisterOnChangeCallback(const void* parameters)
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1632 {
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1633 const _OrthancPluginOnChangeCallback& p =
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1634 reinterpret_cast<const _OrthancPluginOnChangeCallback>(parameters);
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1635
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1636 LOG(INFO) << "Plugin has registered an OnChange callback";
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1637 pimpl_->onChangeCallbacks_.push_back(p.callback);
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1638 }
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1639
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1640
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	1641 void OrthancPlugins::RegisterWorklistCallback(const void* parameters)
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	1642 {
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	1643 const _OrthancPluginWorklistCallback& p =
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	1644 reinterpret_cast<const _OrthancPluginWorklistCallback>(parameters);
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	1645
1825 f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	1646 boost::mutex::scoped_lock lock(pimpl_->worklistCallbackMutex_);
f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	1647
f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	1648 if (pimpl_->worklistCallback_ != NULL)
f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	1649 {
2956 bfee0b9f3209 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	1650 throw OrthancException(ErrorCode_Plugin,
bfee0b9f3209 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	1651 "Can only register one plugin to handle modality worklists");
1825 f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	1652 }
f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	1653 else
f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	1654 {
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1655 LOG(INFO) << "Plugin has registered a callback to handle modality worklists";
1825 f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	1656 pimpl_->worklistCallback_ = p.callback;
f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	1657 }
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	1658 }
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	1659
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	1660
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1661 void OrthancPlugins::RegisterFindCallback(const void* parameters)
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1662 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1663 const _OrthancPluginFindCallback& p =
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1664 reinterpret_cast<const _OrthancPluginFindCallback>(parameters);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1665
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1666 boost::mutex::scoped_lock lock(pimpl_->findCallbackMutex_);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1667
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1668 if (pimpl_->findCallback_ != NULL)
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1669 {
2956 bfee0b9f3209 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	1670 throw OrthancException(ErrorCode_Plugin,
bfee0b9f3209 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	1671 "Can only register one plugin to handle C-FIND requests");
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1672 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1673 else
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1674 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1675 LOG(INFO) << "Plugin has registered a callback to handle C-FIND requests";
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1676 pimpl_->findCallback_ = p.callback;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1677 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1678 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1679
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1680
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1681 void OrthancPlugins::RegisterMoveCallback(const void* parameters)
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1682 {
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1683 // invokeServiceMutex_ is assumed to be locked
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1684
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1685 const _OrthancPluginMoveCallback& p =
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1686 reinterpret_cast<const _OrthancPluginMoveCallback>(parameters);
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1687
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1688 if (pimpl_->moveCallbacks_.callback != NULL)
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1689 {
2956 bfee0b9f3209 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	1690 throw OrthancException(ErrorCode_Plugin,
bfee0b9f3209 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	1691 "Can only register one plugin to handle C-MOVE requests");
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1692 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1693 else
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1694 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1695 LOG(INFO) << "Plugin has registered a callback to handle C-MOVE requests";
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1696 pimpl_->moveCallbacks_ = p;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1697 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1698 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1699
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1700
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1701 void OrthancPlugins::RegisterDecodeImageCallback(const void* parameters)
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1702 {
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1703 const _OrthancPluginDecodeImageCallback& p =
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1704 reinterpret_cast<const _OrthancPluginDecodeImageCallback>(parameters);
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1705
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1706 boost::mutex::scoped_lock lock(pimpl_->decodeImageCallbackMutex_);
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1707
2012 50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	1708 pimpl_->decodeImageCallbacks_.push_back(p.callback);
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	1709 LOG(INFO) << "Plugin has registered a callback to decode DICOM images ("
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	1710 << pimpl_->decodeImageCallbacks_.size() << " decoder(s) now active)";
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1711 }
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1712
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1713
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1714 void OrthancPlugins::RegisterJobsUnserializer(const void* parameters)
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1715 {
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1716 const _OrthancPluginJobsUnserializer& p =
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1717 reinterpret_cast<const _OrthancPluginJobsUnserializer>(parameters);
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1718
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1719 boost::mutex::scoped_lock lock(pimpl_->jobsUnserializersMutex_);
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1720
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1721 pimpl_->jobsUnserializers_.push_back(p.unserializer);
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1722 LOG(INFO) << "Plugin has registered a callback to unserialize jobs ("
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1723 << pimpl_->jobsUnserializers_.size() << " unserializer(s) now active)";
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1724 }
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1725
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1726
1961 ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	1727 void OrthancPlugins::RegisterIncomingHttpRequestFilter(const void* parameters)
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	1728 {
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	1729 const _OrthancPluginIncomingHttpRequestFilter& p =
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	1730 reinterpret_cast<const _OrthancPluginIncomingHttpRequestFilter>(parameters);
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	1731
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	1732 LOG(INFO) << "Plugin has registered a callback to filter incoming HTTP requests";
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	1733 pimpl_->incomingHttpRequestFilters_.push_back(p.callback);
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	1734 }
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	1735
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1736
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	1737 void OrthancPlugins::RegisterIncomingHttpRequestFilter2(const void* parameters)
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	1738 {
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	1739 const _OrthancPluginIncomingHttpRequestFilter2& p =
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	1740 reinterpret_cast<const _OrthancPluginIncomingHttpRequestFilter2>(parameters);
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	1741
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	1742 LOG(INFO) << "Plugin has registered a callback to filter incoming HTTP requests";
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	1743 pimpl_->incomingHttpRequestFilters2_.push_back(p.callback);
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	1744 }
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	1745
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	1746
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	1747 void OrthancPlugins::RegisterRefreshMetricsCallback(const void* parameters)
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	1748 {
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	1749 const _OrthancPluginRegisterRefreshMetricsCallback& p =
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	1750 reinterpret_cast<const _OrthancPluginRegisterRefreshMetricsCallback>(parameters);
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	1751
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	1752 boost::mutex::scoped_lock lock(pimpl_->refreshMetricsMutex_);
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	1753
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	1754 LOG(INFO) << "Plugin has registered a callback to refresh its metrics";
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	1755 pimpl_->refreshMetricsCallbacks_.push_back(p.callback);
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	1756 }
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	1757
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	1758
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1759 void OrthancPlugins::AnswerBuffer(const void* parameters)
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1760 {
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1761 const _OrthancPluginAnswerBuffer& p =
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1762 reinterpret_cast<const _OrthancPluginAnswerBuffer>(parameters);
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1763
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1764 HttpOutput& translatedOutput = reinterpret_cast<PImpl::PluginHttpOutput*>(p.output)->GetOutput();
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1765 translatedOutput.SetContentType(p.mimeType);
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1766 translatedOutput.Answer(p.answer, p.answerSize);
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1767 }
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1768
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1769
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1770 void OrthancPlugins::Redirect(const void* parameters)
993 501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 944 diff changeset	1771 {
1042 8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1772 const _OrthancPluginOutputPlusArgument& p =
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1773 reinterpret_cast<const _OrthancPluginOutputPlusArgument>(parameters);
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1774
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1775 HttpOutput& translatedOutput = reinterpret_cast<PImpl::PluginHttpOutput*>(p.output)->GetOutput();
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1776 translatedOutput.Redirect(p.argument);
1042 8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1777 }
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1778
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1779
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1780 void OrthancPlugins::SendHttpStatusCode(const void* parameters)
1042 8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1781 {
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1782 const _OrthancPluginSendHttpStatusCode& p =
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1783 reinterpret_cast<const _OrthancPluginSendHttpStatusCode>(parameters);
993 501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 944 diff changeset	1784
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1785 HttpOutput& translatedOutput = reinterpret_cast<PImpl::PluginHttpOutput*>(p.output)->GetOutput();
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1786 translatedOutput.SendStatus(static_cast<HttpStatus>(p.status));
1042 8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1787 }
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1788
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1789
1594 2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1790 void OrthancPlugins::SendHttpStatus(const void* parameters)
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1791 {
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1792 const _OrthancPluginSendHttpStatus& p =
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1793 reinterpret_cast<const _OrthancPluginSendHttpStatus>(parameters);
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1794
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1795 HttpOutput& translatedOutput = reinterpret_cast<PImpl::PluginHttpOutput*>(p.output)->GetOutput();
1594 2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1796 HttpStatus status = static_cast<HttpStatus>(p.status);
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1797
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1798 if (p.bodySize > 0 && p.body != NULL)
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1799 {
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1800 translatedOutput.SendStatus(status, p.body, p.bodySize);
1594 2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1801 }
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1802 else
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1803 {
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1804 translatedOutput.SendStatus(status);
1594 2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1805 }
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1806 }
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1807
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1808
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1809 void OrthancPlugins::SendUnauthorized(const void* parameters)
1042 8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1810 {
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1811 const _OrthancPluginOutputPlusArgument& p =
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1812 reinterpret_cast<const _OrthancPluginOutputPlusArgument>(parameters);
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1813
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1814 HttpOutput& translatedOutput = reinterpret_cast<PImpl::PluginHttpOutput*>(p.output)->GetOutput();
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1815 translatedOutput.SendUnauthorized(p.argument);
1042 8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1816 }
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1817
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1818
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1819 void OrthancPlugins::SendMethodNotAllowed(const void* parameters)
1042 8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1820 {
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1821 const _OrthancPluginOutputPlusArgument& p =
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1822 reinterpret_cast<const _OrthancPluginOutputPlusArgument>(parameters);
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1823
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1824 HttpOutput& translatedOutput = reinterpret_cast<PImpl::PluginHttpOutput*>(p.output)->GetOutput();
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1825 translatedOutput.SendMethodNotAllowed(p.argument);
1042 8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1826 }
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1827
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1828
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1829 void OrthancPlugins::SetCookie(const void* parameters)
1042 8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1830 {
1137 d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1831 const _OrthancPluginSetHttpHeader& p =
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1832 reinterpret_cast<const _OrthancPluginSetHttpHeader>(parameters);
1042 8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1833
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1834 HttpOutput& translatedOutput = reinterpret_cast<PImpl::PluginHttpOutput*>(p.output)->GetOutput();
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1835 translatedOutput.SetCookie(p.key, p.value);
1137 d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1836 }
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1837
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1838
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1839 void OrthancPlugins::SetHttpHeader(const void* parameters)
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1840 {
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1841 const _OrthancPluginSetHttpHeader& p =
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1842 reinterpret_cast<const _OrthancPluginSetHttpHeader>(parameters);
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1843
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1844 HttpOutput& translatedOutput = reinterpret_cast<PImpl::PluginHttpOutput*>(p.output)->GetOutput();
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1845 translatedOutput.AddHeader(p.key, p.value);
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1846 }
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1847
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1848
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1849 void OrthancPlugins::SetHttpErrorDetails(const void* parameters)
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1850 {
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1851 const _OrthancPluginSetHttpErrorDetails& p =
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1852 reinterpret_cast<const _OrthancPluginSetHttpErrorDetails>(parameters);
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1853
2960 74a5a7fd6e0e log flag to OrthancPluginSetHttpErrorDetails Sebastien Jodogne <s.jodogne@gmail.com> parents: 2957 diff changeset	1854 PImpl::PluginHttpOutput* output =
74a5a7fd6e0e log flag to OrthancPluginSetHttpErrorDetails Sebastien Jodogne <s.jodogne@gmail.com> parents: 2957 diff changeset	1855 reinterpret_cast<PImpl::PluginHttpOutput*>(p.output);
74a5a7fd6e0e log flag to OrthancPluginSetHttpErrorDetails Sebastien Jodogne <s.jodogne@gmail.com> parents: 2957 diff changeset	1856 output->SetErrorDetails(p.details, p.log);
993 501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 944 diff changeset	1857 }
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 944 diff changeset	1858
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 944 diff changeset	1859
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1860 void OrthancPlugins::CompressAndAnswerPngImage(const void* parameters)
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1861 {
1600 7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1862 // Bridge for backward compatibility with Orthanc <= 0.9.3
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1863 const _OrthancPluginCompressAndAnswerPngImage& p =
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1864 reinterpret_cast<const _OrthancPluginCompressAndAnswerPngImage>(parameters);
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1865
1600 7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1866 _OrthancPluginCompressAndAnswerImage p2;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1867 p2.output = p.output;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1868 p2.imageFormat = OrthancPluginImageFormat_Png;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1869 p2.pixelFormat = p.format;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1870 p2.width = p.width;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1871 p2.height = p.height;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1872 p2.pitch = p.height;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1873 p2.buffer = p.buffer;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1874 p2.quality = 0;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1875
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1876 CompressAndAnswerImage(&p2);
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1877 }
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1878
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1879
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1880 void OrthancPlugins::CompressAndAnswerImage(const void* parameters)
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1881 {
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1882 const _OrthancPluginCompressAndAnswerImage& p =
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1883 reinterpret_cast<const _OrthancPluginCompressAndAnswerImage>(parameters);
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1884
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1885 HttpOutput& translatedOutput = reinterpret_cast<PImpl::PluginHttpOutput*>(p.output)->GetOutput();
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1886
1600 7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1887 ImageAccessor accessor;
1625 c17b1142caab reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1624 diff changeset	1888 accessor.AssignReadOnly(Plugins::Convert(p.pixelFormat), p.width, p.height, p.pitch, p.buffer);
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1889
1600 7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1890 std::string compressed;
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1891
1600 7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1892 switch (p.imageFormat)
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1893 {
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1894 case OrthancPluginImageFormat_Png:
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1895 {
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1896 PngWriter writer;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1897 writer.WriteToMemory(compressed, accessor);
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1898 translatedOutput.SetContentType(MimeType_Png);
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1899 break;
1600 7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1900 }
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1901
1600 7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1902 case OrthancPluginImageFormat_Jpeg:
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1903 {
1603 905b4db3092b CompressAndAnswerJpegImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1600 diff changeset	1904 JpegWriter writer;
905b4db3092b CompressAndAnswerJpegImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1600 diff changeset	1905 writer.SetQuality(p.quality);
905b4db3092b CompressAndAnswerJpegImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1600 diff changeset	1906 writer.WriteToMemory(compressed, accessor);
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1907 translatedOutput.SetContentType(MimeType_Jpeg);
1603 905b4db3092b CompressAndAnswerJpegImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1600 diff changeset	1908 break;
1600 7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1909 }
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1910
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1911 default:
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1912 throw OrthancException(ErrorCode_ParameterOutOfRange);
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1913 }
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1914
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	1915 translatedOutput.Answer(compressed);
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1916 }
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1917
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1918
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1919 void OrthancPlugins::GetDicomForInstance(const void* parameters)
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1920 {
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1921 const _OrthancPluginGetDicomForInstance& p =
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1922 reinterpret_cast<const _OrthancPluginGetDicomForInstance>(parameters);
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1923
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1924 std::string dicom;
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1925
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1926 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1927 PImpl::ServerContextLock lock(*pimpl_);
2124 2b1520efa282 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	1928 lock.GetContext().ReadDicom(dicom, p.instanceId);
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1929 }
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1930
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1931 CopyToMemoryBuffer(*p.target, dicom);
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1932 }
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1933
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1934
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	1935 void OrthancPlugins::RestApiGet(const void* parameters,
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	1936 bool afterPlugins)
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1937 {
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1938 const _OrthancPluginRestApiGet& p =
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1939 reinterpret_cast<const _OrthancPluginRestApiGet>(parameters);
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1940
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	1941 LOG(INFO) << "Plugin making REST GET call on URI " << p.uri
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	1942 << (afterPlugins ? " (after plugins)" : " (built-in API)");
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	1943
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1944 IHttpHandler* handler;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1945
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1946 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1947 PImpl::ServerContextLock lock(*pimpl_);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1948 handler = &lock.GetContext().GetHttpHandler().RestrictToOrthancRestApi(!afterPlugins);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1949 }
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	1950
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3429 diff changeset	1951 std::map<std::string, std::string> httpHeaders;
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3429 diff changeset	1952
1445 d26c8a93d05a refactoring: SimpleGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1953 std::string result;
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3429 diff changeset	1954 if (HttpToolbox::SimpleGet(result, *handler, RequestOrigin_Plugins, p.uri, httpHeaders))
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1955 {
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1956 CopyToMemoryBuffer(*p.target, result);
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1957 }
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1958 else
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1959 {
1984 9f09a20e41e2 corrected error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1962 diff changeset	1960 throw OrthancException(ErrorCode_UnknownResource);
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1961 }
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1962 }
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1963
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1964
1780 94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1965 void OrthancPlugins::RestApiGet2(const void* parameters)
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1966 {
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1967 const _OrthancPluginRestApiGet2& p =
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1968 reinterpret_cast<const _OrthancPluginRestApiGet2>(parameters);
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1969
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1970 LOG(INFO) << "Plugin making REST GET call on URI " << p.uri
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1971 << (p.afterPlugins ? " (after plugins)" : " (built-in API)");
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1972
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1973 IHttpHandler::Arguments headers;
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1974
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1975 for (uint32_t i = 0; i < p.headersCount; i++)
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1976 {
1918 e8c2f993f6b3 fix case for HTTP headers keys in OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1916 diff changeset	1977 std::string name(p.headersKeys[i]);
e8c2f993f6b3 fix case for HTTP headers keys in OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1916 diff changeset	1978 std::transform(name.begin(), name.end(), name.begin(), ::tolower);
e8c2f993f6b3 fix case for HTTP headers keys in OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1916 diff changeset	1979 headers[name] = p.headersValues[i];
1780 94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1980 }
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1981
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1982 IHttpHandler* handler;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1983
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1984 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1985 PImpl::ServerContextLock lock(*pimpl_);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1986 handler = &lock.GetContext().GetHttpHandler().RestrictToOrthancRestApi(!p.afterPlugins);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1987 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1988
1780 94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1989 std::string result;
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1990 if (HttpToolbox::SimpleGet(result, *handler, RequestOrigin_Plugins, p.uri, headers))
1780 94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1991 {
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1992 CopyToMemoryBuffer(*p.target, result);
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1993 }
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1994 else
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1995 {
1984 9f09a20e41e2 corrected error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1962 diff changeset	1996 throw OrthancException(ErrorCode_UnknownResource);
1780 94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1997 }
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1998 }
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1999
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	2000
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2001 void OrthancPlugins::RestApiPostPut(bool isPost,
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2002 const void* parameters,
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2003 bool afterPlugins)
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2004 {
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2005 const _OrthancPluginRestApiPostPut& p =
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2006 reinterpret_cast<const _OrthancPluginRestApiPostPut>(parameters);
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2007
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	2008 LOG(INFO) << "Plugin making REST " << EnumerationToString(isPost ? HttpMethod_Post : HttpMethod_Put)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	2009 << " call on URI " << p.uri << (afterPlugins ? " (after plugins)" : " (built-in API)");
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2010
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2011 IHttpHandler* handler;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2012
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2013 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2014 PImpl::ServerContextLock lock(*pimpl_);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2015 handler = &lock.GetContext().GetHttpHandler().RestrictToOrthancRestApi(!afterPlugins);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2016 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2017
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3429 diff changeset	2018 std::map<std::string, std::string> httpHeaders;
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3429 diff changeset	2019
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2020 std::string result;
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	2021 if (isPost ?
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3429 diff changeset	2022 HttpToolbox::SimplePost(result, *handler, RequestOrigin_Plugins, p.uri, p.body, p.bodySize, httpHeaders) :
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3429 diff changeset	2023 HttpToolbox::SimplePut (result, *handler, RequestOrigin_Plugins, p.uri, p.body, p.bodySize, httpHeaders))
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2024 {
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2025 CopyToMemoryBuffer(*p.target, result);
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2026 }
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2027 else
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2028 {
1984 9f09a20e41e2 corrected error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1962 diff changeset	2029 throw OrthancException(ErrorCode_UnknownResource);
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2030 }
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2031 }
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2032
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2033
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2034 void OrthancPlugins::RestApiDelete(const void* parameters,
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2035 bool afterPlugins)
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2036 {
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	2037 const char* uri = reinterpret_cast<const char*>(parameters);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	2038 LOG(INFO) << "Plugin making REST DELETE call on URI " << uri
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2039 << (afterPlugins ? " (after plugins)" : " (built-in API)");
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2040
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2041 IHttpHandler* handler;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2042
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2043 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2044 PImpl::ServerContextLock lock(*pimpl_);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2045 handler = &lock.GetContext().GetHttpHandler().RestrictToOrthancRestApi(!afterPlugins);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2046 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2047
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3429 diff changeset	2048 std::map<std::string, std::string> httpHeaders;
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3429 diff changeset	2049
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3429 diff changeset	2050 if (!HttpToolbox::SimpleDelete(*handler, RequestOrigin_Plugins, uri, httpHeaders))
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2051 {
1984 9f09a20e41e2 corrected error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1962 diff changeset	2052 throw OrthancException(ErrorCode_UnknownResource);
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2053 }
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2054 }
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2055
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2056
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	2057 void OrthancPlugins::LookupResource(_OrthancPluginService service,
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2058 const void* parameters)
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2059 {
1145 0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	2060 const _OrthancPluginRetrieveDynamicString& p =
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	2061 reinterpret_cast<const _OrthancPluginRetrieveDynamicString>(parameters);
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2062
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2063 /**
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2064 * The enumeration below only uses the tags that are indexed in
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2065 * the Orthanc database. It reflects the
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2066 * "CandidateResources::ApplyFilter()" method of the
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2067 * "OrthancFindRequestHandler" class.
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2068 **/
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2069
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2070 DicomTag tag(0, 0);
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2071 ResourceType level;
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2072 switch (service)
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2073 {
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2074 case _OrthancPluginService_LookupPatient:
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2075 tag = DICOM_TAG_PATIENT_ID;
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2076 level = ResourceType_Patient;
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2077 break;
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2078
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2079 case _OrthancPluginService_LookupStudy:
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2080 tag = DICOM_TAG_STUDY_INSTANCE_UID;
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2081 level = ResourceType_Study;
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2082 break;
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2083
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2084 case _OrthancPluginService_LookupStudyWithAccessionNumber:
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2085 tag = DICOM_TAG_ACCESSION_NUMBER;
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2086 level = ResourceType_Study;
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2087 break;
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2088
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2089 case _OrthancPluginService_LookupSeries:
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2090 tag = DICOM_TAG_SERIES_INSTANCE_UID;
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2091 level = ResourceType_Series;
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2092 break;
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2093
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2094 case _OrthancPluginService_LookupInstance:
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2095 tag = DICOM_TAG_SOP_INSTANCE_UID;
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2096 level = ResourceType_Instance;
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2097 break;
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2098
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2099 default:
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2100 throw OrthancException(ErrorCode_InternalError);
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2101 }
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2102
3034 54e422fe31ce moving LookupResource to graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2984 diff changeset	2103 std::vector<std::string> result;
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2104
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2105 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2106 PImpl::ServerContextLock lock(*pimpl_);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2107 lock.GetContext().GetIndex().LookupIdentifierExact(result, level, tag, p.argument);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2108 }
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2109
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2110 if (result.size() == 1)
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2111 {
3034 54e422fe31ce moving LookupResource to graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2984 diff changeset	2112 *p.result = CopyString(result[0]);
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2113 }
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2114 else
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2115 {
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2116 throw OrthancException(ErrorCode_UnknownResource);
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2117 }
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2118 }
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2119
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2120
1067 ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2121 static void AccessInstanceMetadataInternal(bool checkExistence,
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2122 const _OrthancPluginAccessDicomInstance& params,
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2123 const DicomInstanceToStore& instance)
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2124 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2125 MetadataType metadata;
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2126
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2127 try
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2128 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2129 metadata = StringToMetadata(params.key);
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2130 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2131 catch (OrthancException&)
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2132 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2133 // Unknown metadata
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2134 if (checkExistence)
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2135 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2136 *params.resultInt64 = -1;
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2137 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2138 else
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2139 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2140 *params.resultString = NULL;
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2141 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2142
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2143 return;
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2144 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2145
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2146 ServerIndex::MetadataMap::const_iterator it =
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2147 instance.GetMetadata().find(std::make_pair(ResourceType_Instance, metadata));
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2148
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2149 if (checkExistence)
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2150 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2151 if (it != instance.GetMetadata().end())
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2152 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2153 *params.resultInt64 = 1;
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2154 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2155 else
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2156 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2157 *params.resultInt64 = 0;
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2158 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2159 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2160 else
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2161 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2162 if (it != instance.GetMetadata().end())
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2163 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2164 *params.resultString = it->second.c_str();
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2165 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2166 else
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2167 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2168 // Error: Missing metadata
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2169 *params.resultString = NULL;
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2170 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2171 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2172 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2173
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2174
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2175 static void AccessDicomInstance(_OrthancPluginService service,
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2176 const void* parameters)
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2177 {
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2178 const _OrthancPluginAccessDicomInstance& p =
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2179 reinterpret_cast<const _OrthancPluginAccessDicomInstance>(parameters);
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2180
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2181 DicomInstanceToStore& instance =
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2182 reinterpret_cast<DicomInstanceToStore>(p.instance);
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2183
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2184 switch (service)
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2185 {
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2186 case _OrthancPluginService_GetInstanceRemoteAet:
2664 a21b244efb37 serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2640 diff changeset	2187 *p.resultString = instance.GetOrigin().GetRemoteAetC();
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2188 return;
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2189
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2190 case _OrthancPluginService_GetInstanceSize:
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2191 *p.resultInt64 = instance.GetBufferSize();
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2192 return;
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2193
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2194 case _OrthancPluginService_GetInstanceData:
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2195 *p.resultString = instance.GetBufferData();
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2196 return;
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2197
1067 ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2198 case _OrthancPluginService_HasInstanceMetadata:
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2199 AccessInstanceMetadataInternal(true, p, instance);
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2200 return;
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2201
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2202 case _OrthancPluginService_GetInstanceMetadata:
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2203 AccessInstanceMetadataInternal(false, p, instance);
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2204 return;
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2205
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2206 case _OrthancPluginService_GetInstanceJson:
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2207 case _OrthancPluginService_GetInstanceSimplifiedJson:
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2208 {
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2209 Json::StyledWriter writer;
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2210 std::string s;
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2211
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2212 if (service == _OrthancPluginService_GetInstanceJson)
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2213 {
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2214 s = writer.write(instance.GetJson());
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2215 }
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2216 else
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2217 {
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2218 Json::Value simplified;
2120 4b02ec79728a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	2219 ServerToolbox::SimplifyTags(simplified, instance.GetJson(), DicomToJsonFormat_Human);
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2220 s = writer.write(simplified);
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2221 }
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2222
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2223 *p.resultStringToFree = CopyString(s);
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2224 return;
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2225 }
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2226
1815 2abfdca9b915 OrthancPluginGetInstanceOrigin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1810 diff changeset	2227 case _OrthancPluginService_GetInstanceOrigin: // New in Orthanc 0.9.5
2640 c691fcf66071 ResourceModificationJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	2228 *p.resultOrigin = Plugins::Convert(instance.GetOrigin().GetRequestOrigin());
1815 2abfdca9b915 OrthancPluginGetInstanceOrigin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1810 diff changeset	2229 return;
2abfdca9b915 OrthancPluginGetInstanceOrigin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1810 diff changeset	2230
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2231 default:
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2232 throw OrthancException(ErrorCode_InternalError);
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2233 }
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2234 }
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2235
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2236
1554 89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2237 void OrthancPlugins::BufferCompression(const void* parameters)
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2238 {
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2239 const _OrthancPluginBufferCompression& p =
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2240 reinterpret_cast<const _OrthancPluginBufferCompression>(parameters);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2241
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2242 std::string result;
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2243
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2244 {
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2245 std::auto_ptr<DeflateBaseCompressor> compressor;
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2246
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2247 switch (p.compression)
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2248 {
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2249 case OrthancPluginCompressionType_Zlib:
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2250 {
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2251 compressor.reset(new ZlibCompressor);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2252 compressor->SetPrefixWithUncompressedSize(false);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2253 break;
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2254 }
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2255
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2256 case OrthancPluginCompressionType_ZlibWithSize:
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2257 {
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2258 compressor.reset(new ZlibCompressor);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2259 compressor->SetPrefixWithUncompressedSize(true);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2260 break;
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2261 }
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2262
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2263 case OrthancPluginCompressionType_Gzip:
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2264 {
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2265 compressor.reset(new GzipCompressor);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2266 compressor->SetPrefixWithUncompressedSize(false);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2267 break;
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2268 }
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2269
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2270 case OrthancPluginCompressionType_GzipWithSize:
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2271 {
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2272 compressor.reset(new GzipCompressor);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2273 compressor->SetPrefixWithUncompressedSize(true);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2274 break;
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2275 }
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2276
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2277 default:
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2278 throw OrthancException(ErrorCode_ParameterOutOfRange);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2279 }
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2280
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2281 if (p.uncompress)
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2282 {
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2283 compressor->Uncompress(result, p.source, p.size);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2284 }
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2285 else
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2286 {
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2287 compressor->Compress(result, p.source, p.size);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2288 }
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2289 }
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2290
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2291 CopyToMemoryBuffer(*p.target, result);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2292 }
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2293
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2294
1843 d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2295 static OrthancPluginImage* ReturnImage(std::auto_ptr<ImageAccessor>& image)
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2296 {
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2297 // Images returned to plugins are assumed to be writeable. If the
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2298 // input image is read-only, we return a copy so that it can be modified.
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2299
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2300 if (image->IsReadOnly())
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2301 {
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2045 diff changeset	2302 std::auto_ptr<Image> copy(new Image(image->GetFormat(), image->GetWidth(), image->GetHeight(), false));
1843 d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2303 ImageProcessing::Copy(copy, image);
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2304 image.reset(NULL);
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2305 return reinterpret_cast<OrthancPluginImage*>(copy.release());
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2306 }
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2307 else
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2308 {
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2309 return reinterpret_cast<OrthancPluginImage*>(image.release());
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2310 }
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2311 }
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2312
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2313
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2314 void OrthancPlugins::UncompressImage(const void* parameters)
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2315 {
1599 dd1f9e81f891 fixes to image primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	2316 const _OrthancPluginUncompressImage& p = reinterpret_cast<const _OrthancPluginUncompressImage>(parameters);
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2317
1604 1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	2318 std::auto_ptr<ImageAccessor> image;
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	2319
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2320 switch (p.format)
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2321 {
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2322 case OrthancPluginImageFormat_Png:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2323 {
1604 1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	2324 image.reset(new PngReader);
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	2325 reinterpret_cast<PngReader&>(*image).ReadFromMemory(p.data, p.size);
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	2326 break;
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2327 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2328
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2329 case OrthancPluginImageFormat_Jpeg:
1604 1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	2330 {
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	2331 image.reset(new JpegReader);
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	2332 reinterpret_cast<JpegReader&>(*image).ReadFromMemory(p.data, p.size);
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	2333 break;
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	2334 }
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2335
1829 31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2336 case OrthancPluginImageFormat_Dicom:
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2337 {
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	2338 image.reset(Decode(p.data, p.size, 0));
1829 31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2339 break;
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2340 }
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2341
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2342 default:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2343 throw OrthancException(ErrorCode_ParameterOutOfRange);
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2344 }
1604 1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	2345
1843 d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2346 *(p.target) = ReturnImage(image);
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2347 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2348
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2349
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2350 void OrthancPlugins::CompressImage(const void* parameters)
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2351 {
1599 dd1f9e81f891 fixes to image primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	2352 const _OrthancPluginCompressImage& p = reinterpret_cast<const _OrthancPluginCompressImage>(parameters);
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2353
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2354 std::string compressed;
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2355
1916 5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	2356 ImageAccessor accessor;
5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	2357 accessor.AssignReadOnly(Plugins::Convert(p.pixelFormat), p.width, p.height, p.pitch, p.buffer);
5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	2358
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2359 switch (p.imageFormat)
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2360 {
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2361 case OrthancPluginImageFormat_Png:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2362 {
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2363 PngWriter writer;
1916 5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	2364 writer.WriteToMemory(compressed, accessor);
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2365 break;
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2366 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2367
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2368 case OrthancPluginImageFormat_Jpeg:
1604 1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	2369 {
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	2370 JpegWriter writer;
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	2371 writer.SetQuality(p.quality);
1916 5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	2372 writer.WriteToMemory(compressed, accessor);
1604 1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	2373 break;
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	2374 }
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2375
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2376 default:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2377 throw OrthancException(ErrorCode_ParameterOutOfRange);
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2378 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2379
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2380 CopyToMemoryBuffer(*p.target, compressed.size() > 0 ? compressed.c_str() : NULL, compressed.size());
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2381 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2382
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2383
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2384 static void SetupHttpClient(HttpClient& client,
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2385 const _OrthancPluginCallHttpClient2& parameters)
1606 31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	2386 {
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2387 client.SetUrl(parameters.url);
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2388 client.SetConvertHeadersToLowerCase(false);
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2389
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2390 if (parameters.timeout != 0)
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2391 {
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2392 client.SetTimeout(parameters.timeout);
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2393 }
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2394
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2395 if (parameters.username != NULL &&
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2396 parameters.password != NULL)
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2397 {
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2398 client.SetCredentials(parameters.username, parameters.password);
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2399 }
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2400
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2401 if (parameters.certificateFile != NULL)
1606 31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	2402 {
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2403 std::string certificate(parameters.certificateFile);
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2404 std::string key, password;
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2405
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2406 if (parameters.certificateKeyFile)
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2407 {
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2408 key.assign(parameters.certificateKeyFile);
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2409 }
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2410
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2411 if (parameters.certificateKeyPassword)
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2412 {
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2413 password.assign(parameters.certificateKeyPassword);
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2414 }
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2415
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2416 client.SetClientCertificate(certificate, key, password);
1606 31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	2417 }
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	2418
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2419 client.SetPkcs11Enabled(parameters.pkcs11 ? true : false);
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2420
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2421 for (uint32_t i = 0; i < parameters.headersCount; i++)
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2422 {
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2423 if (parameters.headersKeys[i] == NULL \|\|
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2424 parameters.headersValues[i] == NULL)
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2425 {
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2426 throw OrthancException(ErrorCode_NullPointer);
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2427 }
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2428
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2429 client.AddHeader(parameters.headersKeys[i], parameters.headersValues[i]);
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2430 }
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2431
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2432 switch (parameters.method)
1606 31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	2433 {
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	2434 case OrthancPluginHttpMethod_Get:
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	2435 client.SetMethod(HttpMethod_Get);
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	2436 break;
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	2437
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	2438 case OrthancPluginHttpMethod_Post:
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	2439 client.SetMethod(HttpMethod_Post);
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	2440 break;
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	2441
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	2442 case OrthancPluginHttpMethod_Put:
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	2443 client.SetMethod(HttpMethod_Put);
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2444 break;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2445
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2446 case OrthancPluginHttpMethod_Delete:
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2447 client.SetMethod(HttpMethod_Delete);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2448 break;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2449
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2450 default:
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2451 throw OrthancException(ErrorCode_ParameterOutOfRange);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2452 }
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2453 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2454
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2455
3413 f09bfdea3fc3 rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 3407 diff changeset	2456 static void ExecuteHttpClientWithoutChunkedBody(uint16_t& httpStatus,
f09bfdea3fc3 rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 3407 diff changeset	2457 OrthancPluginMemoryBuffer* answerBody,
f09bfdea3fc3 rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 3407 diff changeset	2458 OrthancPluginMemoryBuffer* answerHeaders,
f09bfdea3fc3 rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 3407 diff changeset	2459 HttpClient& client)
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2460 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2461 if (answerBody == NULL)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2462 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2463 throw OrthancException(ErrorCode_NullPointer);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2464 }
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2465
2041 9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	2466 std::string body;
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	2467 HttpClient::HttpHeaders headers;
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	2468
2787 ad2c32082653 Fix OrthancPluginHttpClient() to return the HTTP status on errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	2469 bool success = client.Apply(body, headers);
2041 9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	2470
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	2471 // The HTTP request has succeeded
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2472 httpStatus = static_cast<uint16_t>(client.GetLastStatus());
2041 9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	2473
2787 ad2c32082653 Fix OrthancPluginHttpClient() to return the HTTP status on errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	2474 if (!success)
ad2c32082653 Fix OrthancPluginHttpClient() to return the HTTP status on errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	2475 {
ad2c32082653 Fix OrthancPluginHttpClient() to return the HTTP status on errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	2476 HttpClient::ThrowException(client.GetLastStatus());
ad2c32082653 Fix OrthancPluginHttpClient() to return the HTTP status on errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	2477 }
ad2c32082653 Fix OrthancPluginHttpClient() to return the HTTP status on errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	2478
2041 9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	2479 // Copy the HTTP headers of the answer, if the plugin requested them
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2480 if (answerHeaders != NULL)
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2481 {
2041 9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	2482 Json::Value json = Json::objectValue;
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	2483
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	2484 for (HttpClient::HttpHeaders::const_iterator
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	2485 it = headers.begin(); it != headers.end(); ++it)
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	2486 {
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	2487 json[it->first] = it->second;
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	2488 }
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	2489
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	2490 std::string s = json.toStyledString();
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2491 CopyToMemoryBuffer(*answerHeaders, s);
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2492 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2493
2041 9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	2494 // Copy the body of the answer if it makes sense
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2495 if (client.GetMethod() != HttpMethod_Delete)
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2496 {
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2497 CopyToMemoryBuffer(*answerBody, body);
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2498 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2499 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2500
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2501
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2502 void OrthancPlugins::CallHttpClient(const void* parameters)
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2503 {
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2504 const _OrthancPluginCallHttpClient& p = reinterpret_cast<const _OrthancPluginCallHttpClient>(parameters);
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2505
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2506 HttpClient client;
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2507
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2508 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2509 _OrthancPluginCallHttpClient2 converted;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2510 memset(&converted, 0, sizeof(converted));
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2511
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2512 converted.answerBody = NULL;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2513 converted.answerHeaders = NULL;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2514 converted.httpStatus = NULL;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2515 converted.method = p.method;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2516 converted.url = p.url;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2517 converted.headersCount = 0;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2518 converted.headersKeys = NULL;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2519 converted.headersValues = NULL;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2520 converted.body = p.body;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2521 converted.bodySize = p.bodySize;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2522 converted.username = p.username;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2523 converted.password = p.password;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2524 converted.timeout = 0; // Use default timeout
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2525 converted.certificateFile = NULL;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2526 converted.certificateKeyFile = NULL;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2527 converted.certificateKeyPassword = NULL;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2528 converted.pkcs11 = false;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2529
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2530 SetupHttpClient(client, converted);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2531 }
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 uint16_t status;
3413 f09bfdea3fc3 rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 3407 diff changeset	2534 ExecuteHttpClientWithoutChunkedBody(status, p.target, NULL, client);
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2535 }
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2536
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2537
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2538 void OrthancPlugins::CallHttpClient2(const void* parameters)
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2539 {
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2540 const _OrthancPluginCallHttpClient2& p = reinterpret_cast<const _OrthancPluginCallHttpClient2>(parameters);
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2541
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2542 if (p.httpStatus == NULL)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2543 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2544 throw OrthancException(ErrorCode_NullPointer);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2545 }
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2546
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2547 HttpClient client;
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2548
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2549 if (p.method == OrthancPluginHttpMethod_Post \|\|
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2550 p.method == OrthancPluginHttpMethod_Put)
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2551 {
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3399 diff changeset	2552 client.GetBody().assign(reinterpret_cast<const char*>(p.body), p.bodySize);
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2553 }
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2554
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2555 SetupHttpClient(client, p);
3413 f09bfdea3fc3 rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 3407 diff changeset	2556 ExecuteHttpClientWithoutChunkedBody(*p.httpStatus, p.answerBody, p.answerHeaders, client);
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2557 }
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2558
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2559
3413 f09bfdea3fc3 rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 3407 diff changeset	2560 void OrthancPlugins::ChunkedHttpClient(const void* parameters)
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2561 {
3413 f09bfdea3fc3 rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 3407 diff changeset	2562 const _OrthancPluginChunkedHttpClient& p =
f09bfdea3fc3 rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 3407 diff changeset	2563 reinterpret_cast<const _OrthancPluginChunkedHttpClient>(parameters);
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2564
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2565 if (p.httpStatus == NULL)
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2566 {
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2567 throw OrthancException(ErrorCode_NullPointer);
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2568 }
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2569
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2570 HttpClient client;
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2571
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2572 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2573 _OrthancPluginCallHttpClient2 converted;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2574 memset(&converted, 0, sizeof(converted));
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2575
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2576 converted.answerBody = NULL;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2577 converted.answerHeaders = NULL;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2578 converted.httpStatus = NULL;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2579 converted.method = p.method;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2580 converted.url = p.url;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2581 converted.headersCount = p.headersCount;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2582 converted.headersKeys = p.headersKeys;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2583 converted.headersValues = p.headersValues;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2584 converted.body = NULL;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2585 converted.bodySize = 0;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2586 converted.username = p.username;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2587 converted.password = p.password;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2588 converted.timeout = p.timeout;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2589 converted.certificateFile = p.certificateFile;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2590 converted.certificateKeyFile = p.certificateKeyFile;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2591 converted.certificateKeyPassword = p.certificateKeyPassword;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2592 converted.pkcs11 = p.pkcs11;
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2593
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2594 SetupHttpClient(client, converted);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2595 }
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2596
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	2597 HttpClientChunkedRequest body(p, pimpl_->dictionary_);
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2598 client.SetBody(body);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2599
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	2600 HttpClientChunkedAnswer answer(p, pimpl_->dictionary_);
3393 2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2601
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2602 bool success = client.Apply(answer);
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2603
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2604 *p.httpStatus = static_cast<uint16_t>(client.GetLastStatus());
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2605
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2606 if (!success)
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2607 {
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2608 HttpClient::ThrowException(client.GetLastStatus());
2cd0369a156f support of chunked answers in HttpClient and in SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 3392 diff changeset	2609 }
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2610 }
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2611
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	2612
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2613 void OrthancPlugins::CallPeerApi(const void* parameters)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2614 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2615 const _OrthancPluginCallPeerApi& p = reinterpret_cast<const _OrthancPluginCallPeerApi>(parameters);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2616 const OrthancPeers& peers = reinterpret_cast<const OrthancPeers>(p.peers);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2617
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2618 HttpClient client(peers.GetPeerParameters(p.peerIndex), p.uri);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2619 client.SetConvertHeadersToLowerCase(false);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2620
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2621 if (p.timeout != 0)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2622 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2623 client.SetTimeout(p.timeout);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2624 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2625
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2626 for (uint32_t i = 0; i < p.additionalHeadersCount; i++)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2627 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2628 if (p.additionalHeadersKeys[i] == NULL \|\|
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2629 p.additionalHeadersValues[i] == NULL)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2630 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2631 throw OrthancException(ErrorCode_NullPointer);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2632 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2633
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2634 client.AddHeader(p.additionalHeadersKeys[i], p.additionalHeadersValues[i]);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2635 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2636
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2637 switch (p.method)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2638 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2639 case OrthancPluginHttpMethod_Get:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2640 client.SetMethod(HttpMethod_Get);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2641 break;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2642
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2643 case OrthancPluginHttpMethod_Post:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2644 client.SetMethod(HttpMethod_Post);
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3399 diff changeset	2645 client.GetBody().assign(reinterpret_cast<const char*>(p.body), p.bodySize);
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2646 break;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2647
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2648 case OrthancPluginHttpMethod_Put:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2649 client.SetMethod(HttpMethod_Put);
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3399 diff changeset	2650 client.GetBody().assign(reinterpret_cast<const char*>(p.body), p.bodySize);
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2651 break;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2652
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2653 case OrthancPluginHttpMethod_Delete:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2654 client.SetMethod(HttpMethod_Delete);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2655 break;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2656
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2657 default:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2658 throw OrthancException(ErrorCode_ParameterOutOfRange);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2659 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2660
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2661 std::string body;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2662 HttpClient::HttpHeaders headers;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2663
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2664 bool success = client.Apply(body, headers);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2665
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2666 // The HTTP request has succeeded
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2667 *p.httpStatus = static_cast<uint16_t>(client.GetLastStatus());
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2668
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2669 if (!success)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2670 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2671 HttpClient::ThrowException(client.GetLastStatus());
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2672 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2673
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2674 // Copy the HTTP headers of the answer, if the plugin requested them
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2675 if (p.answerHeaders != NULL)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2676 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2677 Json::Value json = Json::objectValue;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2678
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2679 for (HttpClient::HttpHeaders::const_iterator
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2680 it = headers.begin(); it != headers.end(); ++it)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2681 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2682 json[it->first] = it->second;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2683 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2684
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2685 std::string s = json.toStyledString();
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2686 CopyToMemoryBuffer(*p.answerHeaders, s);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2687 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2688
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2689 // Copy the body of the answer if it makes sense
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2690 if (p.method != OrthancPluginHttpMethod_Delete)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2691 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2692 CopyToMemoryBuffer(*p.answerBody, body);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2693 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2694 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2695
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2696
1608 adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2697 void OrthancPlugins::ConvertPixelFormat(const void* parameters)
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2698 {
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2699 const _OrthancPluginConvertPixelFormat& p = reinterpret_cast<const _OrthancPluginConvertPixelFormat>(parameters);
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2700 const ImageAccessor& source = reinterpret_cast<const ImageAccessor>(p.source);
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2701
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2045 diff changeset	2702 std::auto_ptr<ImageAccessor> target(new Image(Plugins::Convert(p.targetFormat), source.GetWidth(), source.GetHeight(), false));
1608 adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2703 ImageProcessing::Convert(*target, source);
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2704
1843 d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2705 *(p.target) = ReturnImage(target);
1608 adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2706 }
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2707
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2708
1613 1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2709
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2710 void OrthancPlugins::GetFontInfo(const void* parameters)
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2711 {
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2712 const _OrthancPluginGetFontInfo& p = reinterpret_cast<const _OrthancPluginGetFontInfo>(parameters);
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2713
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2714 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2715 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2716
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2717 const Font& font = lock.GetConfiguration().GetFontRegistry().GetFont(p.fontIndex);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2718
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2719 if (p.name != NULL)
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2720 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2721 *(p.name) = font.GetName().c_str();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2722 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2723 else if (p.size != NULL)
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2724 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2725 *(p.size) = font.GetSize();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2726 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2727 else
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2728 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2729 throw OrthancException(ErrorCode_InternalError);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2730 }
1613 1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2731 }
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2732 }
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2733
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2734
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2735 void OrthancPlugins::DrawText(const void* parameters)
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2736 {
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2737 const _OrthancPluginDrawText& p = reinterpret_cast<const _OrthancPluginDrawText>(parameters);
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2738
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2739 ImageAccessor& target = reinterpret_cast<ImageAccessor>(p.image);
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2740
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2741 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2742 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2743 const Font& font = lock.GetConfiguration().GetFontRegistry().GetFont(p.fontIndex);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2744 font.Draw(target, p.utf8Text, p.x, p.y, p.r, p.g, p.b);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	2745 }
1613 1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2746 }
1740 5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2747
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2748
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2749 void OrthancPlugins::ApplyDicomToJson(_OrthancPluginService service,
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2750 const void* parameters)
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2751 {
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2752 const _OrthancPluginDicomToJson& p =
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2753 reinterpret_cast<const _OrthancPluginDicomToJson>(parameters);
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2754
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2755 std::auto_ptr<ParsedDicomFile> dicom;
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2756
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2757 if (service == _OrthancPluginService_DicomBufferToJson)
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2758 {
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2759 dicom.reset(new ParsedDicomFile(p.buffer, p.size));
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2760 }
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2761 else
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2762 {
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2763 if (p.instanceId == NULL)
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2764 {
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2765 throw OrthancException(ErrorCode_NullPointer);
1740 5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2766 }
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2767
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2768 std::string content;
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2769
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2770 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2771 PImpl::ServerContextLock lock(*pimpl_);
2124 2b1520efa282 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	2772 lock.GetContext().ReadDicom(content, p.instanceId);
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2773 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2774
1740 5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2775 dicom.reset(new ParsedDicomFile(content));
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2776 }
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2777
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2778 Json::Value json;
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	2779 dicom->DatasetToJson(json, Plugins::Convert(p.format),
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	2780 static_cast<DicomToJsonFlags>(p.flags), p.maxStringLength);
1740 5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2781
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2782 Json::FastWriter writer;
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2783 *p.result = CopyString(writer.write(json));
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2784 }
1613 1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2785
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2786
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2787 void OrthancPlugins::ApplyCreateDicom(_OrthancPluginService service,
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2788 const void* parameters)
1821 580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2789 {
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2790 const _OrthancPluginCreateDicom& p =
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2791 reinterpret_cast<const _OrthancPluginCreateDicom>(parameters);
1821 580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2792
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2793 Json::Value json;
1829 31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2794
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2795 if (p.json == NULL)
1821 580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2796 {
1829 31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2797 json = Json::objectValue;
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2798 }
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2799 else
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2800 {
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2801 Json::Reader reader;
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2802 if (!reader.parse(p.json, json))
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2803 {
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2804 throw OrthancException(ErrorCode_BadJson);
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2805 }
1821 580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2806 }
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2807
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2808 std::string dicom;
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2809
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2810 {
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2811 std::auto_ptr<ParsedDicomFile> file
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2812 (ParsedDicomFile::CreateFromJson(json, static_cast<DicomFromJsonFlags>(p.flags)));
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2813
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2814 if (p.pixelData)
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2815 {
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2816 file->EmbedImage(reinterpret_cast<const ImageAccessor>(p.pixelData));
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2817 }
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2818
1821 580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2819 file->SaveToMemoryBuffer(dicom);
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2820 }
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2821
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2822 CopyToMemoryBuffer(*p.target, dicom);
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2823 }
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2824
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2825
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2826 void OrthancPlugins::ComputeHash(_OrthancPluginService service,
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2827 const void* parameters)
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2828 {
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2829 const _OrthancPluginComputeHash& p =
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2830 reinterpret_cast<const _OrthancPluginComputeHash>(parameters);
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2831
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2832 std::string hash;
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2833 switch (service)
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2834 {
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2835 case _OrthancPluginService_ComputeMd5:
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2836 Toolbox::ComputeMD5(hash, p.buffer, p.size);
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2837 break;
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2838
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2839 case _OrthancPluginService_ComputeSha1:
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2840 Toolbox::ComputeSHA1(hash, p.buffer, p.size);
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2841 break;
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2842
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2843 default:
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2844 throw OrthancException(ErrorCode_ParameterOutOfRange);
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2845 }
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2846
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2847 *p.result = CopyString(hash);
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2848 }
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2849
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2850
3429 954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	2851 void OrthancPlugins::GetTagName(const void* parameters)
954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	2852 {
954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	2853 const _OrthancPluginGetTagName& p =
954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	2854 reinterpret_cast<const _OrthancPluginGetTagName>(parameters);
954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	2855
954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	2856 std::string privateCreator;
954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	2857
954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	2858 if (p.privateCreator != NULL)
954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	2859 {
954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	2860 privateCreator = p.privateCreator;
954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	2861 }
954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	2862
954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	2863 DicomTag tag(p.group, p.element);
954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	2864 *p.result = CopyString(FromDcmtkBridge::GetTagName(tag, privateCreator));
954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	2865 }
954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	2866
954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	2867
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2868 void OrthancPlugins::ApplyCreateImage(_OrthancPluginService service,
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2869 const void* parameters)
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2870 {
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2871 const _OrthancPluginCreateImage& p =
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2872 reinterpret_cast<const _OrthancPluginCreateImage>(parameters);
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2873
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2874 std::auto_ptr<ImageAccessor> result;
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2875
1829 31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2876 switch (service)
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2877 {
1829 31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2878 case _OrthancPluginService_CreateImage:
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2045 diff changeset	2879 result.reset(new Image(Plugins::Convert(p.format), p.width, p.height, false));
1829 31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2880 break;
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2881
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2882 case _OrthancPluginService_CreateImageAccessor:
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2883 result.reset(new ImageAccessor);
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2884 result->AssignWritable(Plugins::Convert(p.format), p.width, p.height, p.pitch, p.buffer);
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2885 break;
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2886
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2887 case _OrthancPluginService_DecodeDicomImage:
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2888 {
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	2889 result.reset(Decode(p.constBuffer, p.bufferSize, p.frameIndex));
1829 31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2890 break;
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2891 }
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2892
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2893 default:
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2894 throw OrthancException(ErrorCode_InternalError);
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2895 }
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2896
1843 d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2897 *(p.target) = ReturnImage(result);
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2898 }
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2899
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2900
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2901 void OrthancPlugins::ApplySendMultipartItem(const void* parameters)
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2902 {
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2903 // An exception might be raised in this function if the
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2904 // connection was closed by the HTTP client.
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2905 const _OrthancPluginAnswerBuffer& p =
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2906 reinterpret_cast<const _OrthancPluginAnswerBuffer>(parameters);
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2907
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	2908 HttpOutput& output = reinterpret_cast<PImpl::PluginHttpOutput*>(p.output)->GetOutput();
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2909
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2910 std::map<std::string, std::string> headers; // No custom headers
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	2911 output.SendMultipartItem(p.answer, p.answerSize, headers);
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2912 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2913
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2914
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2915 void OrthancPlugins::ApplySendMultipartItem2(const void* parameters)
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2916 {
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2917 // An exception might be raised in this function if the
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2918 // connection was closed by the HTTP client.
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2919 const _OrthancPluginSendMultipartItem2& p =
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2920 reinterpret_cast<const _OrthancPluginSendMultipartItem2>(parameters);
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	2921 HttpOutput& output = reinterpret_cast<PImpl::PluginHttpOutput*>(p.output)->GetOutput();
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2922
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2923 std::map<std::string, std::string> headers;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2924 for (uint32_t i = 0; i < p.headersCount; i++)
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2925 {
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2926 headers[p.headersKeys[i]] = p.headersValues[i];
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2927 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2928
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	2929 output.SendMultipartItem(p.answer, p.answerSize, headers);
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2930 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2931
1821 580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2932
1771 8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2933 void OrthancPlugins::DatabaseAnswer(const void* parameters)
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2934 {
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2935 const _OrthancPluginDatabaseAnswer& p =
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2936 reinterpret_cast<const _OrthancPluginDatabaseAnswer>(parameters);
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2937
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2938 if (pimpl_->database_.get() != NULL)
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2939 {
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2940 pimpl_->database_->AnswerReceived(p);
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2941 }
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2942 else
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2943 {
2956 bfee0b9f3209 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	2944 throw OrthancException(ErrorCode_BadRequest,
bfee0b9f3209 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	2945 "Cannot invoke this service without a custom database back-end");
1771 8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2946 }
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2947 }
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2948
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2949
1861 a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2950 namespace
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2951 {
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2952 class DictionaryReadLocker
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2953 {
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2954 private:
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2955 const DcmDataDictionary& dictionary_;
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2956
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2957 public:
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2958 DictionaryReadLocker() : dictionary_(dcmDataDict.rdlock())
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2959 {
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2960 }
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2961
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2962 ~DictionaryReadLocker()
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2963 {
3118 8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	2964 #if DCMTK_VERSION_NUMBER >= 364
8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	2965 dcmDataDict.rdunlock();
8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	2966 #else
1861 a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2967 dcmDataDict.unlock();
3118 8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	2968 #endif
1861 a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2969 }
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2970
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2971 const DcmDataDictionary* operator->()
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2972 {
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2973 return &dictionary_;
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2974 }
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2975 };
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2976 }
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2977
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2978
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2979 void OrthancPlugins::ApplyLookupDictionary(const void* parameters)
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2980 {
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2981 const _OrthancPluginLookupDictionary& p =
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2982 reinterpret_cast<const _OrthancPluginLookupDictionary>(parameters);
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2983
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2984 DicomTag tag(FromDcmtkBridge::ParseTag(p.name));
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2985 DcmTagKey tag2(tag.GetGroup(), tag.GetElement());
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2986
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2987 DictionaryReadLocker locker;
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2988 const DcmDictEntry* entry = locker->findEntry(tag2, NULL);
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2989
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2990 if (entry == NULL)
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2991 {
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2992 throw OrthancException(ErrorCode_UnknownDicomTag);
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2993 }
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2994 else
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2995 {
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2996 p.target->group = entry->getKey().getGroup();
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2997 p.target->element = entry->getKey().getElement();
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2000 diff changeset	2998 p.target->vr = Plugins::Convert(FromDcmtkBridge::Convert(entry->getEVR()));
1861 a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2999 p.target->minMultiplicity = static_cast<uint32_t>(entry->getVMMin());
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	3000 p.target->maxMultiplicity = (entry->getVMMax() == DcmVariableVM ? 0 : static_cast<uint32_t>(entry->getVMMax()));
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	3001 }
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	3002 }
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	3003
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	3004
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3005 bool OrthancPlugins::InvokeSafeService(SharedLibrary& plugin,
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3006 _OrthancPluginService service,
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3007 const void* parameters)
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	3008 {
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3009 // Services that can be run without mutual exclusion
1553 7c4b487b3b4a ensure mutual exclusion in InvokeService Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	3010
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	3011 switch (service)
bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	3012 {
1145 0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	3013 case _OrthancPluginService_GetOrthancPath:
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	3014 {
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	3015 std::string s = SystemToolbox::GetPathToExecutable();
1145 0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	3016 reinterpret_cast<const _OrthancPluginRetrieveDynamicString>(parameters)->result = CopyString(s);
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	3017 return true;
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	3018 }
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	3019
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	3020 case _OrthancPluginService_GetOrthancDirectory:
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	3021 {
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	3022 std::string s = SystemToolbox::GetDirectoryOfExecutable();
1145 0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	3023 reinterpret_cast<const _OrthancPluginRetrieveDynamicString>(parameters)->result = CopyString(s);
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	3024 return true;
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	3025 }
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	3026
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	3027 case _OrthancPluginService_GetConfigurationPath:
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	3028 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	3029 std::string s;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	3030
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	3031 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	3032 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	3033 s = lock.GetConfiguration().GetConfigurationAbsolutePath();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	3034 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	3035
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	3036 reinterpret_cast<const _OrthancPluginRetrieveDynamicString>(parameters)->result = CopyString(s);
1145 0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	3037 return true;
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	3038 }
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	3039
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1407 diff changeset	3040 case _OrthancPluginService_GetConfiguration:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1407 diff changeset	3041 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1407 diff changeset	3042 std::string s;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	3043
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	3044 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	3045 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	3046 lock.GetConfiguration().Format(s);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	3047 }
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1407 diff changeset	3048
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1407 diff changeset	3049 reinterpret_cast<const _OrthancPluginRetrieveDynamicString>(parameters)->result = CopyString(s);
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1407 diff changeset	3050 return true;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1407 diff changeset	3051 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1407 diff changeset	3052
1554 89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	3053 case _OrthancPluginService_BufferCompression:
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	3054 BufferCompression(parameters);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	3055 return true;
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	3056
907 9b8298234254 documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 904 diff changeset	3057 case _OrthancPluginService_AnswerBuffer:
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	3058 AnswerBuffer(parameters);
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	3059 return true;
bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	3060
907 9b8298234254 documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 904 diff changeset	3061 case _OrthancPluginService_CompressAndAnswerPngImage:
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	3062 CompressAndAnswerPngImage(parameters);
901 7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	3063 return true;
7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	3064
1600 7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	3065 case _OrthancPluginService_CompressAndAnswerImage:
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	3066 CompressAndAnswerImage(parameters);
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	3067 return true;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	3068
907 9b8298234254 documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 904 diff changeset	3069 case _OrthancPluginService_GetDicomForInstance:
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	3070 GetDicomForInstance(parameters);
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	3071 return true;
904 2732b5f57d9c sample to forward dicom data Sebastien Jodogne <s.jodogne@gmail.com> parents: 901 diff changeset	3072
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	3073 case _OrthancPluginService_RestApiGet:
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	3074 RestApiGet(parameters, false);
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	3075 return true;
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	3076
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	3077 case _OrthancPluginService_RestApiGetAfterPlugins:
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	3078 RestApiGet(parameters, true);
904 2732b5f57d9c sample to forward dicom data Sebastien Jodogne <s.jodogne@gmail.com> parents: 901 diff changeset	3079 return true;
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	3080
1780 94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	3081 case _OrthancPluginService_RestApiGet2:
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	3082 RestApiGet2(parameters);
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	3083 return true;
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	3084
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	3085 case _OrthancPluginService_RestApiPost:
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	3086 RestApiPostPut(true, parameters, false);
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	3087 return true;
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	3088
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	3089 case _OrthancPluginService_RestApiPostAfterPlugins:
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	3090 RestApiPostPut(true, parameters, true);
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	3091 return true;
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	3092
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	3093 case _OrthancPluginService_RestApiDelete:
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	3094 RestApiDelete(parameters, false);
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	3095 return true;
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	3096
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	3097 case _OrthancPluginService_RestApiDeleteAfterPlugins:
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	3098 RestApiDelete(parameters, true);
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	3099 return true;
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	3100
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	3101 case _OrthancPluginService_RestApiPut:
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	3102 RestApiPostPut(false, parameters, false);
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	3103 return true;
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	3104
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	3105 case _OrthancPluginService_RestApiPutAfterPlugins:
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	3106 RestApiPostPut(false, parameters, true);
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	3107 return true;
904 2732b5f57d9c sample to forward dicom data Sebastien Jodogne <s.jodogne@gmail.com> parents: 901 diff changeset	3108
993 501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 944 diff changeset	3109 case _OrthancPluginService_Redirect:
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 944 diff changeset	3110 Redirect(parameters);
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 944 diff changeset	3111 return true;
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 944 diff changeset	3112
1042 8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	3113 case _OrthancPluginService_SendUnauthorized:
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	3114 SendUnauthorized(parameters);
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	3115 return true;
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	3116
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	3117 case _OrthancPluginService_SendMethodNotAllowed:
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	3118 SendMethodNotAllowed(parameters);
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	3119 return true;
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	3120
1594 2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	3121 case _OrthancPluginService_SendHttpStatus:
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	3122 SendHttpStatus(parameters);
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	3123 return true;
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	3124
1042 8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	3125 case _OrthancPluginService_SendHttpStatusCode:
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	3126 SendHttpStatusCode(parameters);
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	3127 return true;
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	3128
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	3129 case _OrthancPluginService_SetCookie:
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	3130 SetCookie(parameters);
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	3131 return true;
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	3132
1137 d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	3133 case _OrthancPluginService_SetHttpHeader:
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	3134 SetHttpHeader(parameters);
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	3135 return true;
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	3136
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	3137 case _OrthancPluginService_SetHttpErrorDetails:
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	3138 SetHttpErrorDetails(parameters);
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	3139 return true;
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	3140
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	3141 case _OrthancPluginService_LookupPatient:
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	3142 case _OrthancPluginService_LookupStudy:
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	3143 case _OrthancPluginService_LookupStudyWithAccessionNumber:
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	3144 case _OrthancPluginService_LookupSeries:
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	3145 case _OrthancPluginService_LookupInstance:
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	3146 LookupResource(service, parameters);
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	3147 return true;
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	3148
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	3149 case _OrthancPluginService_GetInstanceRemoteAet:
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	3150 case _OrthancPluginService_GetInstanceSize:
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	3151 case _OrthancPluginService_GetInstanceData:
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	3152 case _OrthancPluginService_GetInstanceJson:
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	3153 case _OrthancPluginService_GetInstanceSimplifiedJson:
1067 ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	3154 case _OrthancPluginService_HasInstanceMetadata:
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	3155 case _OrthancPluginService_GetInstanceMetadata:
1815 2abfdca9b915 OrthancPluginGetInstanceOrigin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1810 diff changeset	3156 case _OrthancPluginService_GetInstanceOrigin:
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	3157 AccessDicomInstance(service, parameters);
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	3158 return true;
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	3159
1249 40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	3160 case _OrthancPluginService_SetGlobalProperty:
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	3161 {
1249 40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	3162 const _OrthancPluginGlobalProperty& p =
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	3163 reinterpret_cast<const _OrthancPluginGlobalProperty>(parameters);
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	3164 if (p.property < 1024)
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	3165 {
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	3166 return false;
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	3167 }
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	3168 else
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	3169 {
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3170 PImpl::ServerContextLock lock(*pimpl_);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3171 lock.GetContext().GetIndex().SetGlobalProperty(static_cast<GlobalProperty>(p.property), p.value);
1249 40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	3172 return true;
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	3173 }
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	3174 }
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	3175
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	3176 case _OrthancPluginService_GetGlobalProperty:
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	3177 {
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	3178 const _OrthancPluginGlobalProperty& p =
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	3179 reinterpret_cast<const _OrthancPluginGlobalProperty>(parameters);
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3180
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3181 std::string result;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3182
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3183 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3184 PImpl::ServerContextLock lock(*pimpl_);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3185 result = lock.GetContext().GetIndex().GetGlobalProperty(static_cast<GlobalProperty>(p.property), p.value);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3186 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3187
1249 40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	3188 *(p.result) = CopyString(result);
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	3189 return true;
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	3190 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	3191
1407 d371a66972a4 OrthancPluginGetExpectedDatabaseVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	3192 case _OrthancPluginService_GetExpectedDatabaseVersion:
d371a66972a4 OrthancPluginGetExpectedDatabaseVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	3193 {
d371a66972a4 OrthancPluginGetExpectedDatabaseVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	3194 const _OrthancPluginReturnSingleValue& p =
d371a66972a4 OrthancPluginGetExpectedDatabaseVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	3195 reinterpret_cast<const _OrthancPluginReturnSingleValue>(parameters);
d371a66972a4 OrthancPluginGetExpectedDatabaseVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	3196 *(p.resultUint32) = ORTHANC_DATABASE_VERSION;
d371a66972a4 OrthancPluginGetExpectedDatabaseVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	3197 return true;
d371a66972a4 OrthancPluginGetExpectedDatabaseVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	3198 }
d371a66972a4 OrthancPluginGetExpectedDatabaseVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	3199
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	3200 case _OrthancPluginService_StartMultipartAnswer:
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	3201 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	3202 const _OrthancPluginStartMultipartAnswer& p =
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	3203 reinterpret_cast<const _OrthancPluginStartMultipartAnswer>(parameters);
2957 ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	3204 HttpOutput& output = reinterpret_cast<PImpl::PluginHttpOutput*>(p.output)->GetOutput();
ccf61f6e22ef New function in the SDK: "OrthancPluginSetHttpErrorDetails()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2956 diff changeset	3205 output.StartMultipart(p.subType, p.contentType);
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	3206 return true;
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	3207 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	3208
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	3209 case _OrthancPluginService_SendMultipartItem:
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	3210 ApplySendMultipartItem(parameters);
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	3211 return true;
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	3212
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	3213 case _OrthancPluginService_SendMultipartItem2:
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	3214 ApplySendMultipartItem2(parameters);
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	3215 return true;
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	3216
1588 b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	3217 case _OrthancPluginService_ReadFile:
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	3218 {
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	3219 const _OrthancPluginReadFile& p =
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	3220 reinterpret_cast<const _OrthancPluginReadFile>(parameters);
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	3221
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	3222 std::string content;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	3223 SystemToolbox::ReadFile(content, p.path);
1588 b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	3224 CopyToMemoryBuffer(*p.target, content.size() > 0 ? content.c_str() : NULL, content.size());
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	3225
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	3226 return true;
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	3227 }
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	3228
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	3229 case _OrthancPluginService_WriteFile:
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	3230 {
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	3231 const _OrthancPluginWriteFile& p =
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	3232 reinterpret_cast<const _OrthancPluginWriteFile>(parameters);
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	3233 SystemToolbox::WriteFile(p.data, p.size, p.path);
1588 b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	3234 return true;
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	3235 }
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	3236
1593 235d89817b89 OrthancPluginGetErrorDescription Sebastien Jodogne <s.jodogne@gmail.com> parents: 1588 diff changeset	3237 case _OrthancPluginService_GetErrorDescription:
235d89817b89 OrthancPluginGetErrorDescription Sebastien Jodogne <s.jodogne@gmail.com> parents: 1588 diff changeset	3238 {
235d89817b89 OrthancPluginGetErrorDescription Sebastien Jodogne <s.jodogne@gmail.com> parents: 1588 diff changeset	3239 const _OrthancPluginGetErrorDescription& p =
235d89817b89 OrthancPluginGetErrorDescription Sebastien Jodogne <s.jodogne@gmail.com> parents: 1588 diff changeset	3240 reinterpret_cast<const _OrthancPluginGetErrorDescription>(parameters);
235d89817b89 OrthancPluginGetErrorDescription Sebastien Jodogne <s.jodogne@gmail.com> parents: 1588 diff changeset	3241 *(p.target) = EnumerationToString(static_cast<ErrorCode>(p.error));
235d89817b89 OrthancPluginGetErrorDescription Sebastien Jodogne <s.jodogne@gmail.com> parents: 1588 diff changeset	3242 return true;
235d89817b89 OrthancPluginGetErrorDescription Sebastien Jodogne <s.jodogne@gmail.com> parents: 1588 diff changeset	3243 }
235d89817b89 OrthancPluginGetErrorDescription Sebastien Jodogne <s.jodogne@gmail.com> parents: 1588 diff changeset	3244
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3245 case _OrthancPluginService_GetImagePixelFormat:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3246 {
1599 dd1f9e81f891 fixes to image primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	3247 const _OrthancPluginGetImageInfo& p = reinterpret_cast<const _OrthancPluginGetImageInfo>(parameters);
1625 c17b1142caab reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1624 diff changeset	3248 (p.resultPixelFormat) = Plugins::Convert(reinterpret_cast<const ImageAccessor>(p.image)->GetFormat());
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3249 return true;
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3250 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3251
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3252 case _OrthancPluginService_GetImageWidth:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3253 {
1599 dd1f9e81f891 fixes to image primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	3254 const _OrthancPluginGetImageInfo& p = reinterpret_cast<const _OrthancPluginGetImageInfo>(parameters);
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3255 (p.resultUint32) = reinterpret_cast<const ImageAccessor>(p.image)->GetWidth();
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3256 return true;
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3257 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3258
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3259 case _OrthancPluginService_GetImageHeight:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3260 {
1599 dd1f9e81f891 fixes to image primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	3261 const _OrthancPluginGetImageInfo& p = reinterpret_cast<const _OrthancPluginGetImageInfo>(parameters);
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3262 (p.resultUint32) = reinterpret_cast<const ImageAccessor>(p.image)->GetHeight();
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3263 return true;
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3264 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3265
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3266 case _OrthancPluginService_GetImagePitch:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3267 {
1599 dd1f9e81f891 fixes to image primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	3268 const _OrthancPluginGetImageInfo& p = reinterpret_cast<const _OrthancPluginGetImageInfo>(parameters);
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3269 (p.resultUint32) = reinterpret_cast<const ImageAccessor>(p.image)->GetPitch();
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3270 return true;
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3271 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3272
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3273 case _OrthancPluginService_GetImageBuffer:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3274 {
1599 dd1f9e81f891 fixes to image primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	3275 const _OrthancPluginGetImageInfo& p = reinterpret_cast<const _OrthancPluginGetImageInfo>(parameters);
1843 d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	3276 (p.resultBuffer) = reinterpret_cast<const ImageAccessor>(p.image)->GetBuffer();
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3277 return true;
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3278 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3279
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3280 case _OrthancPluginService_FreeImage:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3281 {
1605 fd0464ce1962 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1604 diff changeset	3282 const _OrthancPluginFreeImage& p = reinterpret_cast<const _OrthancPluginFreeImage>(parameters);
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3283
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3284 if (p.image != NULL)
1609 c74495267acf Implementation of the "GetAllPublicIdsWithLimit" extension Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	3285 {
c74495267acf Implementation of the "GetAllPublicIdsWithLimit" extension Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	3286 delete reinterpret_cast<ImageAccessor*>(p.image);
c74495267acf Implementation of the "GetAllPublicIdsWithLimit" extension Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	3287 }
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3288
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3289 return true;
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3290 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3291
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3292 case _OrthancPluginService_UncompressImage:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3293 UncompressImage(parameters);
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3294 return true;
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3295
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3296 case _OrthancPluginService_CompressImage:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3297 CompressImage(parameters);
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3298 return true;
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3299
1606 31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	3300 case _OrthancPluginService_CallHttpClient:
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	3301 CallHttpClient(parameters);
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	3302 return true;
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	3303
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	3304 case _OrthancPluginService_CallHttpClient2:
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	3305 CallHttpClient2(parameters);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	3306 return true;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	3307
3413 f09bfdea3fc3 rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 3407 diff changeset	3308 case _OrthancPluginService_ChunkedHttpClient:
f09bfdea3fc3 rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 3407 diff changeset	3309 ChunkedHttpClient(parameters);
3387 a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	3310 return true;
a48d652f1500 new function OrthancPluginHttpClientChunkedBody(), new class OrthancPlugins::HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3209 diff changeset	3311
1608 adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	3312 case _OrthancPluginService_ConvertPixelFormat:
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	3313 ConvertPixelFormat(parameters);
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	3314 return true;
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	3315
1613 1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	3316 case _OrthancPluginService_GetFontsCount:
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	3317 {
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	3318 const _OrthancPluginReturnSingleValue& p =
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	3319 reinterpret_cast<const _OrthancPluginReturnSingleValue>(parameters);
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	3320
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	3321 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	3322 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	3323 *(p.resultUint32) = lock.GetConfiguration().GetFontRegistry().GetSize();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	3324 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	3325
1613 1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	3326 return true;
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	3327 }
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	3328
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	3329 case _OrthancPluginService_GetFontInfo:
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	3330 GetFontInfo(parameters);
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	3331 return true;
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	3332
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	3333 case _OrthancPluginService_DrawText:
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	3334 DrawText(parameters);
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	3335 return true;
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	3336
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3337 case _OrthancPluginService_StorageAreaCreate:
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3338 {
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3339 const _OrthancPluginStorageAreaCreate& p =
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3340 reinterpret_cast<const _OrthancPluginStorageAreaCreate>(parameters);
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3341 IStorageArea& storage = reinterpret_cast<IStorageArea>(p.storageArea);
2028 d108412411e5 fix msvc warnings sjodogne parents: 2022 diff changeset	3342 storage.Create(p.uuid, p.content, static_cast<size_t>(p.size), Plugins::Convert(p.type));
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3343 return true;
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3344 }
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3345
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3346 case _OrthancPluginService_StorageAreaRead:
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3347 {
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3348 const _OrthancPluginStorageAreaRead& p =
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3349 reinterpret_cast<const _OrthancPluginStorageAreaRead>(parameters);
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3350 IStorageArea& storage = reinterpret_cast<IStorageArea>(p.storageArea);
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3351 std::string content;
1625 c17b1142caab reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1624 diff changeset	3352 storage.Read(content, p.uuid, Plugins::Convert(p.type));
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3353 CopyToMemoryBuffer(*p.target, content);
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3354 return true;
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3355 }
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3356
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3357 case _OrthancPluginService_StorageAreaRemove:
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3358 {
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3359 const _OrthancPluginStorageAreaRemove& p =
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3360 reinterpret_cast<const _OrthancPluginStorageAreaRemove>(parameters);
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3361 IStorageArea& storage = reinterpret_cast<IStorageArea>(p.storageArea);
1625 c17b1142caab reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1624 diff changeset	3362 storage.Remove(p.uuid, Plugins::Convert(p.type));
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3363 return true;
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3364 }
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	3365
1740 5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	3366 case _OrthancPluginService_DicomBufferToJson:
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	3367 case _OrthancPluginService_DicomInstanceToJson:
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	3368 ApplyDicomToJson(service, parameters);
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	3369 return true;
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	3370
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3371 case _OrthancPluginService_CreateDicom:
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3372 ApplyCreateDicom(service, parameters);
1821 580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	3373 return true;
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	3374
1810 796d0b087fb8 more consistent naming in worklist primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1809 diff changeset	3375 case _OrthancPluginService_WorklistAddAnswer:
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	3376 {
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3377 const _OrthancPluginWorklistAnswersOperation& p =
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3378 reinterpret_cast<const _OrthancPluginWorklistAnswersOperation>(parameters);
1802 138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	3379 reinterpret_cast<const WorklistHandler*>(p.query)->AddAnswer(p.answers, p.dicom, p.size);
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3380 return true;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3381 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3382
1810 796d0b087fb8 more consistent naming in worklist primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1809 diff changeset	3383 case _OrthancPluginService_WorklistMarkIncomplete:
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3384 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3385 const _OrthancPluginWorklistAnswersOperation& p =
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3386 reinterpret_cast<const _OrthancPluginWorklistAnswersOperation>(parameters);
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3387 reinterpret_cast<DicomFindAnswers*>(p.answers)->SetComplete(false);
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3388 return true;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3389 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3390
1810 796d0b087fb8 more consistent naming in worklist primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1809 diff changeset	3391 case _OrthancPluginService_WorklistIsMatch:
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3392 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3393 const _OrthancPluginWorklistQueryOperation& p =
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3394 reinterpret_cast<const _OrthancPluginWorklistQueryOperation>(parameters);
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3395 p.isMatch = reinterpret_cast<const WorklistHandler>(p.query)->IsMatch(p.dicom, p.size);
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3396 return true;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3397 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3398
1810 796d0b087fb8 more consistent naming in worklist primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1809 diff changeset	3399 case _OrthancPluginService_WorklistGetDicomQuery:
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3400 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3401 const _OrthancPluginWorklistQueryOperation& p =
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	3402 reinterpret_cast<const _OrthancPluginWorklistQueryOperation>(parameters);
1812 8e5600e699c0 rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1810 diff changeset	3403 reinterpret_cast<const WorklistHandler>(p.query)->GetDicomQuery(p.target);
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	3404 return true;
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	3405 }
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	3406
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3407 case _OrthancPluginService_FindAddAnswer:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3408 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3409 const _OrthancPluginFindOperation& p =
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3410 reinterpret_cast<const _OrthancPluginFindOperation>(parameters);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3411 reinterpret_cast<DicomFindAnswers*>(p.answers)->Add(p.dicom, p.size);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3412 return true;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3413 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3414
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3415 case _OrthancPluginService_FindMarkIncomplete:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3416 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3417 const _OrthancPluginFindOperation& p =
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3418 reinterpret_cast<const _OrthancPluginFindOperation>(parameters);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3419 reinterpret_cast<DicomFindAnswers*>(p.answers)->SetComplete(false);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3420 return true;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3421 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3422
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3423 case _OrthancPluginService_GetFindQuerySize:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3424 case _OrthancPluginService_GetFindQueryTag:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3425 case _OrthancPluginService_GetFindQueryTagName:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3426 case _OrthancPluginService_GetFindQueryValue:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3427 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3428 const _OrthancPluginFindOperation& p =
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3429 reinterpret_cast<const _OrthancPluginFindOperation>(parameters);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3430 reinterpret_cast<const FindHandler*>(p.query)->Invoke(service, p);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3431 return true;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3432 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3433
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3434 case _OrthancPluginService_CreateImage:
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3435 case _OrthancPluginService_CreateImageAccessor:
1829 31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	3436 case _OrthancPluginService_DecodeDicomImage:
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3437 ApplyCreateImage(service, parameters);
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3438 return true;
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3439
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	3440 case _OrthancPluginService_ComputeMd5:
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	3441 case _OrthancPluginService_ComputeSha1:
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	3442 ComputeHash(service, parameters);
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	3443 return true;
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	3444
1861 a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	3445 case _OrthancPluginService_LookupDictionary:
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	3446 ApplyLookupDictionary(parameters);
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	3447 return true;
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	3448
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	3449 case _OrthancPluginService_GenerateUuid:
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	3450 {
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	3451 reinterpret_cast<const _OrthancPluginRetrieveDynamicString>(parameters)->result =
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	3452 CopyString(Toolbox::GenerateUuid());
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	3453 return true;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	3454 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	3455
2210 7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3456 case _OrthancPluginService_CreateFindMatcher:
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3457 {
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3458 const _OrthancPluginCreateFindMatcher& p =
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3459 reinterpret_cast<const _OrthancPluginCreateFindMatcher>(parameters);
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3460 ParsedDicomFile query(p.query, p.size);
2256 de1ba22fd28a simplification wrt. modality manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	3461 (p.target) = reinterpret_cast<OrthancPluginFindMatcher>(new HierarchicalMatcher(query));
2210 7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3462 return true;
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3463 }
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3464
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3465 case _OrthancPluginService_FreeFindMatcher:
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3466 {
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3467 const _OrthancPluginFreeFindMatcher& p =
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3468 reinterpret_cast<const _OrthancPluginFreeFindMatcher>(parameters);
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3469
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3470 if (p.matcher != NULL)
2210 7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3471 {
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3472 delete reinterpret_cast<HierarchicalMatcher*>(p.matcher);
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3473 }
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3474
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3475 return true;
2210 7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3476 }
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3477
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3478 case _OrthancPluginService_FindMatcherIsMatch:
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3479 {
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3480 const _OrthancPluginFindMatcherIsMatch& p =
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3481 reinterpret_cast<const _OrthancPluginFindMatcherIsMatch>(parameters);
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3482
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3483 if (p.matcher == NULL)
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3484 {
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3485 throw OrthancException(ErrorCode_NullPointer);
2210 7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3486 }
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3487 else
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3488 {
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3489 ParsedDicomFile query(p.dicom, p.size);
2215 028214a95194 refactoring the worklist sample Sebastien Jodogne <s.jodogne@gmail.com> parents: 2210 diff changeset	3490 p.isMatch = reinterpret_cast<const HierarchicalMatcher>(p.matcher)->Match(query) ? 1 : 0;
2210 7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3491 return true;
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3492 }
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3493 }
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	3494
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3495 case _OrthancPluginService_GetPeers:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3496 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3497 const _OrthancPluginGetPeers& p =
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3498 reinterpret_cast<const _OrthancPluginGetPeers>(parameters);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3499 (p.peers) = reinterpret_cast<OrthancPluginPeers>(new OrthancPeers);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3500 return true;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3501 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3502
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3503 case _OrthancPluginService_FreePeers:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3504 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3505 const _OrthancPluginFreePeers& p =
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3506 reinterpret_cast<const _OrthancPluginFreePeers>(parameters);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3507
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3508 if (p.peers != NULL)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3509 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3510 delete reinterpret_cast<OrthancPeers*>(p.peers);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3511 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3512
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3513 return true;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3514 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3515
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3516 case _OrthancPluginService_GetPeersCount:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3517 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3518 const _OrthancPluginGetPeersCount& p =
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3519 reinterpret_cast<const _OrthancPluginGetPeersCount>(parameters);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3520
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3521 if (p.peers == NULL)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3522 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3523 throw OrthancException(ErrorCode_NullPointer);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3524 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3525 else
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3526 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3527 (p.target) = reinterpret_cast<const OrthancPeers>(p.peers)->GetPeersCount();
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3528 return true;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3529 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3530 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3531
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3532 case _OrthancPluginService_GetPeerName:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3533 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3534 const _OrthancPluginGetPeerProperty& p =
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3535 reinterpret_cast<const _OrthancPluginGetPeerProperty>(parameters);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3536
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3537 if (p.peers == NULL)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3538 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3539 throw OrthancException(ErrorCode_NullPointer);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3540 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3541 else
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3542 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3543 (p.target) = reinterpret_cast<const OrthancPeers>(p.peers)->GetPeerName(p.peerIndex).c_str();
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3544 return true;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3545 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3546 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3547
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3548 case _OrthancPluginService_GetPeerUrl:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3549 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3550 const _OrthancPluginGetPeerProperty& p =
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3551 reinterpret_cast<const _OrthancPluginGetPeerProperty>(parameters);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3552
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3553 if (p.peers == NULL)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3554 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3555 throw OrthancException(ErrorCode_NullPointer);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3556 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3557 else
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3558 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3559 (p.target) = reinterpret_cast<const OrthancPeers>(p.peers)->GetPeerParameters(p.peerIndex).GetUrl().c_str();
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3560 return true;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3561 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3562 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3563
2823 807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3564 case _OrthancPluginService_GetPeerUserProperty:
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3565 {
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3566 const _OrthancPluginGetPeerProperty& p =
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3567 reinterpret_cast<const _OrthancPluginGetPeerProperty>(parameters);
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3568
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3569 if (p.peers == NULL \|\|
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3570 p.userProperty == NULL)
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3571 {
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3572 throw OrthancException(ErrorCode_NullPointer);
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3573 }
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3574 else
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3575 {
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3576 const WebServiceParameters::Dictionary& properties =
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3577 reinterpret_cast<const OrthancPeers*>(p.peers)->GetPeerParameters(p.peerIndex).GetUserProperties();
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3578
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3579 WebServiceParameters::Dictionary::const_iterator found =
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3580 properties.find(p.userProperty);
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3581
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3582 if (found == properties.end())
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3583 {
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3584 *(p.target) = NULL;
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3585 }
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3586 else
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3587 {
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3588 *(p.target) = found->second.c_str();
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3589 }
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3590
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3591 return true;
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3592 }
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3593 }
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	3594
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3595 case _OrthancPluginService_CallPeerApi:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3596 CallPeerApi(parameters);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3597 return true;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	3598
2815 925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3599 case _OrthancPluginService_CreateJob:
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3600 {
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3601 const _OrthancPluginCreateJob& p =
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3602 reinterpret_cast<const _OrthancPluginCreateJob>(parameters);
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3603 (p.target) = reinterpret_cast<OrthancPluginJob>(new PluginsJob(p));
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3604 return true;
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3605 }
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3606
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3607 case _OrthancPluginService_FreeJob:
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3608 {
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3609 const _OrthancPluginFreeJob& p =
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3610 reinterpret_cast<const _OrthancPluginFreeJob>(parameters);
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3611
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3612 if (p.job != NULL)
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3613 {
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3614 delete reinterpret_cast<PluginsJob*>(p.job);
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3615 }
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3616
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3617 return true;
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3618 }
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3619
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3620 case _OrthancPluginService_SubmitJob:
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3621 {
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3622 const _OrthancPluginSubmitJob& p =
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3623 reinterpret_cast<const _OrthancPluginSubmitJob>(parameters);
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3624
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3625 std::string uuid;
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3626
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3627 PImpl::ServerContextLock lock(*pimpl_);
2815 925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3628 lock.GetContext().GetJobsEngine().GetRegistry().Submit
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3629 (uuid, reinterpret_cast<PluginsJob*>(p.job), p.priority);
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3630
2814 7d1d3136f6cf more generic handling of content and serialization in plugin jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2813 diff changeset	3631 *p.resultId = CopyString(uuid);
2813 6d5b20af216f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2808 diff changeset	3632
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3633 return true;
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3634 }
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3635
2984 db8f360fcb41 OrthancPluginAutodetectMimeType() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2960 diff changeset	3636 case _OrthancPluginService_AutodetectMimeType:
db8f360fcb41 OrthancPluginAutodetectMimeType() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2960 diff changeset	3637 {
db8f360fcb41 OrthancPluginAutodetectMimeType() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2960 diff changeset	3638 const _OrthancPluginRetrieveStaticString& p =
db8f360fcb41 OrthancPluginAutodetectMimeType() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2960 diff changeset	3639 reinterpret_cast<const _OrthancPluginRetrieveStaticString>(parameters);
db8f360fcb41 OrthancPluginAutodetectMimeType() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2960 diff changeset	3640 *p.result = EnumerationToString(SystemToolbox::AutodetectMimeType(p.argument));
db8f360fcb41 OrthancPluginAutodetectMimeType() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2960 diff changeset	3641 return true;
db8f360fcb41 OrthancPluginAutodetectMimeType() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2960 diff changeset	3642 }
db8f360fcb41 OrthancPluginAutodetectMimeType() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2960 diff changeset	3643
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3644 case _OrthancPluginService_SetMetricsValue:
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3645 {
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3646 const _OrthancPluginSetMetricsValue& p =
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3647 reinterpret_cast<const _OrthancPluginSetMetricsValue>(parameters);
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3648
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3649 MetricsType type;
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3650 switch (p.type)
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3651 {
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3652 case OrthancPluginMetricsType_Default:
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3653 type = MetricsType_Default;
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3654 break;
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3655
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3656 case OrthancPluginMetricsType_Timer:
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3657 type = MetricsType_MaxOver10Seconds;
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3658 break;
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3659
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3660 default:
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3661 throw OrthancException(ErrorCode_ParameterOutOfRange);
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3662 }
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3663
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3664 {
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3665 PImpl::ServerContextLock lock(*pimpl_);
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3666 lock.GetContext().GetMetricsRegistry().SetValue(p.name, p.value, type);
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3667 }
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3668
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3669 return true;
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3670 }
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3671
3205 6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3672 case _OrthancPluginService_EncodeDicomWebJson:
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3673 case _OrthancPluginService_EncodeDicomWebXml:
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3674 {
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3675 const _OrthancPluginEncodeDicomWeb& p =
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3676 reinterpret_cast<const _OrthancPluginEncodeDicomWeb>(parameters);
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3677
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3678 DicomWebBinaryFormatter formatter(p);
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3679
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3680 DicomWebJsonVisitor visitor;
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3681 visitor.SetFormatter(formatter);
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3682
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3683 {
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3684 ParsedDicomFile dicom(p.dicom, p.dicomSize);
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3685 dicom.Apply(visitor);
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3686 }
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3687
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3688 std::string s;
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3689
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3690 if (service == _OrthancPluginService_EncodeDicomWebJson)
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3691 {
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3692 s = visitor.GetResult().toStyledString();
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3693 }
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3694 else
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3695 {
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3696 visitor.FormatXml(s);
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3697 }
3420 0a0e7eca95ae fix encoding in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 3415 diff changeset	3698
3205 6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3699 *p.target = CopyString(s);
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3700 return true;
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3701 }
6c86d4d407da new in plugin sdk: OrthancPluginEncodeDicomWebJson() and OrthancPluginEncodeDicomWebXml() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	3702
3429 954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	3703 case _OrthancPluginService_GetTagName:
954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	3704 GetTagName(parameters);
954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	3705 return true;
954d15f24366 new function in SDK: OrthancPluginGetTagName() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3420 diff changeset	3706
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	3707 default:
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3708 return false;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3709 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3710 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3711
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3712
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3713
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3714 bool OrthancPlugins::InvokeProtectedService(SharedLibrary& plugin,
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3715 _OrthancPluginService service,
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3716 const void* parameters)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3717 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3718 // Services that must be run in mutual exclusion. Guideline:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3719 // Whenever "pimpl_" is directly accessed by the service, it
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3720 // should be listed here.
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3721
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3722 switch (service)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3723 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3724 case _OrthancPluginService_RegisterRestCallback:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3725 RegisterRestCallback(parameters, true);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3726 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3727
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3728 case _OrthancPluginService_RegisterRestCallbackNoLock:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3729 RegisterRestCallback(parameters, false);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3730 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3731
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	3732 case _OrthancPluginService_RegisterChunkedRestCallback:
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	3733 RegisterChunkedRestCallback(parameters);
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	3734 return true;
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	3735
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3736 case _OrthancPluginService_RegisterOnStoredInstanceCallback:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3737 RegisterOnStoredInstanceCallback(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3738 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3739
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3740 case _OrthancPluginService_RegisterOnChangeCallback:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3741 RegisterOnChangeCallback(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3742 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3743
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3744 case _OrthancPluginService_RegisterWorklistCallback:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3745 RegisterWorklistCallback(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3746 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3747
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3748 case _OrthancPluginService_RegisterFindCallback:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3749 RegisterFindCallback(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3750 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3751
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3752 case _OrthancPluginService_RegisterMoveCallback:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3753 RegisterMoveCallback(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3754 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3755
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3756 case _OrthancPluginService_RegisterDecodeImageCallback:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3757 RegisterDecodeImageCallback(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3758 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3759
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3760 case _OrthancPluginService_RegisterJobsUnserializer:
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3761 RegisterJobsUnserializer(parameters);
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3762 return true;
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3763
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3764 case _OrthancPluginService_RegisterIncomingHttpRequestFilter:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3765 RegisterIncomingHttpRequestFilter(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3766 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3767
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3768 case _OrthancPluginService_RegisterIncomingHttpRequestFilter2:
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3769 RegisterIncomingHttpRequestFilter2(parameters);
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3770 return true;
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3771
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3772 case _OrthancPluginService_RegisterRefreshMetricsCallback:
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3773 RegisterRefreshMetricsCallback(parameters);
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3774 return true;
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	3775
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3776 case _OrthancPluginService_RegisterStorageArea:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3777 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3778 LOG(INFO) << "Plugin has registered a custom storage area";
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3779 const _OrthancPluginRegisterStorageArea& p =
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3780 reinterpret_cast<const _OrthancPluginRegisterStorageArea>(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3781
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3782 if (pimpl_->storageArea_.get() == NULL)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3783 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3784 pimpl_->storageArea_.reset(new StorageAreaFactory(plugin, p, GetErrorDictionary()));
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3785 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3786 else
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3787 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3788 throw OrthancException(ErrorCode_StorageAreaAlreadyRegistered);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3789 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3790
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3791 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3792 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3793
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3794 case _OrthancPluginService_SetPluginProperty:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3795 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3796 const _OrthancPluginSetPluginProperty& p =
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3797 reinterpret_cast<const _OrthancPluginSetPluginProperty>(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3798 pimpl_->properties_[std::make_pair(p.plugin, p.property)] = p.value;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3799 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3800 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3801
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3802 case _OrthancPluginService_GetCommandLineArgumentsCount:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3803 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3804 const _OrthancPluginReturnSingleValue& p =
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3805 reinterpret_cast<const _OrthancPluginReturnSingleValue>(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3806 *(p.resultUint32) = pimpl_->argc_ - 1;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3807 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3808 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3809
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3810 case _OrthancPluginService_GetCommandLineArgument:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3811 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3812 const _OrthancPluginGlobalProperty& p =
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3813 reinterpret_cast<const _OrthancPluginGlobalProperty>(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3814
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3815 if (p.property + 1 > pimpl_->argc_)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3816 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3817 return false;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3818 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3819 else
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3820 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3821 std::string arg = std::string(pimpl_->argv_[p.property + 1]);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3822 *(p.result) = CopyString(arg);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3823 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3824 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3825 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3826
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3827 case _OrthancPluginService_RegisterDatabaseBackend:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3828 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3829 LOG(INFO) << "Plugin has registered a custom database back-end";
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3830
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3831 const _OrthancPluginRegisterDatabaseBackend& p =
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3832 reinterpret_cast<const _OrthancPluginRegisterDatabaseBackend>(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3833
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3834 if (pimpl_->database_.get() == NULL)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3835 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3836 pimpl_->database_.reset(new OrthancPluginDatabase(plugin, GetErrorDictionary(),
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3837 *p.backend, NULL, 0, p.payload));
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3838 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3839 else
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3840 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3841 throw OrthancException(ErrorCode_DatabaseBackendAlreadyRegistered);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3842 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3843
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3844 (p.result) = reinterpret_cast<OrthancPluginDatabaseContext>(pimpl_->database_.get());
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3845
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3846 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3847 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3848
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3849 case _OrthancPluginService_RegisterDatabaseBackendV2:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3850 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3851 LOG(INFO) << "Plugin has registered a custom database back-end";
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3852
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3853 const _OrthancPluginRegisterDatabaseBackendV2& p =
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3854 reinterpret_cast<const _OrthancPluginRegisterDatabaseBackendV2>(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3855
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3856 if (pimpl_->database_.get() == NULL)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3857 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3858 pimpl_->database_.reset(new OrthancPluginDatabase(plugin, GetErrorDictionary(),
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3859 *p.backend, p.extensions,
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3860 p.extensionsSize, p.payload));
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3861 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3862 else
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3863 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3864 throw OrthancException(ErrorCode_DatabaseBackendAlreadyRegistered);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3865 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3866
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3867 (p.result) = reinterpret_cast<OrthancPluginDatabaseContext>(pimpl_->database_.get());
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3868
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3869 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3870 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3871
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3872 case _OrthancPluginService_DatabaseAnswer:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3873 throw OrthancException(ErrorCode_InternalError); // Implemented before locking (*)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3874
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3875 case _OrthancPluginService_RegisterErrorCode:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3876 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3877 const _OrthancPluginRegisterErrorCode& p =
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3878 reinterpret_cast<const _OrthancPluginRegisterErrorCode>(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3879 *(p.target) = pimpl_->dictionary_.Register(plugin, p.code, p.httpStatus, p.message);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3880 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3881 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3882
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3883 case _OrthancPluginService_RegisterDictionaryTag:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3884 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3885 const _OrthancPluginRegisterDictionaryTag& p =
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3886 reinterpret_cast<const _OrthancPluginRegisterDictionaryTag>(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3887 FromDcmtkBridge::RegisterDictionaryTag(DicomTag(p.group, p.element),
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3888 Plugins::Convert(p.vr), p.name,
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	3889 p.minMultiplicity, p.maxMultiplicity, "");
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	3890 return true;
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	3891 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	3892
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	3893 case _OrthancPluginService_RegisterPrivateDictionaryTag:
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	3894 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	3895 const _OrthancPluginRegisterPrivateDictionaryTag& p =
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	3896 reinterpret_cast<const _OrthancPluginRegisterPrivateDictionaryTag>(parameters);
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	3897 FromDcmtkBridge::RegisterDictionaryTag(DicomTag(p.group, p.element),
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	3898 Plugins::Convert(p.vr), p.name,
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	3899 p.minMultiplicity, p.maxMultiplicity, p.privateCreator);
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3900 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3901 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3902
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3903 case _OrthancPluginService_ReconstructMainDicomTags:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3904 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3905 const _OrthancPluginReconstructMainDicomTags& p =
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3906 reinterpret_cast<const _OrthancPluginReconstructMainDicomTags>(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3907
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3908 if (pimpl_->database_.get() == NULL)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3909 {
2956 bfee0b9f3209 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	3910 throw OrthancException(ErrorCode_DatabasePlugin,
bfee0b9f3209 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	3911 "The service ReconstructMainDicomTags can only be invoked by custom database plugins");
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3912 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3913
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3914 IStorageArea& storage = reinterpret_cast<IStorageArea>(p.storageArea);
2120 4b02ec79728a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	3915 ServerToolbox::ReconstructMainDicomTags(*pimpl_->database_, storage, Plugins::Convert(p.level));
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3916
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3917 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3918 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3919
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3920 default:
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3921 {
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3922 // This service is unknown to the Orthanc plugin engine
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	3923 return false;
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3924 }
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	3925 }
bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	3926 }
bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	3927
908 e078ea944089 refactoring HttpOutput Sebastien Jodogne <s.jodogne@gmail.com> parents: 907 diff changeset	3928
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3929
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3930 bool OrthancPlugins::InvokeService(SharedLibrary& plugin,
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3931 _OrthancPluginService service,
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3932 const void* parameters)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3933 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3934 VLOG(1) << "Calling service " << service << " from plugin " << plugin.GetPath();
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3935
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3936 if (service == _OrthancPluginService_DatabaseAnswer)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3937 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3938 // This case solves a deadlock at (*) reported by James Webster
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3939 // on 2015-10-27 that was present in versions of Orthanc <=
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3940 // 0.9.4 and related to database plugins implementing a custom
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3941 // index. The problem was that locking the database is already
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3942 // ensured by the "ServerIndex" class if the invoked service is
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3943 // "DatabaseAnswer".
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3944 DatabaseAnswer(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3945 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3946 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3947
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3948 if (InvokeSafeService(plugin, service, parameters))
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3949 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3950 // The invoked service does not require locking
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3951 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3952 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3953 else
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3954 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3955 // The invoked service requires locking
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3956 boost::recursive_mutex::scoped_lock lock(pimpl_->invokeServiceMutex_); // (*)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3957 return InvokeProtectedService(plugin, service, parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3958 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3959 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3960
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3961
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3962 bool OrthancPlugins::HasStorageArea() const
67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3963 {
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3964 boost::recursive_mutex::scoped_lock lock(pimpl_->invokeServiceMutex_);
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	3965 return pimpl_->storageArea_.get() != NULL;
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3966 }
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	3967
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	3968 bool OrthancPlugins::HasDatabaseBackend() const
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	3969 {
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3970 boost::recursive_mutex::scoped_lock lock(pimpl_->invokeServiceMutex_);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	3971 return pimpl_->database_.get() != NULL;
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	3972 }
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	3973
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3974
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	3975 IStorageArea* OrthancPlugins::CreateStorageArea()
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3976 {
67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3977 if (!HasStorageArea())
67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3978 {
67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3979 throw OrthancException(ErrorCode_BadSequenceOfCalls);
67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3980 }
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	3981 else
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	3982 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	3983 return pimpl_->storageArea_->Create();
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	3984 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	3985 }
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3986
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	3987
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	3988 const SharedLibrary& OrthancPlugins::GetStorageAreaLibrary() const
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	3989 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	3990 if (!HasStorageArea())
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	3991 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	3992 throw OrthancException(ErrorCode_BadSequenceOfCalls);
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	3993 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	3994 else
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	3995 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	3996 return pimpl_->storageArea_->GetSharedLibrary();
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	3997 }
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3998 }
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	3999
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	4000
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	4001 IDatabaseWrapper& OrthancPlugins::GetDatabaseBackend()
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	4002 {
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	4003 if (!HasDatabaseBackend())
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	4004 {
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	4005 throw OrthancException(ErrorCode_BadSequenceOfCalls);
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	4006 }
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	4007 else
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	4008 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	4009 return *pimpl_->database_;
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	4010 }
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	4011 }
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	4012
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	4013
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	4014 const SharedLibrary& OrthancPlugins::GetDatabaseBackendLibrary() const
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	4015 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	4016 if (!HasDatabaseBackend())
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	4017 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	4018 throw OrthancException(ErrorCode_BadSequenceOfCalls);
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	4019 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	4020 else
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	4021 {
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	4022 return pimpl_->database_->GetSharedLibrary();
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	4023 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1628 diff changeset	4024 }
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	4025
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	4026
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	4027 const char* OrthancPlugins::GetProperty(const char* plugin,
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	4028 _OrthancPluginProperty property) const
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	4029 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	4030 PImpl::Property p = std::make_pair(plugin, property);
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	4031 PImpl::Properties::const_iterator it = pimpl_->properties_.find(p);
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	4032
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	4033 if (it == pimpl_->properties_.end())
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	4034 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	4035 return NULL;
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	4036 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	4037 else
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	4038 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	4039 return it->second.c_str();
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	4040 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	4041 }
1280 d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	4042
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	4043
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	4044 void OrthancPlugins::SetCommandLineArguments(int argc, char* argv[])
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	4045 {
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	4046 if (argc < 1 \|\| argv == NULL)
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	4047 {
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	4048 throw OrthancException(ErrorCode_ParameterOutOfRange);
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	4049 }
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	4050
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	4051 pimpl_->argc_ = argc;
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	4052 pimpl_->argv_ = argv;
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	4053 }
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	4054
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	4055
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	4056 PluginsManager& OrthancPlugins::GetManager()
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	4057 {
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	4058 return pimpl_->manager_;
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	4059 }
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	4060
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	4061
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	4062 const PluginsManager& OrthancPlugins::GetManager() const
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	4063 {
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	4064 return pimpl_->manager_;
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	4065 }
1644 939b921b2c81 plugin error dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1643 diff changeset	4066
939b921b2c81 plugin error dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1643 diff changeset	4067
939b921b2c81 plugin error dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1643 diff changeset	4068 PluginsErrorDictionary& OrthancPlugins::GetErrorDictionary()
939b921b2c81 plugin error dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1643 diff changeset	4069 {
939b921b2c81 plugin error dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1643 diff changeset	4070 return pimpl_->dictionary_;
939b921b2c81 plugin error dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1643 diff changeset	4071 }
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	4072
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	4073
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	4074 IWorklistRequestHandler* OrthancPlugins::ConstructWorklistRequestHandler()
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	4075 {
1809 5ed8769b17f9 disable worklist support if no plugin has registered callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	4076 if (HasWorklistHandler())
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	4077 {
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	4078 return new WorklistHandler(*this);
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	4079 }
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	4080 else
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	4081 {
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	4082 return NULL;
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	4083 }
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	4084 }
1809 5ed8769b17f9 disable worklist support if no plugin has registered callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	4085
5ed8769b17f9 disable worklist support if no plugin has registered callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	4086
5ed8769b17f9 disable worklist support if no plugin has registered callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	4087 bool OrthancPlugins::HasWorklistHandler()
5ed8769b17f9 disable worklist support if no plugin has registered callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	4088 {
1825 f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	4089 boost::mutex::scoped_lock lock(pimpl_->worklistCallbackMutex_);
f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	4090 return pimpl_->worklistCallback_ != NULL;
1809 5ed8769b17f9 disable worklist support if no plugin has registered callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	4091 }
5ed8769b17f9 disable worklist support if no plugin has registered callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	4092
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	4093
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	4094 IFindRequestHandler* OrthancPlugins::ConstructFindRequestHandler()
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	4095 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	4096 if (HasFindHandler())
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	4097 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	4098 return new FindHandler(*this);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	4099 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	4100 else
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	4101 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	4102 return NULL;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	4103 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	4104 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	4105
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	4106
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	4107 bool OrthancPlugins::HasFindHandler()
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	4108 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	4109 boost::mutex::scoped_lock lock(pimpl_->findCallbackMutex_);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	4110 return pimpl_->findCallback_ != NULL;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	4111 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	4112
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	4113
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	4114 IMoveRequestHandler* OrthancPlugins::ConstructMoveRequestHandler()
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	4115 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	4116 if (HasMoveHandler())
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	4117 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	4118 return new MoveHandler(*this);
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	4119 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	4120 else
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	4121 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	4122 return NULL;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	4123 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	4124 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	4125
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	4126
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	4127 bool OrthancPlugins::HasMoveHandler()
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	4128 {
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	4129 boost::recursive_mutex::scoped_lock lock(pimpl_->invokeServiceMutex_);
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	4130 return pimpl_->moveCallbacks_.callback != NULL;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	4131 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	4132
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	4133
1906 d7c1cb559431 optimization for multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	4134 bool OrthancPlugins::HasCustomImageDecoder()
d7c1cb559431 optimization for multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	4135 {
d7c1cb559431 optimization for multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	4136 boost::mutex::scoped_lock lock(pimpl_->decodeImageCallbackMutex_);
2012 50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4137 return !pimpl_->decodeImageCallbacks_.empty();
1906 d7c1cb559431 optimization for multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	4138 }
d7c1cb559431 optimization for multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	4139
d7c1cb559431 optimization for multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	4140
2012 50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4141 ImageAccessor* OrthancPlugins::DecodeUnsafe(const void* dicom,
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4142 size_t size,
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4143 unsigned int frame)
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	4144 {
2012 50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4145 boost::mutex::scoped_lock lock(pimpl_->decodeImageCallbackMutex_);
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4146
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4147 for (PImpl::DecodeImageCallbacks::const_iterator
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4148 decoder = pimpl_->decodeImageCallbacks_.begin();
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4149 decoder != pimpl_->decodeImageCallbacks_.end(); ++decoder)
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	4150 {
2012 50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4151 OrthancPluginImage* pluginImage = NULL;
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4152 if ((*decoder) (&pluginImage, dicom, size, frame) == OrthancPluginErrorCode_Success &&
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4153 pluginImage != NULL)
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	4154 {
2012 50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4155 return reinterpret_cast<ImageAccessor*>(pluginImage);
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	4156 }
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	4157 }
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	4158
2012 50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4159 return NULL;
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4160 }
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4161
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4162
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4163 ImageAccessor* OrthancPlugins::Decode(const void* dicom,
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4164 size_t size,
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4165 unsigned int frame)
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4166 {
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4167 ImageAccessor* result = DecodeUnsafe(dicom, size, frame);
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4168
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4169 if (result != NULL)
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4170 {
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4171 return result;
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4172 }
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4173 else
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4174 {
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4175 LOG(INFO) << "The installed image decoding plugins cannot handle an image, fallback to the built-in decoder";
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4176 DefaultDicomImageDecoder defaultDecoder;
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4177 return defaultDecoder.Decode(dicom, size, frame);
50b9bc19dc62 More than one custom image decoder can be installed (e.g. to handle different transfer syntaxes) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	4178 }
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	4179 }
1961 ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4180
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	4181
1961 ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4182 bool OrthancPlugins::IsAllowed(HttpMethod method,
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4183 const char* uri,
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4184 const char* ip,
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4185 const char* username,
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4186 const IHttpHandler::Arguments& httpHeaders,
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	4187 const IHttpHandler::GetArguments& getArguments)
1961 ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4188 {
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4189 OrthancPluginHttpMethod cMethod = Plugins::Convert(method);
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4190
1962 22ddb22fce83 sample plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1961 diff changeset	4191 std::vector<const char*> httpKeys(httpHeaders.size());
22ddb22fce83 sample plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1961 diff changeset	4192 std::vector<const char*> httpValues(httpHeaders.size());
1961 ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4193
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4194 size_t pos = 0;
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4195 for (IHttpHandler::Arguments::const_iterator
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4196 it = httpHeaders.begin(); it != httpHeaders.end(); ++it, pos++)
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4197 {
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4198 httpKeys[pos] = it->first.c_str();
1962 22ddb22fce83 sample plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1961 diff changeset	4199 httpValues[pos] = it->second.c_str();
1961 ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4200 }
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4201
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4202 std::vector<const char*> getKeys(getArguments.size());
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4203 std::vector<const char*> getValues(getArguments.size());
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4204
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4205 for (size_t i = 0; i < getArguments.size(); i++)
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4206 {
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4207 getKeys[i] = getArguments[i].first.c_str();
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4208 getValues[i] = getArguments[i].second.c_str();
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4209 }
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4210
2354 415450f11cc7 rename Orthanc 1.2.1 as 1.3.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	4211 // Improved callback with support for GET arguments, since Orthanc 1.3.0
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4212 for (PImpl::IncomingHttpRequestFilters2::const_iterator
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4213 filter = pimpl_->incomingHttpRequestFilters2_.begin();
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4214 filter != pimpl_->incomingHttpRequestFilters2_.end(); ++filter)
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4215 {
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4216 int32_t allowed = (*filter) (cMethod, uri, ip,
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4217 httpKeys.size(),
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4218 httpKeys.empty() ? NULL : &httpKeys[0],
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4219 httpValues.empty() ? NULL : &httpValues[0],
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4220 getKeys.size(),
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4221 getKeys.empty() ? NULL : &getKeys[0],
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4222 getValues.empty() ? NULL : &getValues[0]);
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4223
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4224 if (allowed == 0)
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4225 {
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4226 return false;
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4227 }
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4228 else if (allowed != 1)
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4229 {
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4230 // The callback is only allowed to answer 0 or 1
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4231 throw OrthancException(ErrorCode_Plugin);
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4232 }
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4233 }
1961 ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4234
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4235 for (PImpl::IncomingHttpRequestFilters::const_iterator
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4236 filter = pimpl_->incomingHttpRequestFilters_.begin();
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4237 filter != pimpl_->incomingHttpRequestFilters_.end(); ++filter)
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4238 {
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4239 int32_t allowed = (*filter) (cMethod, uri, ip, httpKeys.size(),
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4240 httpKeys.empty() ? NULL : &httpKeys[0],
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4241 httpValues.empty() ? NULL : &httpValues[0]);
1961 ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4242
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4243 if (allowed == 0)
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4244 {
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4245 return false;
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4246 }
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4247 else if (allowed != 1)
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4248 {
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4249 // The callback is only allowed to answer 0 or 1
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4250 throw OrthancException(ErrorCode_Plugin);
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	4251 }
1961 ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4252 }
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4253
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4254 return true;
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	4255 }
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	4256
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	4257
2815 925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	4258 IJob* OrthancPlugins::UnserializeJob(const std::string& type,
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	4259 const Json::Value& value)
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	4260 {
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	4261 const std::string serialized = value.toStyledString();
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	4262
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	4263 boost::mutex::scoped_lock lock(pimpl_->jobsUnserializersMutex_);
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	4264
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	4265 for (PImpl::JobsUnserializers::iterator
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	4266 unserializer = pimpl_->jobsUnserializers_.begin();
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	4267 unserializer != pimpl_->jobsUnserializers_.end(); ++unserializer)
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	4268 {
2815 925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	4269 OrthancPluginJob* job = (*unserializer) (type.c_str(), serialized.c_str());
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	4270 if (job != NULL)
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	4271 {
2815 925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	4272 return reinterpret_cast<PluginsJob*>(job);
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	4273 }
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	4274 }
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	4275
2815 925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	4276 return NULL;
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	4277 }
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	4278
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	4279
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	4280 void OrthancPlugins::RefreshMetrics()
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	4281 {
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	4282 boost::mutex::scoped_lock lock(pimpl_->refreshMetricsMutex_);
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	4283
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	4284 for (PImpl::RefreshMetricsCallbacks::iterator
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	4285 it = pimpl_->refreshMetricsCallbacks_.begin();
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	4286 it != pimpl_->refreshMetricsCallbacks_.end(); ++it)
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	4287 {
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	4288 if (*it != NULL)
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	4289 {
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	4290 (*it) ();
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	4291 }
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	4292 }
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3120 diff changeset	4293 }
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3393 diff changeset	4294
0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3393 diff changeset	4295
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4296 class OrthancPlugins::HttpServerChunkedReader : public IHttpHandler::IChunkedRequestReader
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4297 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4298 private:
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4299 OrthancPluginServerChunkedRequestReader* reader_;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4300 _OrthancPluginChunkedRestCallback parameters_;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4301 PluginsErrorDictionary& errorDictionary_;
3399 4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3397 diff changeset	4302
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4303 public:
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4304 HttpServerChunkedReader(OrthancPluginServerChunkedRequestReader* reader,
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4305 const _OrthancPluginChunkedRestCallback& parameters,
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4306 PluginsErrorDictionary& errorDictionary) :
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4307 reader_(reader),
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4308 parameters_(parameters),
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4309 errorDictionary_(errorDictionary)
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4310 {
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4311 assert(reader_ != NULL);
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4312 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4313
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4314 virtual ~HttpServerChunkedReader()
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4315 {
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4316 assert(reader_ != NULL);
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4317 parameters_.finalize(reader_);
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4318 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4319
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4320 virtual void AddBodyChunk(const void* data,
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4321 size_t size)
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4322 {
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4323 if (static_cast<uint32_t>(size) != size)
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4324 {
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4325 throw OrthancException(ErrorCode_NotEnoughMemory, ERROR_MESSAGE_64BIT);
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4326 }
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4327
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4328 assert(reader_ != NULL);
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4329 parameters_.addChunk(reader_, data, size);
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4330 }
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4331
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4332 virtual void Execute(HttpOutput& output)
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4333 {
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4334 assert(reader_ != NULL);
3399 4e8205871967 OrthancPluginRegisterMultipartRestCallback() is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3397 diff changeset	4335
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4336 PImpl::PluginHttpOutput pluginOutput(output);
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4337
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4338 OrthancPluginErrorCode error = parameters_.execute(
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4339 reader_, reinterpret_cast<OrthancPluginRestOutput*>(&pluginOutput));
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4340
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4341 pluginOutput.Close(error, errorDictionary_);
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4342 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4343 };
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4344
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4345
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4346 bool OrthancPlugins::CreateChunkedRequestReader(std::auto_ptr<IChunkedRequestReader>& target,
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4347 RequestOrigin origin,
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4348 const char* remoteIp,
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4349 const char* username,
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4350 HttpMethod method,
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4351 const UriComponents& uri,
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4352 const Arguments& headers)
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3393 diff changeset	4353 {
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4354 if (method != HttpMethod_Post &&
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4355 method != HttpMethod_Put)
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4356 {
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4357 throw OrthancException(ErrorCode_InternalError);
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4358 }
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4359
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4360 RestCallbackMatcher matcher(uri);
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4361
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4362 PImpl::ChunkedRestCallback* callback = NULL;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4363
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4364 // Loop over the callbacks registered by the plugins
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4365 for (PImpl::ChunkedRestCallbacks::const_iterator it = pimpl_->chunkedRestCallbacks_.begin();
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4366 it != pimpl_->chunkedRestCallbacks_.end(); ++it)
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4367 {
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4368 if (matcher.IsMatch((*it)->GetRegularExpression()))
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4369 {
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4370 callback = *it;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4371 break;
3396 4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4372 }
4981405e6c5c new sdk: OrthancPluginRegisterMultipartRestCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3395 diff changeset	4373 }
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3393 diff changeset	4374
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4375 if (callback == NULL)
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4376 {
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4377 // Callback not found
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4378 return false;
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4379 }
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4380 else
b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4381 {
3415 2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4382 OrthancPluginServerChunkedRequestReaderFactory handler;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4383
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4384 switch (method)
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4385 {
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4386 case HttpMethod_Post:
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4387 handler = callback->GetParameters().postHandler;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4388 break;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4389
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4390 case HttpMethod_Put:
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4391 handler = callback->GetParameters().putHandler;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4392 break;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4393
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4394 default:
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4395 handler = NULL;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4396 break;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4397 }
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4398
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4399 if (handler == NULL)
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4400 {
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4401 return false;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4402 }
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4403 else
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4404 {
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4405 LOG(INFO) << "Delegating chunked HTTP request to plugin for URI: " << matcher.GetFlatUri();
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4406
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4407 HttpRequestConverter converter(matcher, method, headers);
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4408 converter.GetRequest().body = NULL;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4409 converter.GetRequest().bodySize = 0;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4410
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4411 OrthancPluginServerChunkedRequestReader* reader = NULL;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4412
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4413 OrthancPluginErrorCode errorCode = handler(
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4414 &reader, matcher.GetFlatUri().c_str(), &converter.GetRequest());
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4415
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4416 if (reader == NULL)
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4417 {
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4418 // The plugin has not created a reader for chunked body
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4419 return false;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4420 }
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4421 else if (errorCode != OrthancPluginErrorCode_Success)
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4422 {
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4423 throw OrthancException(static_cast<ErrorCode>(errorCode));
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4424 }
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4425 else
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4426 {
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4427 target.reset(new HttpServerChunkedReader(reader, callback->GetParameters(), GetErrorDictionary()));
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4428 return true;
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4429 }
2a821deece64 refactoring to handle "not allowed" HTTP status 405 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3414 diff changeset	4430 }
3414 b9cba6a91780 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3413 diff changeset	4431 }
3395 0ce9b4f5fdf5 new abstraction: IHttpHandler::CreateStreamHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3393 diff changeset	4432 }
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4433 }

Mercurial > hg > orthanc

annotate Plugins/Engine/OrthancPlugins.cpp @ 3503:46cf170ba121