orthanc: Plugins/Engine/OrthancPlugins.cpp annotate

annotate Plugins/Engine/OrthancPlugins.cpp @ 2823:807169f85ba9

OrthancPluginGetPeerUserProperty()

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 18 Sep 2018 15:38:18 +0200
parents	3e048b243d20
children	d4fd4614f275

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
2447 878b59270859 upgrade to year 2018 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	5 * Copyright (C) 2017-2018 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
eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1630 diff changeset	41
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	42 #include "../../Core/ChunkedBuffer.h"
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	43 #include "../../Core/DicomFormat/DicomArray.h"
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	44 #include "../../Core/HttpServer/HttpToolbox.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1466 diff changeset	45 #include "../../Core/Logging.h"
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	46 #include "../../Core/OrthancException.h"
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	47 #include "../../Core/SerializationToolbox.h"
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	48 #include "../../Core/Toolbox.h"
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2354 diff changeset	49 #include "../../Core/DicomParsing/FromDcmtkBridge.h"
7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2354 diff changeset	50 #include "../../Core/DicomParsing/ToDcmtkBridge.h"
1145 0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	51 #include "../../OrthancServer/OrthancInitialization.h"
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	52 #include "../../OrthancServer/ServerContext.h"
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	53 #include "../../OrthancServer/ServerToolbox.h"
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	54 #include "../../OrthancServer/Search/HierarchicalMatcher.h"
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2354 diff changeset	55 #include "../../Core/DicomParsing/Internals/DicomImageDecoder.h"
1554 89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	56 #include "../../Core/Compression/ZlibCompressor.h"
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	57 #include "../../Core/Compression/GzipCompressor.h"
1612 96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1609 diff changeset	58 #include "../../Core/Images/Image.h"
96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1609 diff changeset	59 #include "../../Core/Images/PngReader.h"
96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1609 diff changeset	60 #include "../../Core/Images/PngWriter.h"
96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1609 diff changeset	61 #include "../../Core/Images/JpegReader.h"
96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1609 diff changeset	62 #include "../../Core/Images/JpegWriter.h"
96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1609 diff changeset	63 #include "../../Core/Images/ImageProcessing.h"
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	64 #include "../../OrthancServer/DefaultDicomImageDecoder.h"
1625 c17b1142caab reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1624 diff changeset	65 #include "PluginsEnumerations.h"
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	66 #include "PluginsJob.h"
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68 #include <boost/regex.hpp>
1861 a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	69 #include <dcmtk/dcmdata/dcdict.h>
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	70 #include <dcmtk/dcmdata/dcdicent.h>
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	72 namespace Orthanc
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73 {
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	74 static void CopyToMemoryBuffer(OrthancPluginMemoryBuffer& target,
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	75 const void* data,
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	76 size_t size)
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	77 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	78 target.size = size;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	79
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	80 if (size == 0)
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	81 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	82 target.data = NULL;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	83 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	84 else
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	85 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	86 target.data = malloc(size);
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	87 if (target.data != NULL)
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	88 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	89 memcpy(target.data, data, size);
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	90 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	91 else
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 throw OrthancException(ErrorCode_NotEnoughMemory);
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 }
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
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 static void CopyToMemoryBuffer(OrthancPluginMemoryBuffer& target,
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	100 const std::string& str)
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 if (str.size() == 0)
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 target.size = 0;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	105 target.data = NULL;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	106 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	107 else
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 CopyToMemoryBuffer(target, str.c_str(), str.size());
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
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	113
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	114 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	115 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	116 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	117 if (result == NULL)
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	118 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	119 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	120 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	121
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	122 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	123 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	124 result[0] = '\0';
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	125 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	126 else
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	127 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	128 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	129 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	130
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	131 return result;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	132 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	133
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	134
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	135 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	136 {
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	137 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	138 {
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	139 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	140 _OrthancPluginRegisterStorageArea callbacks_;
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	141 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	142
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	143 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	144 {
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	145 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	146 {
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	147 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	148 }
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	149 }
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	150
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	151 public:
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	152 PluginStorageArea(const _OrthancPluginRegisterStorageArea& callbacks,
2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	153 PluginsErrorDictionary& errorDictionary) :
2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	154 callbacks_(callbacks),
2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	155 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	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 }
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
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	159
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 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	161 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	162 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	163 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	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 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	166 (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	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 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	169 {
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	170 errorDictionary_.LogError(error, true);
1646 da799f767e5d simplification in error casting with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	171 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	172 }
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	173 }
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 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	177 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	178 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	179 {
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 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	181 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	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_.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	184 (&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	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 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	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 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	195 }
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 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	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 Free(buffer);
1643 87c77b9b3679 provision for error codes in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	199 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	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
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 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	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 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	205 }
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	206
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	207 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	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
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 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	212 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	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 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	215 (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	216
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	217 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	218 {
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	219 errorDictionary_.LogError(error, true);
1646 da799f767e5d simplification in error casting with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	220 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	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 }
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
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 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	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 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	229 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	230 _OrthancPluginRegisterStorageArea callbacks_;
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	231 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	232
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 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	234 StorageAreaFactory(SharedLibrary& sharedLibrary,
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	235 const _OrthancPluginRegisterStorageArea& callbacks,
2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	236 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	237 sharedLibrary_(sharedLibrary),
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	238 callbacks_(callbacks),
2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	239 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	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 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	244 {
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 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	246 }
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
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 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	249 {
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	250 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	251 }
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 };
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	253
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	254
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	255 class OrthancPeers : public boost::noncopyable
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	256 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	257 private:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	258 std::vector<std::string> names_;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	259 std::vector<WebServiceParameters> parameters_;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	260
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	261 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	262 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	263 assert(names_.size() == parameters_.size());
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	264 if (i >= names_.size())
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	265 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	266 throw OrthancException(ErrorCode_ParameterOutOfRange);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	267 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	268 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	269
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	270 public:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	271 OrthancPeers()
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 std::set<std::string> peers;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	274 Configuration::GetListOfOrthancPeers(peers);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	275
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	276 names_.reserve(peers.size());
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	277 parameters_.reserve(peers.size());
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 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	280 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	281 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	282 WebServiceParameters peer;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	283 if (Configuration::GetOrthancPeer(peer, *it))
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	284 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	285 names_.push_back(*it);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	286 parameters_.push_back(peer);
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 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	289 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	290
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	291 size_t GetPeersCount() const
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	292 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	293 return names_.size();
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	294 }
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 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	297 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	298 CheckIndex(i);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	299 return names_[i];
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	300 }
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 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	303 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	304 CheckIndex(i);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	305 return parameters_[i];
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	306 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	307 };
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	308 }
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	309
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	310
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	311 class OrthancPlugins::PImpl
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	312 {
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	313 private:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	314 boost::mutex contextMutex_;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	315 ServerContext* context_;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	316
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	317
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	318 public:
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	319 class RestCallback : public boost::noncopyable
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	320 {
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	321 private:
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	322 boost::regex regex_;
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	323 OrthancPluginRestCallback callback_;
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	324 bool lock_;
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	325
1628 77c4cc4def0f OrthancPluginErrorCode in REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1627 diff changeset	326 OrthancPluginErrorCode InvokeInternal(HttpOutput& output,
77c4cc4def0f OrthancPluginErrorCode in REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1627 diff changeset	327 const std::string& flatUri,
77c4cc4def0f OrthancPluginErrorCode in REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1627 diff changeset	328 const OrthancPluginHttpRequest& request)
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	329 {
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	330 return callback_(reinterpret_cast<OrthancPluginRestOutput*>(&output),
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	331 flatUri.c_str(),
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	332 &request);
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	333 }
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	334
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	335 public:
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	336 RestCallback(const char* regex,
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	337 OrthancPluginRestCallback callback,
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	338 bool lockRestCallbacks) :
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	339 regex_(regex),
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	340 callback_(callback),
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	341 lock_(lockRestCallbacks)
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	342 {
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	343 }
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	344
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	345 const boost::regex& GetRegularExpression() const
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	346 {
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	347 return regex_;
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	348 }
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	349
1628 77c4cc4def0f OrthancPluginErrorCode in REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1627 diff changeset	350 OrthancPluginErrorCode Invoke(boost::recursive_mutex& restCallbackMutex,
77c4cc4def0f OrthancPluginErrorCode in REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1627 diff changeset	351 HttpOutput& output,
77c4cc4def0f OrthancPluginErrorCode in REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1627 diff changeset	352 const std::string& flatUri,
77c4cc4def0f OrthancPluginErrorCode in REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1627 diff changeset	353 const OrthancPluginHttpRequest& request)
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	354 {
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	355 if (lock_)
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	356 {
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	357 boost::recursive_mutex::scoped_lock lock(restCallbackMutex);
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	358 return InvokeInternal(output, flatUri, request);
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	359 }
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	360 else
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	361 {
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	362 return InvokeInternal(output, flatUri, request);
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	363 }
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	364 }
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	365 };
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	366
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	367
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	368 class ServerContextLock
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	369 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	370 private:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	371 boost::mutex::scoped_lock lock_;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	372 ServerContext* context_;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	373
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	374 public:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	375 ServerContextLock(PImpl& that) :
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	376 lock_(that.contextMutex_),
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	377 context_(that.context_)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	378 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	379 if (context_ == NULL)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	380 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	381 throw OrthancException(ErrorCode_DatabaseNotInitialized);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	382 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	383 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	384
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	385 ServerContext& GetContext()
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	386 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	387 assert(context_ != NULL);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	388 return *context_;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	389 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	390 };
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	391
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	392
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	393 void SetServerContext(ServerContext* context)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	394 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	395 boost::mutex::scoped_lock(contextMutex_);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	396 context_ = context;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	397 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	398
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	399
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	400 typedef std::pair<std::string, _OrthancPluginProperty> Property;
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	401 typedef std::list<RestCallback*> RestCallbacks;
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	402 typedef std::list<OrthancPluginOnStoredInstanceCallback> OnStoredCallbacks;
a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	403 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	404 typedef std::list<OrthancPluginIncomingHttpRequestFilter> IncomingHttpRequestFilters;
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	405 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	406 typedef std::list<OrthancPluginDecodeImageCallback> DecodeImageCallbacks;
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	407 typedef std::list<OrthancPluginJobsUnserializer> JobsUnserializers;
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	408 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	409
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	410 PluginsManager manager_;
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	411
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	412 RestCallbacks restCallbacks_;
a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	413 OnStoredCallbacks onStoredCallbacks_;
a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	414 OnChangeCallbacks onChangeCallbacks_;
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	415 OrthancPluginFindCallback findCallback_;
1825 f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	416 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	417 DecodeImageCallbacks decodeImageCallbacks_;
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	418 JobsUnserializers jobsUnserializers_;
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	419 _OrthancPluginMoveCallback moveCallbacks_;
1961 ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	420 IncomingHttpRequestFilters incomingHttpRequestFilters_;
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	421 IncomingHttpRequestFilters2 incomingHttpRequestFilters2_;
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	422 std::auto_ptr<StorageAreaFactory> storageArea_;
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	423
1466 0cd0f2ad3599 Fix potential deadlock in the callbacks of plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	424 boost::recursive_mutex restCallbackMutex_;
0cd0f2ad3599 Fix potential deadlock in the callbacks of plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	425 boost::recursive_mutex storedCallbackMutex_;
0cd0f2ad3599 Fix potential deadlock in the callbacks of plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	426 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	427 boost::mutex findCallbackMutex_;
1825 f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	428 boost::mutex worklistCallbackMutex_;
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	429 boost::mutex decodeImageCallbackMutex_;
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	430 boost::mutex jobsUnserializersMutex_;
1553 7c4b487b3b4a ensure mutual exclusion in InvokeService Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	431 boost::recursive_mutex invokeServiceMutex_;
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	432
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	433 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	434 int argc_;
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	435 char** argv_;
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	436 std::auto_ptr<OrthancPluginDatabase> database_;
1644 939b921b2c81 plugin error dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1643 diff changeset	437 PluginsErrorDictionary dictionary_;
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	438
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	439 PImpl() :
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	440 context_(NULL),
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	441 findCallback_(NULL),
1825 f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	442 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	443 argc_(1),
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	444 argv_(NULL)
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	445 {
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	446 memset(&moveCallbacks_, 0, sizeof(moveCallbacks_));
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	447 }
a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	448 };
a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	449
a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	450
a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	451
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	452 class OrthancPlugins::WorklistHandler : public IWorklistRequestHandler
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	453 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	454 private:
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	455 OrthancPlugins& that_;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	456 std::auto_ptr<HierarchicalMatcher> matcher_;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	457 ParsedDicomFile* currentQuery_;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	458
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	459 void Reset()
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	460 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	461 matcher_.reset(NULL);
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	462 currentQuery_ = NULL;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	463 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	464
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	465 public:
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	466 WorklistHandler(OrthancPlugins& that) : that_(that)
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	467 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	468 Reset();
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	469 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	470
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	471 virtual void Handle(DicomFindAnswers& answers,
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	472 ParsedDicomFile& query,
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	473 const std::string& remoteIp,
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	474 const std::string& remoteAet,
2256 de1ba22fd28a simplification wrt. modality manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	475 const std::string& calledAet,
de1ba22fd28a simplification wrt. modality manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	476 ModalityManufacturer manufacturer)
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	477 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	478 {
1825 f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	479 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	480
2256 de1ba22fd28a simplification wrt. modality manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	481 matcher_.reset(new HierarchicalMatcher(query));
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	482 currentQuery_ = &query;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	483
1825 f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	484 if (that_.pimpl_->worklistCallback_)
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	485 {
1825 f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	486 OrthancPluginErrorCode error = that_.pimpl_->worklistCallback_
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	487 (reinterpret_cast<OrthancPluginWorklistAnswers*>(&answers),
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	488 reinterpret_cast<const OrthancPluginWorklistQuery*>(this),
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	489 remoteAet.c_str(),
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	490 calledAet.c_str());
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	491
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	492 if (error != OrthancPluginErrorCode_Success)
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	493 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	494 Reset();
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	495 that_.GetErrorDictionary().LogError(error, true);
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	496 throw OrthancException(static_cast<ErrorCode>(error));
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	497 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	498 }
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	499
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	500 Reset();
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	501 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	502 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	503
1812 8e5600e699c0 rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1810 diff changeset	504 void GetDicomQuery(OrthancPluginMemoryBuffer& target) const
1802 138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	505 {
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	506 if (currentQuery_ == NULL)
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	507 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	508 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	509 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	510
1802 138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	511 std::string dicom;
138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	512 currentQuery_->SaveToMemoryBuffer(dicom);
138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	513 CopyToMemoryBuffer(target, dicom.c_str(), dicom.size());
138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	514 }
138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	515
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	516 bool IsMatch(const void* dicom,
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	517 size_t size) const
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	518 {
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	519 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	520 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	521 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	522 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	523
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	524 ParsedDicomFile f(dicom, size);
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	525 return matcher_->Match(f);
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	526 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	527
1802 138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	528 void AddAnswer(OrthancPluginWorklistAnswers* answers,
138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	529 const void* dicom,
138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	530 size_t size) const
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	531 {
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	532 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	533 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	534 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	535 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	536
1802 138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	537 ParsedDicomFile f(dicom, size);
138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	538 std::auto_ptr<ParsedDicomFile> summary(matcher_->Extract(f));
138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	539 reinterpret_cast<DicomFindAnswers>(answers)->Add(summary);
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	540 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	541 };
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	542
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	543
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	544 class OrthancPlugins::FindHandler : public IFindRequestHandler
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	545 {
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	546 private:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	547 OrthancPlugins& that_;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	548 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	549
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	550 void Reset()
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	551 {
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	552 currentQuery_.reset(NULL);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	553 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	554
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	555 public:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	556 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	557 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	558 Reset();
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	559 }
a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	560
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	561 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	562 const DicomMap& input,
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	563 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	564 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	565 const std::string& remoteAet,
2256 de1ba22fd28a simplification wrt. modality manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	566 const std::string& calledAet,
de1ba22fd28a simplification wrt. modality manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	567 ModalityManufacturer manufacturer)
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	568 {
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	569 DicomMap tmp;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	570 tmp.Assign(input);
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	571
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	572 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	573 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	574 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	575 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	576 {
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	577 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	578 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	579 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	580
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	581 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	582 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	583 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	584
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	585 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	586 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	587 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	588 (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	589 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	590 remoteAet.c_str(),
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	591 calledAet.c_str());
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	592
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	593 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	594 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	595 Reset();
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	596 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	597 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	598 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	599 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	600
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	601 Reset();
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	602 }
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	603 }
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	604
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	605 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	606 const _OrthancPluginFindOperation& operation) const
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	607 {
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	608 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	609 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	610 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	611 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	612
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	613 switch (service)
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	614 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	615 case _OrthancPluginService_GetFindQuerySize:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	616 *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	617 break;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	618
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	619 case _OrthancPluginService_GetFindQueryTag:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	620 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	621 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	622 *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	623 *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	624 break;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	625 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	626
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	627 case _OrthancPluginService_GetFindQueryTagName:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	628 {
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	629 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	630 *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	631 break;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	632 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	633
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	634 case _OrthancPluginService_GetFindQueryValue:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	635 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	636 *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	637 break;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	638 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	639
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	640 default:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	641 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	642 }
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	643 }
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	644 };
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	645
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	646
a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	647
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	648 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	649 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	650 private:
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	651 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	652 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	653 private:
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	654 void* driver_;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	655 unsigned int count_;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	656 unsigned int pos_;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	657 OrthancPluginApplyMove apply_;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	658 OrthancPluginFreeMove free_;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	659
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	660 public:
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	661 Driver(void* driver,
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	662 unsigned int count,
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	663 OrthancPluginApplyMove apply,
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	664 OrthancPluginFreeMove free) :
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	665 driver_(driver),
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	666 count_(count),
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	667 pos_(0),
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	668 apply_(apply),
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	669 free_(free)
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	670 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	671 if (driver_ == NULL)
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	672 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	673 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	674 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	675 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	676
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	677 virtual ~Driver()
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	678 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	679 if (driver_ != NULL)
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	680 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	681 free_(driver_);
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	682 driver_ = NULL;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	683 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	684 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	685
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	686 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	687 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	688 return count_;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	689 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	690
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	691 virtual Status DoNext()
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	692 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	693 if (pos_ >= count_)
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	694 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	695 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	696 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	697 else
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	698 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	699 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	700 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	701 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	702 LOG(ERROR) << "Error while doing C-Move from plugin: " << EnumerationToString(static_cast<ErrorCode>(error));
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	703 return Status_Failure;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	704 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	705 else
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	706 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	707 pos_++;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	708 return Status_Success;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	709 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	710 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	711 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	712 };
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	713
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	714
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	715 _OrthancPluginMoveCallback params_;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	716
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	717
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	718 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	719 const DicomTag& tag)
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	720 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	721 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	722 if (value != NULL &&
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	723 !value->IsBinary() &&
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	724 !value->IsNull())
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	725 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	726 return value->GetContent();
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	727 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	728 else
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	729 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	730 return std::string();
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	731 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	732 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	733
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	734
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	735
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	736 public:
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	737 MoveHandler(OrthancPlugins& that)
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	738 {
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	739 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	740 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	741
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	742 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	743 params_.getMoveSize == NULL \|\|
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	744 params_.applyMove == NULL \|\|
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	745 params_.freeMove == NULL)
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	746 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	747 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	748 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	749 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	750
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	751 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	752 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	753 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	754 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	755 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	756 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	757 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	758 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	759 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	760 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	761 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	762 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	763 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	764
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	765 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	766
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	767 if (!levelString.empty())
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	768 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	769 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	770 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	771
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	772 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	773 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	774 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	775 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	776 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	777 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	778 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	779 calledAet.c_str(),
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	780 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	781 originatorId);
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	782
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	783 if (driver == NULL)
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	784 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	785 LOG(ERROR) << "Plugin cannot create a driver for an incoming C-MOVE request";
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	786 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	787 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	788
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	789 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	790
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	791 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	792 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	793 };
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	794
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	795
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	796
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	797 OrthancPlugins::OrthancPlugins()
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	798 {
1821 580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	799 /* 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	800 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	801 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	802 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	803 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	804 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	805 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	806 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	807 sizeof(int32_t) != sizeof(OrthancPluginChangeType) \|\|
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	808 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	809 sizeof(int32_t) != sizeof(OrthancPluginCompressionType) \|\|
1657 5360cdba70d8 New function "OrthancPluginRegisterDictionaryTag()" to declare DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	810 sizeof(int32_t) != sizeof(OrthancPluginValueRepresentation) \|\|
1740 5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	811 sizeof(int32_t) != sizeof(OrthancPluginDicomToJsonFlags) \|\|
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	812 sizeof(int32_t) != sizeof(OrthancPluginDicomToJsonFormat) \|\|
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	813 sizeof(int32_t) != sizeof(OrthancPluginCreateDicomFlags) \|\|
1740 5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	814 sizeof(int32_t) != sizeof(_OrthancPluginDatabaseAnswerType) \|\|
1760 51db4a25a741 LookupIdentifier is plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1744 diff changeset	815 sizeof(int32_t) != sizeof(OrthancPluginIdentifierConstraint) \|\|
1815 2abfdca9b915 OrthancPluginGetInstanceOrigin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1810 diff changeset	816 sizeof(int32_t) != sizeof(OrthancPluginInstanceOrigin) \|\|
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	817 sizeof(int32_t) != sizeof(OrthancPluginJobStepStatus) \|\|
1740 5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	818 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	819 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	820 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	821 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	822 static_cast<int>(OrthancPluginDicomToJsonFlags_ConvertBinaryToNull) != static_cast<int>(DicomToJsonFlags_ConvertBinaryToNull) \|\|
1821 580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	823 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	824 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	825 static_cast<int>(OrthancPluginCreateDicomFlags_GenerateIdentifiers) != static_cast<int>(DicomFromJsonFlags_GenerateIdentifiers))
1821 580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	826
1578 09715095fc53 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	827 {
09715095fc53 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	828 throw OrthancException(ErrorCode_Plugin);
09715095fc53 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	829 }
09715095fc53 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	830
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	831 pimpl_.reset(new PImpl());
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	832 pimpl_->manager_.RegisterServiceProvider(*this);
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	833 }
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	834
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	835
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	836 void OrthancPlugins::SetServerContext(ServerContext& context)
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	837 {
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	838 pimpl_->SetServerContext(&context);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	839 }
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	840
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	841
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	842 void OrthancPlugins::ResetServerContext()
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	843 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	844 pimpl_->SetServerContext(NULL);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	845 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	846
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	847
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	848 OrthancPlugins::~OrthancPlugins()
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	849 {
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	850 for (PImpl::RestCallbacks::iterator it = pimpl_->restCallbacks_.begin();
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	851 it != pimpl_->restCallbacks_.end(); ++it)
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	852 {
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	853 delete *it;
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	854 }
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	855 }
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	856
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	857
1041 2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	858 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	859 std::vector<const char*>& values,
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	860 const IHttpHandler::Arguments& arguments)
1041 2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	861 {
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	862 keys.resize(arguments.size());
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	863 values.resize(arguments.size());
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	864
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	865 size_t pos = 0;
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	866 for (IHttpHandler::Arguments::const_iterator
1041 2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	867 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	868 {
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	869 keys[pos] = it->first.c_str();
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	870 values[pos] = it->second.c_str();
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	871 pos++;
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	872 }
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	873 }
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	874
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	875
1363 feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	876 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	877 std::vector<const char*>& values,
1441 f3672356c121 refactoring: IHttpHandler and HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	878 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	879 {
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	880 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	881 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	882
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	883 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	884 {
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	885 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	886 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	887 }
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	888 }
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	889
feaf2840917c Plugins now receive duplicated GET arguments in their REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1330 diff changeset	890
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	891 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	892 RequestOrigin /origin/,
3232f1c995a5 provide the origin of the requests to HTTP handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1554 diff changeset	893 const char* /remoteIp/,
3232f1c995a5 provide the origin of the requests to HTTP handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1554 diff changeset	894 const char* /username/,
1329 272cb2019a4c fix recovery tool Sebastien Jodogne <s.jodogne@gmail.com> parents: 1328 diff changeset	895 HttpMethod method,
272cb2019a4c fix recovery tool Sebastien Jodogne <s.jodogne@gmail.com> parents: 1328 diff changeset	896 const UriComponents& uri,
272cb2019a4c fix recovery tool Sebastien Jodogne <s.jodogne@gmail.com> parents: 1328 diff changeset	897 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	898 const GetArguments& getArguments,
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	899 const char* bodyData,
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	900 size_t bodySize)
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	901 {
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	902 std::string flatUri = Toolbox::FlattenUri(uri);
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	903 PImpl::RestCallback* callback = NULL;
901 7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	904
7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	905 std::vector<std::string> groups;
7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	906 std::vector<const char*> cgroups;
7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	907
1041 2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	908 // Loop over the callbacks registered by the plugins
901 7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	909 bool found = false;
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	910 for (PImpl::RestCallbacks::const_iterator it = pimpl_->restCallbacks_.begin();
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	911 it != pimpl_->restCallbacks_.end() && !found; ++it)
901 7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	912 {
1041 2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	913 // Check whether the regular expression associated to this
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	914 // callback matches the URI
901 7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	915 boost::cmatch what;
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	916 if (boost::regex_match(flatUri.c_str(), what, (*it)->GetRegularExpression()))
901 7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	917 {
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	918 callback = *it;
901 7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	919
1041 2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	920 // Extract the value of the free parameters of the regular expression
901 7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	921 if (what.size() > 1)
7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	922 {
7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	923 groups.resize(what.size() - 1);
7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	924 cgroups.resize(what.size() - 1);
7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	925 for (size_t i = 1; i < what.size(); i++)
7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	926 {
7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	927 groups[i - 1] = what[i];
7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	928 cgroups[i - 1] = groups[i - 1].c_str();
7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	929 }
7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	930 }
7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	931 }
7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	932 }
7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	933
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	934 if (callback == NULL)
901 7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	935 {
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	936 // Callback not found
901 7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	937 return false;
7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	938 }
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	939
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	940 LOG(INFO) << "Delegating HTTP request to plugin for URI: " << flatUri;
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	941
1041 2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	942 std::vector<const char*> getKeys, getValues, headersKeys, headersValues;
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	943
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	944 OrthancPluginHttpRequest request;
bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	945 memset(&request, 0, sizeof(OrthancPluginHttpRequest));
bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	946
1041 2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	947 ArgumentsToPlugin(headersKeys, headersValues, headers);
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	948
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	949 switch (method)
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	950 {
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	951 case HttpMethod_Get:
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	952 request.method = OrthancPluginHttpMethod_Get;
1041 2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	953 ArgumentsToPlugin(getKeys, getValues, getArguments);
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	954 break;
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	955
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	956 case HttpMethod_Post:
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	957 request.method = OrthancPluginHttpMethod_Post;
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	958 break;
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	959
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	960 case HttpMethod_Delete:
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	961 request.method = OrthancPluginHttpMethod_Delete;
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	962 break;
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	963
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	964 case HttpMethod_Put:
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	965 request.method = OrthancPluginHttpMethod_Put;
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	966 break;
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	967
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	968 default:
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	969 throw OrthancException(ErrorCode_InternalError);
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	970 }
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	971
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	972
904 2732b5f57d9c sample to forward dicom data Sebastien Jodogne <s.jodogne@gmail.com> parents: 901 diff changeset	973 request.groups = (cgroups.size() ? &cgroups[0] : NULL);
2732b5f57d9c sample to forward dicom data Sebastien Jodogne <s.jodogne@gmail.com> parents: 901 diff changeset	974 request.groupsCount = cgroups.size();
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	975 request.getCount = getArguments.size();
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	976 request.body = bodyData;
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	977 request.bodySize = bodySize;
1041 2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	978 request.headersCount = headers.size();
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	979
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	980 if (getArguments.size() > 0)
bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	981 {
bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	982 request.getKeys = &getKeys[0];
bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	983 request.getValues = &getValues[0];
bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	984 }
1041 2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	985
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	986 if (headers.size() > 0)
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	987 {
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	988 request.headersKeys = &headersKeys[0];
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	989 request.headersValues = &headersValues[0];
2c49b7dffcec plugins have access to the HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1037 diff changeset	990 }
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	991
901 7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	992 assert(callback != NULL);
1628 77c4cc4def0f OrthancPluginErrorCode in REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1627 diff changeset	993 OrthancPluginErrorCode error = callback->Invoke(pimpl_->restCallbackMutex_, output, flatUri, request);
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	994
1628 77c4cc4def0f OrthancPluginErrorCode in REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1627 diff changeset	995 if (error == OrthancPluginErrorCode_Success &&
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	996 output.IsWritingMultipart())
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	997 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	998 output.CloseMultipart();
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	999 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	1000
1628 77c4cc4def0f OrthancPluginErrorCode in REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1627 diff changeset	1001 if (error == OrthancPluginErrorCode_Success)
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1002 {
1628 77c4cc4def0f OrthancPluginErrorCode in REST callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1627 diff changeset	1003 return true;
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1004 }
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1005 else
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1006 {
2135 cadfe0a2a393 fix in the sample basic plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	1007 GetErrorDictionary().LogError(error, false);
1646 da799f767e5d simplification in error casting with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	1008 throw OrthancException(static_cast<ErrorCode>(error));
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1009 }
bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1010 }
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	1011
bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	1012
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	1013 void OrthancPlugins::SignalStoredInstance(const std::string& instanceId,
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	1014 DicomInstanceToStore& instance,
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	1015 const Json::Value& simplifiedTags)
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1016 {
1466 0cd0f2ad3599 Fix potential deadlock in the callbacks of plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	1017 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	1018
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1019 for (PImpl::OnStoredCallbacks::const_iterator
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1020 callback = pimpl_->onStoredCallbacks_.begin();
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1021 callback != pimpl_->onStoredCallbacks_.end(); ++callback)
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1022 {
1627 da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1023 OrthancPluginErrorCode error = (*callback)
da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1024 (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	1025 instanceId.c_str());
da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1026
da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1027 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	1028 {
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	1029 GetErrorDictionary().LogError(error, true);
1646 da799f767e5d simplification in error casting with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	1030 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	1031 }
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1032 }
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1033 }
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1034
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1035
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1036
1741 06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1037 void OrthancPlugins::SignalChangeInternal(OrthancPluginChangeType changeType,
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1038 OrthancPluginResourceType resourceType,
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1039 const char* resource)
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1040 {
1627 da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1041 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	1042
1627 da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1043 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	1044 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	1045 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	1046 {
1741 06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1047 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	1048
da7854deb662 Plugin callbacks must now return explicit "OrthancPluginErrorCode" instead of integers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1625 diff changeset	1049 if (error != OrthancPluginErrorCode_Success)
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	1050 {
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	1051 GetErrorDictionary().LogError(error, true);
1646 da799f767e5d simplification in error casting with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	1052 throw OrthancException(static_cast<ErrorCode>(error));
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	1053 }
1178 c71d25e6a63c improvement Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	1054 }
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1055 }
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1056
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1057
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1058
1741 06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1059 void OrthancPlugins::SignalChange(const ServerIndexChange& change)
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1060 {
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1061 SignalChangeInternal(Plugins::Convert(change.GetChangeType()),
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1062 Plugins::Convert(change.GetResourceType()),
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1063 change.GetPublicId().c_str());
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1064 }
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1065
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1066
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1740 diff changeset	1067
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	1068 void OrthancPlugins::RegisterRestCallback(const void* parameters,
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	1069 bool lock)
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1070 {
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1071 const _OrthancPluginRestCallback& p =
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1072 reinterpret_cast<const _OrthancPluginRestCallback>(parameters);
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1073
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	1074 LOG(INFO) << "Plugin has registered a REST callback "
2820 3e048b243d20 typo Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1075 << (lock ? "with" : "without")
1595 e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	1076 << " mutual exclusion on: "
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	1077 << p.pathRegularExpression;
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	1078
e1e54a73ba8b OrthancPluginRegisterRestCallbackNoLock, documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1594 diff changeset	1079 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	1080 }
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1081
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1082
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1083
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1084 void OrthancPlugins::RegisterOnStoredInstanceCallback(const void* parameters)
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1085 {
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1086 const _OrthancPluginOnStoredInstanceCallback& p =
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1087 reinterpret_cast<const _OrthancPluginOnStoredInstanceCallback>(parameters);
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1088
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1089 LOG(INFO) << "Plugin has registered an OnStoredInstance callback";
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1090 pimpl_->onStoredCallbacks_.push_back(p.callback);
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1091 }
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1092
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1093
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1094 void OrthancPlugins::RegisterOnChangeCallback(const void* parameters)
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1095 {
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1096 const _OrthancPluginOnChangeCallback& p =
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1097 reinterpret_cast<const _OrthancPluginOnChangeCallback>(parameters);
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1098
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1099 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	1100 pimpl_->onChangeCallbacks_.push_back(p.callback);
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1101 }
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1102
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1103
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	1104 void OrthancPlugins::RegisterWorklistCallback(const void* parameters)
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	1105 {
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	1106 const _OrthancPluginWorklistCallback& p =
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	1107 reinterpret_cast<const _OrthancPluginWorklistCallback>(parameters);
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	1108
1825 f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	1109 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	1110
f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	1111 if (pimpl_->worklistCallback_ != NULL)
f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	1112 {
f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	1113 LOG(ERROR) << "Can only register one plugin to handle modality worklists";
f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	1114 throw OrthancException(ErrorCode_Plugin);
f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	1115 }
f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	1116 else
f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	1117 {
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1118 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	1119 pimpl_->worklistCallback_ = p.callback;
f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	1120 }
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	1121 }
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	1122
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	1123
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1124 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	1125 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1126 const _OrthancPluginFindCallback& p =
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1127 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	1128
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1129 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	1130
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1131 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	1132 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1133 LOG(ERROR) << "Can only register one plugin 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	1134 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	1135 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1136 else
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1137 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1138 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	1139 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	1140 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1141 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1142
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1143
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1144 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	1145 {
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1146 // invokeServiceMutex_ is assumed to be locked
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1147
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1148 const _OrthancPluginMoveCallback& p =
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1149 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	1150
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1151 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	1152 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1153 LOG(ERROR) << "Can only register one plugin 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	1154 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	1155 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1156 else
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1157 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1158 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	1159 pimpl_->moveCallbacks_ = p;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1160 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1161 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1162
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1163
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1164 void OrthancPlugins::RegisterDecodeImageCallback(const void* parameters)
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1165 {
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1166 const _OrthancPluginDecodeImageCallback& p =
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1167 reinterpret_cast<const _OrthancPluginDecodeImageCallback>(parameters);
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1168
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1169 boost::mutex::scoped_lock lock(pimpl_->decodeImageCallbackMutex_);
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1170
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	1171 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	1172 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	1173 << pimpl_->decodeImageCallbacks_.size() << " decoder(s) now active)";
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1174 }
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1175
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	1176
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1177 void OrthancPlugins::RegisterJobsUnserializer(const void* parameters)
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1178 {
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1179 const _OrthancPluginJobsUnserializer& p =
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1180 reinterpret_cast<const _OrthancPluginJobsUnserializer>(parameters);
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1181
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1182 boost::mutex::scoped_lock lock(pimpl_->jobsUnserializersMutex_);
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1183
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1184 pimpl_->jobsUnserializers_.push_back(p.unserializer);
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1185 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	1186 << pimpl_->jobsUnserializers_.size() << " unserializer(s) now active)";
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1187 }
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1188
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1189
1961 ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	1190 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	1191 {
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	1192 const _OrthancPluginIncomingHttpRequestFilter& p =
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	1193 reinterpret_cast<const _OrthancPluginIncomingHttpRequestFilter>(parameters);
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	1194
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	1195 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	1196 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	1197 }
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	1198
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1199
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	1200 void OrthancPlugins::RegisterIncomingHttpRequestFilter2(const void* parameters)
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	1201 {
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	1202 const _OrthancPluginIncomingHttpRequestFilter2& p =
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	1203 reinterpret_cast<const _OrthancPluginIncomingHttpRequestFilter2>(parameters);
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	1204
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	1205 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	1206 pimpl_->incomingHttpRequestFilters2_.push_back(p.callback);
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	1207 }
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	1208
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	1209
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1210 void OrthancPlugins::AnswerBuffer(const void* parameters)
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1211 {
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1212 const _OrthancPluginAnswerBuffer& p =
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1213 reinterpret_cast<const _OrthancPluginAnswerBuffer>(parameters);
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1214
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1215 HttpOutput* translatedOutput = reinterpret_cast<HttpOutput*>(p.output);
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1069 diff changeset	1216 translatedOutput->SetContentType(p.mimeType);
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1217 translatedOutput->Answer(p.answer, p.answerSize);
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1218 }
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1219
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1220
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1221 void OrthancPlugins::Redirect(const void* parameters)
993 501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 944 diff changeset	1222 {
1042 8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1223 const _OrthancPluginOutputPlusArgument& p =
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1224 reinterpret_cast<const _OrthancPluginOutputPlusArgument>(parameters);
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1225
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1226 HttpOutput* translatedOutput = reinterpret_cast<HttpOutput*>(p.output);
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1227 translatedOutput->Redirect(p.argument);
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1228 }
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1229
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1230
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1231 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	1232 {
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1233 const _OrthancPluginSendHttpStatusCode& p =
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1234 reinterpret_cast<const _OrthancPluginSendHttpStatusCode>(parameters);
993 501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 944 diff changeset	1235
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 944 diff changeset	1236 HttpOutput* translatedOutput = reinterpret_cast<HttpOutput*>(p.output);
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1069 diff changeset	1237 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	1238 }
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1239
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1240
1594 2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1241 void OrthancPlugins::SendHttpStatus(const void* parameters)
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1242 {
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1243 const _OrthancPluginSendHttpStatus& p =
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1244 reinterpret_cast<const _OrthancPluginSendHttpStatus>(parameters);
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1245
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1246 HttpOutput* translatedOutput = reinterpret_cast<HttpOutput*>(p.output);
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1247 HttpStatus status = static_cast<HttpStatus>(p.status);
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1248
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1249 if (p.bodySize > 0 && p.body != NULL)
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1250 {
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1251 translatedOutput->SendStatus(status, p.body, p.bodySize);
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1252 }
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1253 else
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1254 {
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1255 translatedOutput->SendStatus(status);
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1256 }
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1257 }
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1258
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	1259
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1260 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	1261 {
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1262 const _OrthancPluginOutputPlusArgument& p =
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1263 reinterpret_cast<const _OrthancPluginOutputPlusArgument>(parameters);
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1264
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1265 HttpOutput* translatedOutput = reinterpret_cast<HttpOutput*>(p.output);
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1266 translatedOutput->SendUnauthorized(p.argument);
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1267 }
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1268
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1269
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1270 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	1271 {
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1272 const _OrthancPluginOutputPlusArgument& p =
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1273 reinterpret_cast<const _OrthancPluginOutputPlusArgument>(parameters);
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1274
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1275 HttpOutput* translatedOutput = reinterpret_cast<HttpOutput*>(p.output);
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1276 translatedOutput->SendMethodNotAllowed(p.argument);
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1277 }
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1278
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1279
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1280 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	1281 {
1137 d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1282 const _OrthancPluginSetHttpHeader& p =
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1283 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	1284
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	1285 HttpOutput* translatedOutput = reinterpret_cast<HttpOutput*>(p.output);
1137 d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1286 translatedOutput->SetCookie(p.key, p.value);
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1287 }
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1288
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1289
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1290 void OrthancPlugins::SetHttpHeader(const void* parameters)
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1291 {
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1292 const _OrthancPluginSetHttpHeader& p =
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1293 reinterpret_cast<const _OrthancPluginSetHttpHeader>(parameters);
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1294
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1295 HttpOutput* translatedOutput = reinterpret_cast<HttpOutput*>(p.output);
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	1296 translatedOutput->AddHeader(p.key, p.value);
993 501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 944 diff changeset	1297 }
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 944 diff changeset	1298
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 944 diff changeset	1299
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1300 void OrthancPlugins::CompressAndAnswerPngImage(const void* parameters)
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1301 {
1600 7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1302 // Bridge for backward compatibility with Orthanc <= 0.9.3
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1303 const _OrthancPluginCompressAndAnswerPngImage& p =
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1304 reinterpret_cast<const _OrthancPluginCompressAndAnswerPngImage>(parameters);
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1305
1600 7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1306 _OrthancPluginCompressAndAnswerImage p2;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1307 p2.output = p.output;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1308 p2.imageFormat = OrthancPluginImageFormat_Png;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1309 p2.pixelFormat = p.format;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1310 p2.width = p.width;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1311 p2.height = p.height;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1312 p2.pitch = p.height;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1313 p2.buffer = p.buffer;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1314 p2.quality = 0;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1315
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1316 CompressAndAnswerImage(&p2);
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1317 }
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1318
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1319
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1320 void OrthancPlugins::CompressAndAnswerImage(const void* parameters)
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1321 {
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1322 const _OrthancPluginCompressAndAnswerImage& p =
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1323 reinterpret_cast<const _OrthancPluginCompressAndAnswerImage>(parameters);
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1324
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1325 HttpOutput* translatedOutput = reinterpret_cast<HttpOutput*>(p.output);
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1326
1600 7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1327 ImageAccessor accessor;
1625 c17b1142caab reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1624 diff changeset	1328 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	1329
1600 7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1330 std::string compressed;
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1331
1600 7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1332 switch (p.imageFormat)
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1333 {
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1334 case OrthancPluginImageFormat_Png:
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1335 {
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1336 PngWriter writer;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1337 writer.WriteToMemory(compressed, accessor);
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1338 translatedOutput->SetContentType("image/png");
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1339 break;
1600 7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1340 }
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1341
1600 7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1342 case OrthancPluginImageFormat_Jpeg:
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1343 {
1603 905b4db3092b CompressAndAnswerJpegImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1600 diff changeset	1344 JpegWriter writer;
905b4db3092b CompressAndAnswerJpegImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1600 diff changeset	1345 writer.SetQuality(p.quality);
905b4db3092b CompressAndAnswerJpegImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1600 diff changeset	1346 writer.WriteToMemory(compressed, accessor);
905b4db3092b CompressAndAnswerJpegImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1600 diff changeset	1347 translatedOutput->SetContentType("image/jpeg");
905b4db3092b CompressAndAnswerJpegImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1600 diff changeset	1348 break;
1600 7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1349 }
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1350
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1351 default:
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1352 throw OrthancException(ErrorCode_ParameterOutOfRange);
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1353 }
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1354
1600 7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	1355 translatedOutput->Answer(compressed);
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1356 }
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1357
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1358
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1359 void OrthancPlugins::GetDicomForInstance(const void* parameters)
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1360 {
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1361 const _OrthancPluginGetDicomForInstance& p =
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1362 reinterpret_cast<const _OrthancPluginGetDicomForInstance>(parameters);
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1363
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1364 std::string dicom;
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1365
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1366 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1367 PImpl::ServerContextLock lock(*pimpl_);
2124 2b1520efa282 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	1368 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	1369 }
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1370
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1371 CopyToMemoryBuffer(*p.target, dicom);
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1372 }
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1373
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1374
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	1375 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	1376 bool afterPlugins)
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1377 {
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1378 const _OrthancPluginRestApiGet& p =
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1379 reinterpret_cast<const _OrthancPluginRestApiGet>(parameters);
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1380
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	1381 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	1382 << (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	1383
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1384 IHttpHandler* handler;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1385
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1386 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1387 PImpl::ServerContextLock lock(*pimpl_);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1388 handler = &lock.GetContext().GetHttpHandler().RestrictToOrthancRestApi(!afterPlugins);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1389 }
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	1390
1445 d26c8a93d05a refactoring: SimpleGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	1391 std::string result;
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1392 if (HttpToolbox::SimpleGet(result, *handler, RequestOrigin_Plugins, p.uri))
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1393 {
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1394 CopyToMemoryBuffer(*p.target, result);
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1395 }
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1396 else
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1397 {
1984 9f09a20e41e2 corrected error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1962 diff changeset	1398 throw OrthancException(ErrorCode_UnknownResource);
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1399 }
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1400 }
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1401
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	1402
1780 94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1403 void OrthancPlugins::RestApiGet2(const void* parameters)
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1404 {
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1405 const _OrthancPluginRestApiGet2& p =
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1406 reinterpret_cast<const _OrthancPluginRestApiGet2>(parameters);
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1407
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1408 LOG(INFO) << "Plugin making REST GET call on URI " << p.uri
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1409 << (p.afterPlugins ? " (after plugins)" : " (built-in API)");
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1410
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1411 IHttpHandler::Arguments headers;
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1412
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1413 for (uint32_t i = 0; i < p.headersCount; i++)
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1414 {
1918 e8c2f993f6b3 fix case for HTTP headers keys in OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1916 diff changeset	1415 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	1416 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	1417 headers[name] = p.headersValues[i];
1780 94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1418 }
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1419
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1420 IHttpHandler* handler;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1421
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1422 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1423 PImpl::ServerContextLock lock(*pimpl_);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1424 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	1425 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1426
1780 94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1427 std::string result;
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1428 if (HttpToolbox::SimpleGet(result, *handler, RequestOrigin_Plugins, p.uri, headers))
1780 94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1429 {
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1430 CopyToMemoryBuffer(*p.target, result);
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1431 }
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1432 else
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1433 {
1984 9f09a20e41e2 corrected error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1962 diff changeset	1434 throw OrthancException(ErrorCode_UnknownResource);
1780 94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1435 }
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1436 }
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1437
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	1438
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	1439 void OrthancPlugins::RestApiPostPut(bool isPost,
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	1440 const void* parameters,
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	1441 bool afterPlugins)
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	1442 {
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	1443 const _OrthancPluginRestApiPostPut& p =
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	1444 reinterpret_cast<const _OrthancPluginRestApiPostPut>(parameters);
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	1445
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	1446 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	1447 << " 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	1448
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1449 IHttpHandler* handler;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1450
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1451 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1452 PImpl::ServerContextLock lock(*pimpl_);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1453 handler = &lock.GetContext().GetHttpHandler().RestrictToOrthancRestApi(!afterPlugins);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1454 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1455
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	1456 std::string result;
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	1457 if (isPost ?
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1458 HttpToolbox::SimplePost(result, *handler, RequestOrigin_Plugins, p.uri, p.body, p.bodySize) :
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1459 HttpToolbox::SimplePut (result, *handler, RequestOrigin_Plugins, p.uri, p.body, p.bodySize))
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	1460 {
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	1461 CopyToMemoryBuffer(*p.target, result);
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	1462 }
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	1463 else
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	1464 {
1984 9f09a20e41e2 corrected error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1962 diff changeset	1465 throw OrthancException(ErrorCode_UnknownResource);
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	1466 }
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	1467 }
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	1468
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	1469
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	1470 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	1471 bool afterPlugins)
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	1472 {
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	1473 const char* uri = reinterpret_cast<const char*>(parameters);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	1474 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	1475 << (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	1476
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1477 IHttpHandler* handler;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1478
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1479 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1480 PImpl::ServerContextLock lock(*pimpl_);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1481 handler = &lock.GetContext().GetHttpHandler().RestrictToOrthancRestApi(!afterPlugins);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1482 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1483
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1484 if (!HttpToolbox::SimpleDelete(*handler, RequestOrigin_Plugins, uri))
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	1485 {
1984 9f09a20e41e2 corrected error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1962 diff changeset	1486 throw OrthancException(ErrorCode_UnknownResource);
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	1487 }
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	1488 }
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	1489
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	1490
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1132 diff changeset	1491 void OrthancPlugins::LookupResource(_OrthancPluginService service,
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	1492 const void* parameters)
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1493 {
1145 0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	1494 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	1495 reinterpret_cast<const _OrthancPluginRetrieveDynamicString>(parameters);
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1496
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1497 /**
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1498 * 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	1499 * the Orthanc database. It reflects the
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1500 * "CandidateResources::ApplyFilter()" method of the
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1501 * "OrthancFindRequestHandler" class.
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1502 **/
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1503
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1504 DicomTag tag(0, 0);
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1505 ResourceType level;
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1506 switch (service)
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1507 {
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1508 case _OrthancPluginService_LookupPatient:
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1509 tag = DICOM_TAG_PATIENT_ID;
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1510 level = ResourceType_Patient;
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1511 break;
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1512
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1513 case _OrthancPluginService_LookupStudy:
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1514 tag = DICOM_TAG_STUDY_INSTANCE_UID;
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1515 level = ResourceType_Study;
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1516 break;
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1517
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1518 case _OrthancPluginService_LookupStudyWithAccessionNumber:
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1519 tag = DICOM_TAG_ACCESSION_NUMBER;
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1520 level = ResourceType_Study;
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1521 break;
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1522
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1523 case _OrthancPluginService_LookupSeries:
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1524 tag = DICOM_TAG_SERIES_INSTANCE_UID;
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1525 level = ResourceType_Series;
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1526 break;
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1527
a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1528 case _OrthancPluginService_LookupInstance:
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1529 tag = DICOM_TAG_SOP_INSTANCE_UID;
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	1530 level = ResourceType_Instance;
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1531 break;
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1532
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1533 default:
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1534 throw OrthancException(ErrorCode_InternalError);
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1535 }
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1536
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1537 std::list<std::string> result;
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1538
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1539 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1540 PImpl::ServerContextLock lock(*pimpl_);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	1541 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	1542 }
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1543
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1544 if (result.size() == 1)
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1545 {
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1546 *p.result = CopyString(result.front());
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1547 }
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1548 else
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1549 {
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1550 throw OrthancException(ErrorCode_UnknownResource);
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1551 }
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1552 }
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1553
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1554
1067 ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1555 static void AccessInstanceMetadataInternal(bool checkExistence,
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1556 const _OrthancPluginAccessDicomInstance& params,
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1557 const DicomInstanceToStore& instance)
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1558 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1559 MetadataType metadata;
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1560
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1561 try
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1562 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1563 metadata = StringToMetadata(params.key);
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1564 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1565 catch (OrthancException&)
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1566 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1567 // Unknown metadata
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1568 if (checkExistence)
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1569 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1570 *params.resultInt64 = -1;
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1571 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1572 else
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1573 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1574 *params.resultString = NULL;
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1575 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1576
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1577 return;
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1578 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1579
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1580 ServerIndex::MetadataMap::const_iterator it =
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1581 instance.GetMetadata().find(std::make_pair(ResourceType_Instance, metadata));
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1582
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1583 if (checkExistence)
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1584 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1585 if (it != instance.GetMetadata().end())
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1586 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1587 *params.resultInt64 = 1;
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1588 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1589 else
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1590 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1591 *params.resultInt64 = 0;
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1592 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1593 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1594 else
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1595 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1596 if (it != instance.GetMetadata().end())
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1597 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1598 *params.resultString = it->second.c_str();
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1599 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1600 else
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1601 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1602 // Error: Missing metadata
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1603 *params.resultString = NULL;
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1604 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1605 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1606 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1607
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1608
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1609 static void AccessDicomInstance(_OrthancPluginService service,
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1610 const void* parameters)
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1611 {
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1612 const _OrthancPluginAccessDicomInstance& p =
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1613 reinterpret_cast<const _OrthancPluginAccessDicomInstance>(parameters);
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1614
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1615 DicomInstanceToStore& instance =
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1616 reinterpret_cast<DicomInstanceToStore>(p.instance);
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1617
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1618 switch (service)
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1619 {
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1620 case _OrthancPluginService_GetInstanceRemoteAet:
2664 a21b244efb37 serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2640 diff changeset	1621 *p.resultString = instance.GetOrigin().GetRemoteAetC();
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1622 return;
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1623
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1624 case _OrthancPluginService_GetInstanceSize:
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1625 *p.resultInt64 = instance.GetBufferSize();
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1626 return;
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1627
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1628 case _OrthancPluginService_GetInstanceData:
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1629 *p.resultString = instance.GetBufferData();
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1630 return;
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1631
1067 ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1632 case _OrthancPluginService_HasInstanceMetadata:
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1633 AccessInstanceMetadataInternal(true, p, instance);
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1634 return;
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1635
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1636 case _OrthancPluginService_GetInstanceMetadata:
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1637 AccessInstanceMetadataInternal(false, p, instance);
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1638 return;
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1639
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1640 case _OrthancPluginService_GetInstanceJson:
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1641 case _OrthancPluginService_GetInstanceSimplifiedJson:
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1642 {
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1643 Json::StyledWriter writer;
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1644 std::string s;
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1645
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1646 if (service == _OrthancPluginService_GetInstanceJson)
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1647 {
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1648 s = writer.write(instance.GetJson());
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1649 }
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1650 else
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1651 {
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1652 Json::Value simplified;
2120 4b02ec79728a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	1653 ServerToolbox::SimplifyTags(simplified, instance.GetJson(), DicomToJsonFormat_Human);
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1654 s = writer.write(simplified);
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1655 }
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1656
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1657 *p.resultStringToFree = CopyString(s);
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1658 return;
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1659 }
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1660
1815 2abfdca9b915 OrthancPluginGetInstanceOrigin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1810 diff changeset	1661 case _OrthancPluginService_GetInstanceOrigin: // New in Orthanc 0.9.5
2640 c691fcf66071 ResourceModificationJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	1662 *p.resultOrigin = Plugins::Convert(instance.GetOrigin().GetRequestOrigin());
1815 2abfdca9b915 OrthancPluginGetInstanceOrigin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1810 diff changeset	1663 return;
2abfdca9b915 OrthancPluginGetInstanceOrigin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1810 diff changeset	1664
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1665 default:
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	1666 throw OrthancException(ErrorCode_InternalError);
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1667 }
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1668 }
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1669
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	1670
1554 89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1671 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	1672 {
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1673 const _OrthancPluginBufferCompression& p =
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1674 reinterpret_cast<const _OrthancPluginBufferCompression>(parameters);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1675
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1676 std::string result;
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1677
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1678 {
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1679 std::auto_ptr<DeflateBaseCompressor> compressor;
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1680
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1681 switch (p.compression)
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1682 {
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1683 case OrthancPluginCompressionType_Zlib:
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1684 {
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1685 compressor.reset(new ZlibCompressor);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1686 compressor->SetPrefixWithUncompressedSize(false);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1687 break;
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1688 }
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1689
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1690 case OrthancPluginCompressionType_ZlibWithSize:
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1691 {
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1692 compressor.reset(new ZlibCompressor);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1693 compressor->SetPrefixWithUncompressedSize(true);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1694 break;
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1695 }
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1696
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1697 case OrthancPluginCompressionType_Gzip:
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1698 {
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1699 compressor.reset(new GzipCompressor);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1700 compressor->SetPrefixWithUncompressedSize(false);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1701 break;
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1702 }
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1703
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1704 case OrthancPluginCompressionType_GzipWithSize:
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1705 {
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1706 compressor.reset(new GzipCompressor);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1707 compressor->SetPrefixWithUncompressedSize(true);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1708 break;
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1709 }
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1710
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1711 default:
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1712 throw OrthancException(ErrorCode_ParameterOutOfRange);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1713 }
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1714
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1715 if (p.uncompress)
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1716 {
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1717 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	1718 }
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1719 else
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1720 {
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1721 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	1722 }
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1723 }
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1724
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1725 CopyToMemoryBuffer(*p.target, result);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1726 }
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1727
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	1728
1843 d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	1729 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	1730 {
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	1731 // 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	1732 // 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	1733
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	1734 if (image->IsReadOnly())
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	1735 {
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2045 diff changeset	1736 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	1737 ImageProcessing::Copy(copy, image);
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	1738 image.reset(NULL);
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	1739 return reinterpret_cast<OrthancPluginImage*>(copy.release());
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	1740 }
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	1741 else
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	1742 {
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	1743 return reinterpret_cast<OrthancPluginImage*>(image.release());
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	1744 }
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	1745 }
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	1746
d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	1747
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1748 void OrthancPlugins::UncompressImage(const void* parameters)
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1749 {
1599 dd1f9e81f891 fixes to image primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	1750 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	1751
1604 1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	1752 std::auto_ptr<ImageAccessor> image;
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	1753
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1754 switch (p.format)
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1755 {
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1756 case OrthancPluginImageFormat_Png:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1757 {
1604 1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	1758 image.reset(new PngReader);
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	1759 reinterpret_cast<PngReader&>(*image).ReadFromMemory(p.data, p.size);
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	1760 break;
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1761 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1762
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1763 case OrthancPluginImageFormat_Jpeg:
1604 1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	1764 {
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	1765 image.reset(new JpegReader);
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	1766 reinterpret_cast<JpegReader&>(*image).ReadFromMemory(p.data, p.size);
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	1767 break;
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	1768 }
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1769
1829 31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	1770 case OrthancPluginImageFormat_Dicom:
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	1771 {
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1772 image.reset(Decode(p.data, p.size, 0));
1829 31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	1773 break;
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	1774 }
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	1775
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1776 default:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1777 throw OrthancException(ErrorCode_ParameterOutOfRange);
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1778 }
1604 1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	1779
1843 d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	1780 *(p.target) = ReturnImage(image);
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1781 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1782
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1783
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1784 void OrthancPlugins::CompressImage(const void* parameters)
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1785 {
1599 dd1f9e81f891 fixes to image primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	1786 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	1787
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1788 std::string compressed;
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1789
1916 5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1790 ImageAccessor accessor;
5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1791 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	1792
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1793 switch (p.imageFormat)
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1794 {
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1795 case OrthancPluginImageFormat_Png:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1796 {
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1797 PngWriter writer;
1916 5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1798 writer.WriteToMemory(compressed, accessor);
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1799 break;
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1800 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1801
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1802 case OrthancPluginImageFormat_Jpeg:
1604 1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	1803 {
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	1804 JpegWriter writer;
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	1805 writer.SetQuality(p.quality);
1916 5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1806 writer.WriteToMemory(compressed, accessor);
1604 1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	1807 break;
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1603 diff changeset	1808 }
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1809
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1810 default:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1811 throw OrthancException(ErrorCode_ParameterOutOfRange);
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1812 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1813
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1814 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	1815 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1816
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	1817
1606 31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1818 void OrthancPlugins::CallHttpClient(const void* parameters)
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1819 {
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1820 const _OrthancPluginCallHttpClient& p = reinterpret_cast<const _OrthancPluginCallHttpClient>(parameters);
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1821
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1822 HttpClient client;
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1823 client.SetUrl(p.url);
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1824
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1825 if (p.username != NULL &&
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1826 p.password != NULL)
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1827 {
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1828 client.SetCredentials(p.username, p.password);
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1829 }
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1830
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1831 switch (p.method)
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1832 {
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1833 case OrthancPluginHttpMethod_Get:
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1834 client.SetMethod(HttpMethod_Get);
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1835 break;
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1836
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1837 case OrthancPluginHttpMethod_Post:
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1838 client.SetMethod(HttpMethod_Post);
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1839 client.GetBody().assign(p.body, p.bodySize);
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1840 break;
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1841
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1842 case OrthancPluginHttpMethod_Put:
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1843 client.SetMethod(HttpMethod_Put);
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1844 client.GetBody().assign(p.body, p.bodySize);
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1845 break;
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1846
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1847 case OrthancPluginHttpMethod_Delete:
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1848 client.SetMethod(HttpMethod_Delete);
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1849 break;
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1850
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1851 default:
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1852 throw OrthancException(ErrorCode_ParameterOutOfRange);
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1853 }
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1854
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1855 std::string s;
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1856 client.ApplyAndThrowException(s);
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1857
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1858 if (p.method != OrthancPluginHttpMethod_Delete)
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1859 {
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1860 CopyToMemoryBuffer(*p.target, s);
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1861 }
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1862 }
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1863
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	1864
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1865 void OrthancPlugins::CallHttpClient2(const void* parameters)
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1866 {
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1867 const _OrthancPluginCallHttpClient2& p = reinterpret_cast<const _OrthancPluginCallHttpClient2>(parameters);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1868
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1869 HttpClient client;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1870 client.SetUrl(p.url);
2045 21a8ca9ad928 HttpClient::SetConvertHeadersToLowerCase Sebastien Jodogne <s.jodogne@gmail.com> parents: 2041 diff changeset	1871 client.SetConvertHeadersToLowerCase(false);
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1872
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1873 if (p.timeout != 0)
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1874 {
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1875 client.SetTimeout(p.timeout);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1876 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1877
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1878 if (p.username != NULL &&
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1879 p.password != NULL)
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1880 {
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1881 client.SetCredentials(p.username, p.password);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1882 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1883
2019 9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2012 diff changeset	1884 if (p.certificateFile != NULL)
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2012 diff changeset	1885 {
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2012 diff changeset	1886 std::string certificate(p.certificateFile);
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2012 diff changeset	1887 std::string key, password;
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2012 diff changeset	1888
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2012 diff changeset	1889 if (p.certificateKeyFile)
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2012 diff changeset	1890 {
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2012 diff changeset	1891 key.assign(p.certificateKeyFile);
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2012 diff changeset	1892 }
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2012 diff changeset	1893
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2012 diff changeset	1894 if (p.certificateKeyPassword)
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2012 diff changeset	1895 {
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2012 diff changeset	1896 password.assign(p.certificateKeyPassword);
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2012 diff changeset	1897 }
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2012 diff changeset	1898
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2012 diff changeset	1899 client.SetClientCertificate(certificate, key, password);
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2012 diff changeset	1900 }
9c9332e486ca HTTPS client certificates can be associated with Orthanc peers to enhance security over Internet Sebastien Jodogne <s.jodogne@gmail.com> parents: 2012 diff changeset	1901
2041 9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	1902 client.SetPkcs11Enabled(p.pkcs11 ? true : false);
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2019 diff changeset	1903
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1904 for (uint32_t i = 0; i < p.headersCount; i++)
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1905 {
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1906 if (p.headersKeys[i] == NULL \|\|
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1907 p.headersValues[i] == NULL)
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1908 {
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1909 throw OrthancException(ErrorCode_NullPointer);
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1910 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1911
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1912 client.AddHeader(p.headersKeys[i], p.headersValues[i]);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1913 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1914
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1915 switch (p.method)
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1916 {
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1917 case OrthancPluginHttpMethod_Get:
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1918 client.SetMethod(HttpMethod_Get);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1919 break;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1920
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1921 case OrthancPluginHttpMethod_Post:
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1922 client.SetMethod(HttpMethod_Post);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1923 client.GetBody().assign(p.body, p.bodySize);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1924 break;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1925
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1926 case OrthancPluginHttpMethod_Put:
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1927 client.SetMethod(HttpMethod_Put);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1928 client.GetBody().assign(p.body, p.bodySize);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1929 break;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1930
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1931 case OrthancPluginHttpMethod_Delete:
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1932 client.SetMethod(HttpMethod_Delete);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1933 break;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1934
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1935 default:
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1936 throw OrthancException(ErrorCode_ParameterOutOfRange);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1937 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1938
2041 9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	1939 std::string body;
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	1940 HttpClient::HttpHeaders headers;
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	1941
2787 ad2c32082653 Fix OrthancPluginHttpClient() to return the HTTP status on errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	1942 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	1943
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	1944 // The HTTP request has succeeded
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	1945 *p.httpStatus = static_cast<uint16_t>(client.GetLastStatus());
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	1946
2787 ad2c32082653 Fix OrthancPluginHttpClient() to return the HTTP status on errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	1947 if (!success)
ad2c32082653 Fix OrthancPluginHttpClient() to return the HTTP status on errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	1948 {
ad2c32082653 Fix OrthancPluginHttpClient() to return the HTTP status on errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	1949 HttpClient::ThrowException(client.GetLastStatus());
ad2c32082653 Fix OrthancPluginHttpClient() to return the HTTP status on errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	1950 }
ad2c32082653 Fix OrthancPluginHttpClient() to return the HTTP status on errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	1951
2041 9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	1952 // Copy the HTTP headers of the answer, if the plugin requested them
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	1953 if (p.answerHeaders != NULL)
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1954 {
2041 9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	1955 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	1956
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	1957 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	1958 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	1959 {
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	1960 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	1961 }
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	1962
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	1963 std::string s = json.toStyledString();
9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	1964 CopyToMemoryBuffer(*p.answerHeaders, s);
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1965 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1966
2041 9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	1967 // Copy the body of the answer if it makes sense
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1968 if (p.method != OrthancPluginHttpMethod_Delete)
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1969 {
2041 9f61ca1e3eb3 OrthancPluginHttpClient can return the HTTP headers of the answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2028 diff changeset	1970 CopyToMemoryBuffer(*p.answerBody, body);
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1971 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1972 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1973
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	1974
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1975 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	1976 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1977 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	1978 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	1979
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1980 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	1981 client.SetConvertHeadersToLowerCase(false);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1982
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1983 if (p.timeout != 0)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1984 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1985 client.SetTimeout(p.timeout);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1986 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1987
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1988 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	1989 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1990 if (p.additionalHeadersKeys[i] == NULL \|\|
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1991 p.additionalHeadersValues[i] == NULL)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1992 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1993 throw OrthancException(ErrorCode_NullPointer);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1994 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1995
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1996 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	1997 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1998
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	1999 switch (p.method)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2000 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2001 case OrthancPluginHttpMethod_Get:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2002 client.SetMethod(HttpMethod_Get);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2003 break;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2004
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2005 case OrthancPluginHttpMethod_Post:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2006 client.SetMethod(HttpMethod_Post);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2007 client.GetBody().assign(p.body, p.bodySize);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2008 break;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2009
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2010 case OrthancPluginHttpMethod_Put:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2011 client.SetMethod(HttpMethod_Put);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2012 client.GetBody().assign(p.body, p.bodySize);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2013 break;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2014
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2015 case OrthancPluginHttpMethod_Delete:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2016 client.SetMethod(HttpMethod_Delete);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2017 break;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2018
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2019 default:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2020 throw OrthancException(ErrorCode_ParameterOutOfRange);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2021 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2022
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2023 std::string body;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2024 HttpClient::HttpHeaders headers;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2025
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2026 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	2027
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2028 // The HTTP request has succeeded
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2029 *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	2030
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2031 if (!success)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2032 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2033 HttpClient::ThrowException(client.GetLastStatus());
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2034 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2035
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2036 // 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	2037 if (p.answerHeaders != NULL)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2038 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2039 Json::Value json = Json::objectValue;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2040
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2041 for (HttpClient::HttpHeaders::const_iterator
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2042 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	2043 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2044 json[it->first] = it->second;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2045 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2046
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2047 std::string s = json.toStyledString();
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2048 CopyToMemoryBuffer(*p.answerHeaders, s);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2049 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2050
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2051 // 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	2052 if (p.method != OrthancPluginHttpMethod_Delete)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2053 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2054 CopyToMemoryBuffer(*p.answerBody, body);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2055 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2056 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2057
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2058
1608 adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2059 void OrthancPlugins::ConvertPixelFormat(const void* parameters)
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2060 {
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2061 const _OrthancPluginConvertPixelFormat& p = reinterpret_cast<const _OrthancPluginConvertPixelFormat>(parameters);
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2062 const ImageAccessor& source = reinterpret_cast<const ImageAccessor>(p.source);
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2063
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2045 diff changeset	2064 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	2065 ImageProcessing::Convert(*target, source);
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2066
1843 d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2067 *(p.target) = ReturnImage(target);
1608 adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2068 }
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2069
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2070
1613 1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2071
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2072 void OrthancPlugins::GetFontInfo(const void* parameters)
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2073 {
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2074 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	2075
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2076 const Font& font = Configuration::GetFontRegistry().GetFont(p.fontIndex);
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2077
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2078 if (p.name != NULL)
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2079 {
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2080 *(p.name) = font.GetName().c_str();
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2081 }
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2082 else if (p.size != NULL)
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2083 {
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2084 *(p.size) = font.GetSize();
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2085 }
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2086 else
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2087 {
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2088 throw OrthancException(ErrorCode_InternalError);
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2089 }
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2090 }
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2091
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2092
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2093 void OrthancPlugins::DrawText(const void* parameters)
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2094 {
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2095 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	2096
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2097 ImageAccessor& target = reinterpret_cast<ImageAccessor>(p.image);
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2098 const Font& font = Configuration::GetFontRegistry().GetFont(p.fontIndex);
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2099
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2100 font.Draw(target, p.utf8Text, p.x, p.y, p.r, p.g, p.b);
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2101 }
1740 5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2102
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2103
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2104 void OrthancPlugins::ApplyDicomToJson(_OrthancPluginService service,
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2105 const void* parameters)
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2106 {
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2107 const _OrthancPluginDicomToJson& p =
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2108 reinterpret_cast<const _OrthancPluginDicomToJson>(parameters);
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2109
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2110 std::auto_ptr<ParsedDicomFile> dicom;
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2111
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2112 if (service == _OrthancPluginService_DicomBufferToJson)
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2113 {
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2114 dicom.reset(new ParsedDicomFile(p.buffer, p.size));
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2115 }
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2116 else
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2117 {
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2118 if (p.instanceId == NULL)
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2119 {
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2120 throw OrthancException(ErrorCode_NullPointer);
1740 5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2121 }
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2122
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2123 std::string content;
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2124
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2125 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2126 PImpl::ServerContextLock lock(*pimpl_);
2124 2b1520efa282 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	2127 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	2128 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2129
1740 5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2130 dicom.reset(new ParsedDicomFile(content));
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2131 }
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2132
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2133 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	2134 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	2135 static_cast<DicomToJsonFlags>(p.flags), p.maxStringLength);
1740 5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2136
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2137 Json::FastWriter writer;
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2138 *p.result = CopyString(writer.write(json));
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2139 }
1613 1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2140
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2141
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2142 void OrthancPlugins::ApplyCreateDicom(_OrthancPluginService service,
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2143 const void* parameters)
1821 580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2144 {
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2145 const _OrthancPluginCreateDicom& p =
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2146 reinterpret_cast<const _OrthancPluginCreateDicom>(parameters);
1821 580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2147
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2148 Json::Value json;
1829 31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2149
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2150 if (p.json == NULL)
1821 580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2151 {
1829 31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2152 json = Json::objectValue;
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2153 }
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2154 else
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2155 {
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2156 Json::Reader reader;
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2157 if (!reader.parse(p.json, json))
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2158 {
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2159 throw OrthancException(ErrorCode_BadJson);
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2160 }
1821 580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2161 }
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2162
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2163 std::string dicom;
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2164
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2165 {
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2166 std::auto_ptr<ParsedDicomFile> file
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2167 (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	2168
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2169 if (p.pixelData)
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2170 {
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2171 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	2172 }
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2173
1821 580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2174 file->SaveToMemoryBuffer(dicom);
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2175 }
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2176
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2177 CopyToMemoryBuffer(*p.target, dicom);
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2178 }
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2179
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2180
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2181 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	2182 const void* parameters)
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2183 {
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2184 const _OrthancPluginComputeHash& p =
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2185 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	2186
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2187 std::string hash;
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2188 switch (service)
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2189 {
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2190 case _OrthancPluginService_ComputeMd5:
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2191 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	2192 break;
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2193
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2194 case _OrthancPluginService_ComputeSha1:
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2195 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	2196 break;
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2197
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2198 default:
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2199 throw OrthancException(ErrorCode_ParameterOutOfRange);
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2200 }
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2201
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2202 *p.result = CopyString(hash);
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2203 }
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2204
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2205
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2206 void OrthancPlugins::ApplyCreateImage(_OrthancPluginService service,
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2207 const void* parameters)
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2208 {
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2209 const _OrthancPluginCreateImage& p =
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2210 reinterpret_cast<const _OrthancPluginCreateImage>(parameters);
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2211
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2212 std::auto_ptr<ImageAccessor> result;
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2213
1829 31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2214 switch (service)
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2215 {
1829 31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2216 case _OrthancPluginService_CreateImage:
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2045 diff changeset	2217 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	2218 break;
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2219
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2220 case _OrthancPluginService_CreateImageAccessor:
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2221 result.reset(new ImageAccessor);
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2222 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	2223 break;
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2224
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2225 case _OrthancPluginService_DecodeDicomImage:
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2226 {
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	2227 result.reset(Decode(p.constBuffer, p.bufferSize, p.frameIndex));
1829 31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2228 break;
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2229 }
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2230
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2231 default:
31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2232 throw OrthancException(ErrorCode_InternalError);
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2233 }
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2234
1843 d10a8164da5f ensure images returned to plugins are writable Sebastien Jodogne <s.jodogne@gmail.com> parents: 1842 diff changeset	2235 *(p.target) = ReturnImage(result);
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2236 }
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2237
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2238
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2239 void OrthancPlugins::ApplySendMultipartItem(const void* parameters)
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2240 {
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2241 // An exception might be raised in this function if the
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2242 // connection was closed by the HTTP client.
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2243 const _OrthancPluginAnswerBuffer& p =
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2244 reinterpret_cast<const _OrthancPluginAnswerBuffer>(parameters);
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2245
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2246 HttpOutput* output = reinterpret_cast<HttpOutput*>(p.output);
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2247
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2248 std::map<std::string, std::string> headers; // No custom headers
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2249 output->SendMultipartItem(p.answer, p.answerSize, headers);
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2250 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2251
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2252
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2253 void OrthancPlugins::ApplySendMultipartItem2(const void* parameters)
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2254 {
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2255 // An exception might be raised in this function if the
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2256 // connection was closed by the HTTP client.
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2257 const _OrthancPluginSendMultipartItem2& p =
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2258 reinterpret_cast<const _OrthancPluginSendMultipartItem2>(parameters);
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2259 HttpOutput* output = reinterpret_cast<HttpOutput*>(p.output);
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2260
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2261 std::map<std::string, std::string> headers;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2262 for (uint32_t i = 0; i < p.headersCount; i++)
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2263 {
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2264 headers[p.headersKeys[i]] = p.headersValues[i];
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2265 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2266
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2267 output->SendMultipartItem(p.answer, p.answerSize, headers);
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2268 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2269
1821 580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2270
1771 8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2271 void OrthancPlugins::DatabaseAnswer(const void* parameters)
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2272 {
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2273 const _OrthancPluginDatabaseAnswer& p =
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2274 reinterpret_cast<const _OrthancPluginDatabaseAnswer>(parameters);
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2275
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2276 if (pimpl_->database_.get() != NULL)
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2277 {
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2278 pimpl_->database_->AnswerReceived(p);
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2279 }
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2280 else
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2281 {
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2282 LOG(ERROR) << "Cannot invoke this service without a custom database back-end";
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2283 throw OrthancException(ErrorCode_BadRequest);
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2284 }
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2285 }
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2286
8790488ae98b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1768 diff changeset	2287
1861 a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2288 namespace
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2289 {
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2290 class DictionaryReadLocker
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2291 {
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2292 private:
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2293 const DcmDataDictionary& dictionary_;
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2294
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2295 public:
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2296 DictionaryReadLocker() : dictionary_(dcmDataDict.rdlock())
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2297 {
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2298 }
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2299
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2300 ~DictionaryReadLocker()
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2301 {
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2302 dcmDataDict.unlock();
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2303 }
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2304
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2305 const DcmDataDictionary* operator->()
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2306 {
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2307 return &dictionary_;
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2308 }
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2309 };
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2310 }
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2311
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2312
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2313 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	2314 {
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2315 const _OrthancPluginLookupDictionary& p =
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2316 reinterpret_cast<const _OrthancPluginLookupDictionary>(parameters);
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2317
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2318 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	2319 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	2320
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2321 DictionaryReadLocker locker;
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2322 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	2323
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2324 if (entry == NULL)
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2325 {
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2326 throw OrthancException(ErrorCode_UnknownDicomTag);
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2327 }
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2328 else
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2329 {
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2330 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	2331 p.target->element = entry->getKey().getElement();
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2000 diff changeset	2332 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	2333 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	2334 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	2335 }
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2336 }
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2337
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2338
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2339 bool OrthancPlugins::InvokeSafeService(SharedLibrary& plugin,
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2340 _OrthancPluginService service,
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2341 const void* parameters)
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	2342 {
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2343 // 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	2344
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	2345 switch (service)
bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	2346 {
1145 0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	2347 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	2348 {
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	2349 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	2350 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	2351 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	2352 }
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	2353
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	2354 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	2355 {
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	2356 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	2357 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	2358 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	2359 }
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	2360
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	2361 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	2362 {
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	2363 reinterpret_cast<const _OrthancPluginRetrieveDynamicString>(parameters)->result =
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	2364 CopyString(Configuration::GetConfigurationAbsolutePath());
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	2365 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	2366 }
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1137 diff changeset	2367
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1407 diff changeset	2368 case _OrthancPluginService_GetConfiguration:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1407 diff changeset	2369 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1407 diff changeset	2370 std::string s;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1407 diff changeset	2371 Configuration::FormatConfiguration(s);
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1407 diff changeset	2372
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1407 diff changeset	2373 reinterpret_cast<const _OrthancPluginRetrieveDynamicString>(parameters)->result = CopyString(s);
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1407 diff changeset	2374 return true;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1407 diff changeset	2375 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1407 diff changeset	2376
1554 89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2377 case _OrthancPluginService_BufferCompression:
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2378 BufferCompression(parameters);
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2379 return true;
89ab71a68fcf New function OrthancPluginBufferCompression() to (un)compress memory buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1553 diff changeset	2380
907 9b8298234254 documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 904 diff changeset	2381 case _OrthancPluginService_AnswerBuffer:
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	2382 AnswerBuffer(parameters);
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	2383 return true;
bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	2384
907 9b8298234254 documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 904 diff changeset	2385 case _OrthancPluginService_CompressAndAnswerPngImage:
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	2386 CompressAndAnswerPngImage(parameters);
901 7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	2387 return true;
7d88f3f4a3b3 refactoring IsServedUri, answer PNG images, regular expression groups Sebastien Jodogne <s.jodogne@gmail.com> parents: 900 diff changeset	2388
1600 7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	2389 case _OrthancPluginService_CompressAndAnswerImage:
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	2390 CompressAndAnswerImage(parameters);
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	2391 return true;
7151d63e6d81 documentation, primitives for jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 1599 diff changeset	2392
907 9b8298234254 documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 904 diff changeset	2393 case _OrthancPluginService_GetDicomForInstance:
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	2394 GetDicomForInstance(parameters);
dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	2395 return true;
904 2732b5f57d9c sample to forward dicom data Sebastien Jodogne <s.jodogne@gmail.com> parents: 901 diff changeset	2396
912 dcb2469f00f4 PluginsHttpHandler::RestApiGet Sebastien Jodogne <s.jodogne@gmail.com> parents: 909 diff changeset	2397 case _OrthancPluginService_RestApiGet:
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2398 RestApiGet(parameters, false);
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2399 return true;
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2400
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2401 case _OrthancPluginService_RestApiGetAfterPlugins:
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2402 RestApiGet(parameters, true);
904 2732b5f57d9c sample to forward dicom data Sebastien Jodogne <s.jodogne@gmail.com> parents: 901 diff changeset	2403 return true;
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2404
1780 94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	2405 case _OrthancPluginService_RestApiGet2:
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	2406 RestApiGet2(parameters);
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	2407 return true;
94990da8710e OrthancPluginRestApiGet2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1771 diff changeset	2408
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2409 case _OrthancPluginService_RestApiPost:
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2410 RestApiPostPut(true, parameters, false);
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2411 return true;
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2412
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2413 case _OrthancPluginService_RestApiPostAfterPlugins:
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2414 RestApiPostPut(true, parameters, true);
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2415 return true;
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2416
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2417 case _OrthancPluginService_RestApiDelete:
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2418 RestApiDelete(parameters, false);
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2419 return true;
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2420
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2421 case _OrthancPluginService_RestApiDeleteAfterPlugins:
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2422 RestApiDelete(parameters, true);
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2423 return true;
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2424
3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2425 case _OrthancPluginService_RestApiPut:
1282 7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2426 RestApiPostPut(false, parameters, false);
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2427 return true;
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2428
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2429 case _OrthancPluginService_RestApiPutAfterPlugins:
7bccdd221e2b Plugins can do REST calls to other plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	2430 RestApiPostPut(false, parameters, true);
913 3e43de893d88 POST, DELETE, PUT from Orthanc plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 912 diff changeset	2431 return true;
904 2732b5f57d9c sample to forward dicom data Sebastien Jodogne <s.jodogne@gmail.com> parents: 901 diff changeset	2432
993 501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 944 diff changeset	2433 case _OrthancPluginService_Redirect:
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 944 diff changeset	2434 Redirect(parameters);
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 944 diff changeset	2435 return true;
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 944 diff changeset	2436
1042 8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	2437 case _OrthancPluginService_SendUnauthorized:
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	2438 SendUnauthorized(parameters);
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	2439 return true;
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	2440
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	2441 case _OrthancPluginService_SendMethodNotAllowed:
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	2442 SendMethodNotAllowed(parameters);
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	2443 return true;
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	2444
1594 2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	2445 case _OrthancPluginService_SendHttpStatus:
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	2446 SendHttpStatus(parameters);
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	2447 return true;
2bac60a4f584 OrthancPluginSendHttpStatus Sebastien Jodogne <s.jodogne@gmail.com> parents: 1593 diff changeset	2448
1042 8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	2449 case _OrthancPluginService_SendHttpStatusCode:
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	2450 SendHttpStatusCode(parameters);
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	2451 return true;
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	2452
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	2453 case _OrthancPluginService_SetCookie:
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	2454 SetCookie(parameters);
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	2455 return true;
8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1041 diff changeset	2456
1137 d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	2457 case _OrthancPluginService_SetHttpHeader:
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	2458 SetHttpHeader(parameters);
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	2459 return true;
d9c27f9f1a51 OrthancPluginSetHttpHeader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1136 diff changeset	2460
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2461 case _OrthancPluginService_LookupPatient:
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2462 case _OrthancPluginService_LookupStudy:
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2463 case _OrthancPluginService_LookupStudyWithAccessionNumber:
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2464 case _OrthancPluginService_LookupSeries:
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2465 case _OrthancPluginService_LookupInstance:
1069 a91b4900f06a plugin lookup using accession number Sebastien Jodogne <s.jodogne@gmail.com> parents: 1067 diff changeset	2466 LookupResource(service, parameters);
1037 6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2467 return true;
6208ab500ffd LookupResource service in plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	2468
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2469 case _OrthancPluginService_GetInstanceRemoteAet:
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2470 case _OrthancPluginService_GetInstanceSize:
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2471 case _OrthancPluginService_GetInstanceData:
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2472 case _OrthancPluginService_GetInstanceJson:
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2473 case _OrthancPluginService_GetInstanceSimplifiedJson:
1067 ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2474 case _OrthancPluginService_HasInstanceMetadata:
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	2475 case _OrthancPluginService_GetInstanceMetadata:
1815 2abfdca9b915 OrthancPluginGetInstanceOrigin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1810 diff changeset	2476 case _OrthancPluginService_GetInstanceOrigin:
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2477 AccessDicomInstance(service, parameters);
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2478 return true;
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	2479
1249 40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	2480 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	2481 {
1249 40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	2482 const _OrthancPluginGlobalProperty& p =
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	2483 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	2484 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	2485 {
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	2486 return false;
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	2487 }
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	2488 else
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	2489 {
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2490 PImpl::ServerContextLock lock(*pimpl_);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2491 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	2492 return true;
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	2493 }
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	2494 }
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	2495
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	2496 case _OrthancPluginService_GetGlobalProperty:
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	2497 {
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	2498 const _OrthancPluginGlobalProperty& p =
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	2499 reinterpret_cast<const _OrthancPluginGlobalProperty>(parameters);
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2500
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2501 std::string result;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2502
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2503 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2504 PImpl::ServerContextLock lock(*pimpl_);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2505 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	2506 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2507
1249 40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	2508 *(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	2509 return true;
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	2510 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	2511
1407 d371a66972a4 OrthancPluginGetExpectedDatabaseVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	2512 case _OrthancPluginService_GetExpectedDatabaseVersion:
d371a66972a4 OrthancPluginGetExpectedDatabaseVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	2513 {
d371a66972a4 OrthancPluginGetExpectedDatabaseVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	2514 const _OrthancPluginReturnSingleValue& p =
d371a66972a4 OrthancPluginGetExpectedDatabaseVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	2515 reinterpret_cast<const _OrthancPluginReturnSingleValue>(parameters);
d371a66972a4 OrthancPluginGetExpectedDatabaseVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	2516 *(p.resultUint32) = ORTHANC_DATABASE_VERSION;
d371a66972a4 OrthancPluginGetExpectedDatabaseVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	2517 return true;
d371a66972a4 OrthancPluginGetExpectedDatabaseVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	2518 }
d371a66972a4 OrthancPluginGetExpectedDatabaseVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 1363 diff changeset	2519
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	2520 case _OrthancPluginService_StartMultipartAnswer:
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	2521 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	2522 const _OrthancPluginStartMultipartAnswer& p =
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	2523 reinterpret_cast<const _OrthancPluginStartMultipartAnswer>(parameters);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	2524 HttpOutput* output = reinterpret_cast<HttpOutput*>(p.output);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	2525 output->StartMultipart(p.subType, p.contentType);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	2526 return true;
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	2527 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	2528
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	2529 case _OrthancPluginService_SendMultipartItem:
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2530 ApplySendMultipartItem(parameters);
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	2531 return true;
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2532
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2533 case _OrthancPluginService_SendMultipartItem2:
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2534 ApplySendMultipartItem2(parameters);
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1861 diff changeset	2535 return true;
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1425 diff changeset	2536
1588 b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	2537 case _OrthancPluginService_ReadFile:
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	2538 {
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	2539 const _OrthancPluginReadFile& p =
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	2540 reinterpret_cast<const _OrthancPluginReadFile>(parameters);
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	2541
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	2542 std::string content;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	2543 SystemToolbox::ReadFile(content, p.path);
1588 b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	2544 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	2545
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	2546 return true;
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	2547 }
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	2548
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	2549 case _OrthancPluginService_WriteFile:
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	2550 {
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	2551 const _OrthancPluginWriteFile& p =
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	2552 reinterpret_cast<const _OrthancPluginWriteFile>(parameters);
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	2553 SystemToolbox::WriteFile(p.data, p.size, p.path);
1588 b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	2554 return true;
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	2555 }
b5bc87a7212d OrthancPluginReadFile, OrthancPluginWriteFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 1581 diff changeset	2556
1593 235d89817b89 OrthancPluginGetErrorDescription Sebastien Jodogne <s.jodogne@gmail.com> parents: 1588 diff changeset	2557 case _OrthancPluginService_GetErrorDescription:
235d89817b89 OrthancPluginGetErrorDescription Sebastien Jodogne <s.jodogne@gmail.com> parents: 1588 diff changeset	2558 {
235d89817b89 OrthancPluginGetErrorDescription Sebastien Jodogne <s.jodogne@gmail.com> parents: 1588 diff changeset	2559 const _OrthancPluginGetErrorDescription& p =
235d89817b89 OrthancPluginGetErrorDescription Sebastien Jodogne <s.jodogne@gmail.com> parents: 1588 diff changeset	2560 reinterpret_cast<const _OrthancPluginGetErrorDescription>(parameters);
235d89817b89 OrthancPluginGetErrorDescription Sebastien Jodogne <s.jodogne@gmail.com> parents: 1588 diff changeset	2561 *(p.target) = EnumerationToString(static_cast<ErrorCode>(p.error));
235d89817b89 OrthancPluginGetErrorDescription Sebastien Jodogne <s.jodogne@gmail.com> parents: 1588 diff changeset	2562 return true;
235d89817b89 OrthancPluginGetErrorDescription Sebastien Jodogne <s.jodogne@gmail.com> parents: 1588 diff changeset	2563 }
235d89817b89 OrthancPluginGetErrorDescription Sebastien Jodogne <s.jodogne@gmail.com> parents: 1588 diff changeset	2564
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2565 case _OrthancPluginService_GetImagePixelFormat:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2566 {
1599 dd1f9e81f891 fixes to image primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	2567 const _OrthancPluginGetImageInfo& p = reinterpret_cast<const _OrthancPluginGetImageInfo>(parameters);
1625 c17b1142caab reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1624 diff changeset	2568 (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	2569 return true;
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2570 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2571
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2572 case _OrthancPluginService_GetImageWidth:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2573 {
1599 dd1f9e81f891 fixes to image primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	2574 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	2575 (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	2576 return true;
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2577 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2578
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2579 case _OrthancPluginService_GetImageHeight:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2580 {
1599 dd1f9e81f891 fixes to image primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	2581 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	2582 (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	2583 return true;
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2584 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2585
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2586 case _OrthancPluginService_GetImagePitch:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2587 {
1599 dd1f9e81f891 fixes to image primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	2588 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	2589 (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	2590 return true;
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2591 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2592
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2593 case _OrthancPluginService_GetImageBuffer:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2594 {
1599 dd1f9e81f891 fixes to image primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	2595 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	2596 (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	2597 return true;
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2598 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2599
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2600 case _OrthancPluginService_FreeImage:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2601 {
1605 fd0464ce1962 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1604 diff changeset	2602 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	2603
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2604 if (p.image != NULL)
1609 c74495267acf Implementation of the "GetAllPublicIdsWithLimit" extension Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	2605 {
c74495267acf Implementation of the "GetAllPublicIdsWithLimit" extension Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	2606 delete reinterpret_cast<ImageAccessor*>(p.image);
c74495267acf Implementation of the "GetAllPublicIdsWithLimit" extension Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	2607 }
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2608
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2609 return true;
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2610 }
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2611
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2612 case _OrthancPluginService_UncompressImage:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2613 UncompressImage(parameters);
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2614 return true;
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2615
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2616 case _OrthancPluginService_CompressImage:
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2617 CompressImage(parameters);
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2618 return true;
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	2619
1606 31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	2620 case _OrthancPluginService_CallHttpClient:
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	2621 CallHttpClient(parameters);
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	2622 return true;
31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1605 diff changeset	2623
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2624 case _OrthancPluginService_CallHttpClient2:
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2625 CallHttpClient2(parameters);
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2626 return true;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2627
1608 adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2628 case _OrthancPluginService_ConvertPixelFormat:
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2629 ConvertPixelFormat(parameters);
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2630 return true;
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	2631
1613 1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2632 case _OrthancPluginService_GetFontsCount:
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2633 {
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2634 const _OrthancPluginReturnSingleValue& p =
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2635 reinterpret_cast<const _OrthancPluginReturnSingleValue>(parameters);
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2636 *(p.resultUint32) = Configuration::GetFontRegistry().GetSize();
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2637 return true;
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2638 }
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2639
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2640 case _OrthancPluginService_GetFontInfo:
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2641 GetFontInfo(parameters);
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2642 return true;
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2643
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2644 case _OrthancPluginService_DrawText:
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2645 DrawText(parameters);
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2646 return true;
1ec254a7c645 drawing texts on image from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	2647
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2648 case _OrthancPluginService_StorageAreaCreate:
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2649 {
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2650 const _OrthancPluginStorageAreaCreate& p =
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2651 reinterpret_cast<const _OrthancPluginStorageAreaCreate>(parameters);
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2652 IStorageArea& storage = reinterpret_cast<IStorageArea>(p.storageArea);
2028 d108412411e5 fix msvc warnings sjodogne parents: 2022 diff changeset	2653 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	2654 return true;
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2655 }
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2656
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2657 case _OrthancPluginService_StorageAreaRead:
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2658 {
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2659 const _OrthancPluginStorageAreaRead& p =
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2660 reinterpret_cast<const _OrthancPluginStorageAreaRead>(parameters);
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2661 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	2662 std::string content;
1625 c17b1142caab reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1624 diff changeset	2663 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	2664 CopyToMemoryBuffer(*p.target, content);
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2665 return true;
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2666 }
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2667
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2668 case _OrthancPluginService_StorageAreaRemove:
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2669 {
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2670 const _OrthancPluginStorageAreaRemove& p =
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2671 reinterpret_cast<const _OrthancPluginStorageAreaRemove>(parameters);
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2672 IStorageArea& storage = reinterpret_cast<IStorageArea>(p.storageArea);
1625 c17b1142caab reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1624 diff changeset	2673 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	2674 return true;
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2675 }
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1613 diff changeset	2676
1740 5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2677 case _OrthancPluginService_DicomBufferToJson:
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2678 case _OrthancPluginService_DicomInstanceToJson:
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2679 ApplyDicomToJson(service, parameters);
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2680 return true;
5e99a70b0635 DicomToJson callable from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1673 diff changeset	2681
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2682 case _OrthancPluginService_CreateDicom:
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2683 ApplyCreateDicom(service, parameters);
1821 580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2684 return true;
580951a33583 OrthancPluginDicomFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1817 diff changeset	2685
1810 796d0b087fb8 more consistent naming in worklist primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1809 diff changeset	2686 case _OrthancPluginService_WorklistAddAnswer:
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	2687 {
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	2688 const _OrthancPluginWorklistAnswersOperation& p =
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	2689 reinterpret_cast<const _OrthancPluginWorklistAnswersOperation>(parameters);
1802 138664eb59de sample worklist plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1801 diff changeset	2690 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	2691 return true;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	2692 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	2693
1810 796d0b087fb8 more consistent naming in worklist primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1809 diff changeset	2694 case _OrthancPluginService_WorklistMarkIncomplete:
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	2695 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	2696 const _OrthancPluginWorklistAnswersOperation& p =
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	2697 reinterpret_cast<const _OrthancPluginWorklistAnswersOperation>(parameters);
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	2698 reinterpret_cast<DicomFindAnswers*>(p.answers)->SetComplete(false);
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	2699 return true;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	2700 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	2701
1810 796d0b087fb8 more consistent naming in worklist primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1809 diff changeset	2702 case _OrthancPluginService_WorklistIsMatch:
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	2703 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	2704 const _OrthancPluginWorklistQueryOperation& p =
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	2705 reinterpret_cast<const _OrthancPluginWorklistQueryOperation>(parameters);
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	2706 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	2707 return true;
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	2708 }
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	2709
1810 796d0b087fb8 more consistent naming in worklist primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1809 diff changeset	2710 case _OrthancPluginService_WorklistGetDicomQuery:
1801 2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	2711 {
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	2712 const _OrthancPluginWorklistQueryOperation& p =
2c60c357ee3e sdk primitives to handle worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	2713 reinterpret_cast<const _OrthancPluginWorklistQueryOperation>(parameters);
1812 8e5600e699c0 rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1810 diff changeset	2714 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	2715 return true;
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	2716 }
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	2717
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2718 case _OrthancPluginService_FindAddAnswer:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2719 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2720 const _OrthancPluginFindOperation& p =
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2721 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	2722 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	2723 return true;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2724 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2725
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2726 case _OrthancPluginService_FindMarkIncomplete:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2727 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2728 const _OrthancPluginFindOperation& p =
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2729 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	2730 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	2731 return true;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2732 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2733
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2734 case _OrthancPluginService_GetFindQuerySize:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2735 case _OrthancPluginService_GetFindQueryTag:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2736 case _OrthancPluginService_GetFindQueryTagName:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2737 case _OrthancPluginService_GetFindQueryValue:
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2738 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2739 const _OrthancPluginFindOperation& p =
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2740 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	2741 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	2742 return true;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2743 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	2744
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2745 case _OrthancPluginService_CreateImage:
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2746 case _OrthancPluginService_CreateImageAccessor:
1829 31df3b48925e OrthancPluginDecodeDicomImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 1828 diff changeset	2747 case _OrthancPluginService_DecodeDicomImage:
1827 4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2748 ApplyCreateImage(service, parameters);
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2749 return true;
4b6673e828f4 "OrthancPluginCreateImage()" and "OrthancPluginCreateImageAccessor()" to create images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	2750
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2751 case _OrthancPluginService_ComputeMd5:
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2752 case _OrthancPluginService_ComputeSha1:
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2753 ComputeHash(service, parameters);
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2754 return true;
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1829 diff changeset	2755
1861 a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2756 case _OrthancPluginService_LookupDictionary:
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2757 ApplyLookupDictionary(parameters);
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2758 return true;
a7bea843a7bc "OrthancPluginLookupDictionary()" to get information about some DICOM tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	2759
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2760 case _OrthancPluginService_GenerateUuid:
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2761 {
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2762 reinterpret_cast<const _OrthancPluginRetrieveDynamicString>(parameters)->result =
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2763 CopyString(Toolbox::GenerateUuid());
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2764 return true;
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2765 }
ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1984 diff changeset	2766
2210 7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2767 case _OrthancPluginService_CreateFindMatcher:
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2768 {
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2769 const _OrthancPluginCreateFindMatcher& p =
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2770 reinterpret_cast<const _OrthancPluginCreateFindMatcher>(parameters);
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2771 ParsedDicomFile query(p.query, p.size);
2256 de1ba22fd28a simplification wrt. modality manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	2772 (p.target) = reinterpret_cast<OrthancPluginFindMatcher>(new HierarchicalMatcher(query));
2210 7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2773 return true;
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2774 }
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2775
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2776 case _OrthancPluginService_FreeFindMatcher:
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2777 {
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2778 const _OrthancPluginFreeFindMatcher& p =
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2779 reinterpret_cast<const _OrthancPluginFreeFindMatcher>(parameters);
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2780
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2781 if (p.matcher != NULL)
2210 7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2782 {
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2783 delete reinterpret_cast<HierarchicalMatcher*>(p.matcher);
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2784 }
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2785
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2786 return true;
2210 7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2787 }
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2788
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2789 case _OrthancPluginService_FindMatcherIsMatch:
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2790 {
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2791 const _OrthancPluginFindMatcherIsMatch& p =
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2792 reinterpret_cast<const _OrthancPluginFindMatcherIsMatch>(parameters);
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2793
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2794 if (p.matcher == NULL)
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2795 {
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2796 throw OrthancException(ErrorCode_NullPointer);
2210 7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2797 }
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2798 else
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2799 {
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2800 ParsedDicomFile query(p.dicom, p.size);
2215 028214a95194 refactoring the worklist sample Sebastien Jodogne <s.jodogne@gmail.com> parents: 2210 diff changeset	2801 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	2802 return true;
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2803 }
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2804 }
7bcff7bb7cbf OrthancPluginFindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	2805
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2806 case _OrthancPluginService_GetPeers:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2807 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2808 const _OrthancPluginGetPeers& p =
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2809 reinterpret_cast<const _OrthancPluginGetPeers>(parameters);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2810 (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	2811 return true;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2812 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2813
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2814 case _OrthancPluginService_FreePeers:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2815 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2816 const _OrthancPluginFreePeers& p =
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2817 reinterpret_cast<const _OrthancPluginFreePeers>(parameters);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2818
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2819 if (p.peers != NULL)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2820 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2821 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	2822 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2823
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2824 return true;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2825 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2826
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2827 case _OrthancPluginService_GetPeersCount:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2828 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2829 const _OrthancPluginGetPeersCount& p =
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2830 reinterpret_cast<const _OrthancPluginGetPeersCount>(parameters);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2831
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2832 if (p.peers == NULL)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2833 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2834 throw OrthancException(ErrorCode_NullPointer);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2835 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2836 else
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2837 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2838 (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	2839 return true;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2840 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2841 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2842
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2843 case _OrthancPluginService_GetPeerName:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2844 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2845 const _OrthancPluginGetPeerProperty& p =
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2846 reinterpret_cast<const _OrthancPluginGetPeerProperty>(parameters);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2847
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2848 if (p.peers == NULL)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2849 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2850 throw OrthancException(ErrorCode_NullPointer);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2851 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2852 else
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2853 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2854 (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	2855 return true;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2856 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2857 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2858
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2859 case _OrthancPluginService_GetPeerUrl:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2860 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2861 const _OrthancPluginGetPeerProperty& p =
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2862 reinterpret_cast<const _OrthancPluginGetPeerProperty>(parameters);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2863
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2864 if (p.peers == NULL)
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2865 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2866 throw OrthancException(ErrorCode_NullPointer);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2867 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2868 else
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2869 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2870 (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	2871 return true;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2872 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2873 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2874
2823 807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2875 case _OrthancPluginService_GetPeerUserProperty:
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2876 {
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2877 const _OrthancPluginGetPeerProperty& p =
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2878 reinterpret_cast<const _OrthancPluginGetPeerProperty>(parameters);
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2879
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2880 if (p.peers == NULL \|\|
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2881 p.userProperty == NULL)
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2882 {
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2883 throw OrthancException(ErrorCode_NullPointer);
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2884 }
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2885 else
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2886 {
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2887 const WebServiceParameters::Dictionary& properties =
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2888 reinterpret_cast<const OrthancPeers*>(p.peers)->GetPeerParameters(p.peerIndex).GetUserProperties();
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2889
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2890 WebServiceParameters::Dictionary::const_iterator found =
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2891 properties.find(p.userProperty);
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2892
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2893 if (found == properties.end())
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2894 {
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2895 *(p.target) = NULL;
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2896 }
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2897 else
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2898 {
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2899 *(p.target) = found->second.c_str();
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2900 }
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2901
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2902 return true;
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2903 }
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2904 }
807169f85ba9 OrthancPluginGetPeerUserProperty() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2820 diff changeset	2905
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2906 case _OrthancPluginService_CallPeerApi:
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2907 CallPeerApi(parameters);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2908 return true;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2787 diff changeset	2909
2815 925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2910 case _OrthancPluginService_CreateJob:
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2911 {
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2912 const _OrthancPluginCreateJob& p =
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2913 reinterpret_cast<const _OrthancPluginCreateJob>(parameters);
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2914 (p.target) = reinterpret_cast<OrthancPluginJob>(new PluginsJob(p));
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2915 return true;
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2916 }
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2917
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2918 case _OrthancPluginService_FreeJob:
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2919 {
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2920 const _OrthancPluginFreeJob& p =
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2921 reinterpret_cast<const _OrthancPluginFreeJob>(parameters);
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2922
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2923 if (p.job != NULL)
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2924 {
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2925 delete reinterpret_cast<PluginsJob*>(p.job);
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2926 }
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2927
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2928 return true;
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2929 }
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2930
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	2931 case _OrthancPluginService_SubmitJob:
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	2932 {
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	2933 const _OrthancPluginSubmitJob& p =
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	2934 reinterpret_cast<const _OrthancPluginSubmitJob>(parameters);
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	2935
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	2936 std::string uuid;
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	2937
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	2938 PImpl::ServerContextLock lock(*pimpl_);
2815 925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2939 lock.GetContext().GetJobsEngine().GetRegistry().Submit
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	2940 (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	2941
2814 7d1d3136f6cf more generic handling of content and serialization in plugin jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2813 diff changeset	2942 *p.resultId = CopyString(uuid);
2813 6d5b20af216f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2808 diff changeset	2943
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	2944 return true;
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	2945 }
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	2946
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	2947 default:
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2948 return false;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2949 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2950 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2951
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2952
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2953
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2954 bool OrthancPlugins::InvokeProtectedService(SharedLibrary& plugin,
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2955 _OrthancPluginService service,
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2956 const void* parameters)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2957 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2958 // 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	2959 // 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	2960 // should be listed here.
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2961
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2962 switch (service)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2963 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2964 case _OrthancPluginService_RegisterRestCallback:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2965 RegisterRestCallback(parameters, true);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2966 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2967
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2968 case _OrthancPluginService_RegisterRestCallbackNoLock:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2969 RegisterRestCallback(parameters, false);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2970 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2971
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2972 case _OrthancPluginService_RegisterOnStoredInstanceCallback:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2973 RegisterOnStoredInstanceCallback(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2974 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2975
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2976 case _OrthancPluginService_RegisterOnChangeCallback:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2977 RegisterOnChangeCallback(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2978 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2979
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2980 case _OrthancPluginService_RegisterWorklistCallback:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2981 RegisterWorklistCallback(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2982 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2983
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2984 case _OrthancPluginService_RegisterFindCallback:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2985 RegisterFindCallback(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2986 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2987
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2988 case _OrthancPluginService_RegisterMoveCallback:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2989 RegisterMoveCallback(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2990 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2991
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2992 case _OrthancPluginService_RegisterDecodeImageCallback:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2993 RegisterDecodeImageCallback(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2994 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	2995
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	2996 case _OrthancPluginService_RegisterJobsUnserializer:
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	2997 RegisterJobsUnserializer(parameters);
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	2998 return true;
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	2999
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3000 case _OrthancPluginService_RegisterIncomingHttpRequestFilter:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3001 RegisterIncomingHttpRequestFilter(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3002 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3003
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3004 case _OrthancPluginService_RegisterIncomingHttpRequestFilter2:
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3005 RegisterIncomingHttpRequestFilter2(parameters);
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3006 return true;
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3007
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3008 case _OrthancPluginService_RegisterStorageArea:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3009 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3010 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	3011 const _OrthancPluginRegisterStorageArea& p =
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3012 reinterpret_cast<const _OrthancPluginRegisterStorageArea>(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3013
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3014 if (pimpl_->storageArea_.get() == NULL)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3015 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3016 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	3017 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3018 else
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3019 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3020 throw OrthancException(ErrorCode_StorageAreaAlreadyRegistered);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3021 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3022
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3023 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3024 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3025
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3026 case _OrthancPluginService_SetPluginProperty:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3027 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3028 const _OrthancPluginSetPluginProperty& p =
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3029 reinterpret_cast<const _OrthancPluginSetPluginProperty>(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3030 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	3031 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3032 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3033
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3034 case _OrthancPluginService_GetCommandLineArgumentsCount:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3035 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3036 const _OrthancPluginReturnSingleValue& p =
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3037 reinterpret_cast<const _OrthancPluginReturnSingleValue>(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3038 *(p.resultUint32) = pimpl_->argc_ - 1;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3039 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3040 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3041
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3042 case _OrthancPluginService_GetCommandLineArgument:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3043 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3044 const _OrthancPluginGlobalProperty& p =
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3045 reinterpret_cast<const _OrthancPluginGlobalProperty>(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3046
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3047 if (p.property + 1 > pimpl_->argc_)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3048 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3049 return false;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3050 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3051 else
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3052 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3053 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	3054 *(p.result) = CopyString(arg);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3055 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3056 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3057 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3058
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3059 case _OrthancPluginService_RegisterDatabaseBackend:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3060 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3061 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	3062
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3063 const _OrthancPluginRegisterDatabaseBackend& p =
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3064 reinterpret_cast<const _OrthancPluginRegisterDatabaseBackend>(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3065
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3066 if (pimpl_->database_.get() == NULL)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3067 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3068 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	3069 *p.backend, NULL, 0, p.payload));
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3070 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3071 else
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3072 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3073 throw OrthancException(ErrorCode_DatabaseBackendAlreadyRegistered);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3074 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3075
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3076 (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	3077
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3078 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3079 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3080
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3081 case _OrthancPluginService_RegisterDatabaseBackendV2:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3082 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3083 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	3084
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3085 const _OrthancPluginRegisterDatabaseBackendV2& p =
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3086 reinterpret_cast<const _OrthancPluginRegisterDatabaseBackendV2>(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3087
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3088 if (pimpl_->database_.get() == NULL)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3089 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3090 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	3091 *p.backend, p.extensions,
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3092 p.extensionsSize, p.payload));
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3093 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3094 else
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3095 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3096 throw OrthancException(ErrorCode_DatabaseBackendAlreadyRegistered);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3097 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3098
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3099 (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	3100
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3101 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3102 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3103
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3104 case _OrthancPluginService_DatabaseAnswer:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3105 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	3106
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3107 case _OrthancPluginService_RegisterErrorCode:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3108 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3109 const _OrthancPluginRegisterErrorCode& p =
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3110 reinterpret_cast<const _OrthancPluginRegisterErrorCode>(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3111 *(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	3112 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3113 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3114
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3115 case _OrthancPluginService_RegisterDictionaryTag:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3116 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3117 const _OrthancPluginRegisterDictionaryTag& p =
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3118 reinterpret_cast<const _OrthancPluginRegisterDictionaryTag>(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3119 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	3120 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	3121 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	3122 return true;
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	3123 }
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	3124
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	3125 case _OrthancPluginService_RegisterPrivateDictionaryTag:
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	3126 {
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	3127 const _OrthancPluginRegisterPrivateDictionaryTag& p =
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	3128 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	3129 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	3130 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	3131 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	3132 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3133 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3134
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3135 case _OrthancPluginService_ReconstructMainDicomTags:
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3136 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3137 const _OrthancPluginReconstructMainDicomTags& p =
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3138 reinterpret_cast<const _OrthancPluginReconstructMainDicomTags>(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3139
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3140 if (pimpl_->database_.get() == NULL)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3141 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3142 LOG(ERROR) << "The service ReconstructMainDicomTags can only be invoked by custom database plugins";
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3143 throw OrthancException(ErrorCode_DatabasePlugin);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3144 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3145
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3146 IStorageArea& storage = reinterpret_cast<IStorageArea>(p.storageArea);
2120 4b02ec79728a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	3147 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	3148
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3149 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3150 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3151
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3152 default:
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3153 {
c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3154 // This service is unknown to the Orthanc plugin engine
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	3155 return false;
1598 c6b50b803387 primitives for image encoding/decoding in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1595 diff changeset	3156 }
899 bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	3157 }
bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	3158 }
bb0a51561016 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 897 diff changeset	3159
908 e078ea944089 refactoring HttpOutput Sebastien Jodogne <s.jodogne@gmail.com> parents: 907 diff changeset	3160
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3161
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3162 bool OrthancPlugins::InvokeService(SharedLibrary& plugin,
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3163 _OrthancPluginService service,
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3164 const void* parameters)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3165 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3166 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	3167
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3168 if (service == _OrthancPluginService_DatabaseAnswer)
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3169 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3170 // 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	3171 // 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	3172 // 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	3173 // 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	3174 // 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	3175 // "DatabaseAnswer".
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3176 DatabaseAnswer(parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3177 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3178 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3179
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3180 if (InvokeSafeService(plugin, service, parameters))
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3181 {
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3182 // 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	3183 return true;
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3184 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3185 else
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 // The invoked service requires locking
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3188 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	3189 return InvokeProtectedService(plugin, service, parameters);
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3190 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3191 }
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3192
39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3193
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3194 bool OrthancPlugins::HasStorageArea() const
67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3195 {
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3196 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	3197 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	3198 }
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	3199
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	3200 bool OrthancPlugins::HasDatabaseBackend() const
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	3201 {
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3202 boost::recursive_mutex::scoped_lock lock(pimpl_->invokeServiceMutex_);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	3203 return pimpl_->database_.get() != NULL;
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	3204 }
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	3205
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3206
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	3207 IStorageArea* OrthancPlugins::CreateStorageArea()
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3208 {
67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3209 if (!HasStorageArea())
67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3210 {
67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3211 throw OrthancException(ErrorCode_BadSequenceOfCalls);
67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3212 }
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	3213 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	3214 {
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	3215 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	3216 }
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	3217 }
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3218
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	3219
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	3220 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	3221 {
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	3222 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	3223 {
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	3224 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	3225 }
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	3226 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	3227 {
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	3228 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	3229 }
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	3230 }
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	3231
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	3232
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	3233 IDatabaseWrapper& OrthancPlugins::GetDatabaseBackend()
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	3234 {
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	3235 if (!HasDatabaseBackend())
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	3236 {
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	3237 throw OrthancException(ErrorCode_BadSequenceOfCalls);
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	3238 }
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	3239 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	3240 {
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	3241 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	3242 }
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	3243 }
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	3244
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	3245
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	3246 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	3247 {
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	3248 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	3249 {
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	3250 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	3251 }
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	3252 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	3253 {
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	3254 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	3255 }
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	3256 }
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1296 diff changeset	3257
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	3258
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	3259 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	3260 _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	3261 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	3262 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	3263 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	3264
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	3265 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	3266 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	3267 return NULL;
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	3268 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	3269 else
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	3270 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	3271 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	3272 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	3273 }
1280 d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	3274
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	3275
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	3276 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	3277 {
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	3278 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	3279 {
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	3280 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	3281 }
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	3282
d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	3283 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	3284 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	3285 }
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	3286
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	3287
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	3288 PluginsManager& OrthancPlugins::GetManager()
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	3289 {
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	3290 return pimpl_->manager_;
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	3291 }
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	3292
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	3293
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	3294 const PluginsManager& OrthancPlugins::GetManager() const
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	3295 {
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	3296 return pimpl_->manager_;
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	3297 }
1644 939b921b2c81 plugin error dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1643 diff changeset	3298
939b921b2c81 plugin error dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1643 diff changeset	3299
939b921b2c81 plugin error dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1643 diff changeset	3300 PluginsErrorDictionary& OrthancPlugins::GetErrorDictionary()
939b921b2c81 plugin error dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1643 diff changeset	3301 {
939b921b2c81 plugin error dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1643 diff changeset	3302 return pimpl_->dictionary_;
939b921b2c81 plugin error dictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 1643 diff changeset	3303 }
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	3304
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	3305
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	3306 IWorklistRequestHandler* OrthancPlugins::ConstructWorklistRequestHandler()
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	3307 {
1809 5ed8769b17f9 disable worklist support if no plugin has registered callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	3308 if (HasWorklistHandler())
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	3309 {
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	3310 return new WorklistHandler(*this);
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	3311 }
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	3312 else
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	3313 {
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	3314 return NULL;
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	3315 }
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1780 diff changeset	3316 }
1809 5ed8769b17f9 disable worklist support if no plugin has registered callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	3317
5ed8769b17f9 disable worklist support if no plugin has registered callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	3318
5ed8769b17f9 disable worklist support if no plugin has registered callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	3319 bool OrthancPlugins::HasWorklistHandler()
5ed8769b17f9 disable worklist support if no plugin has registered callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	3320 {
1825 f0f8a94c0858 only one modality worklist handler at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 1821 diff changeset	3321 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	3322 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	3323 }
5ed8769b17f9 disable worklist support if no plugin has registered callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	3324
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	3325
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3326 IFindRequestHandler* OrthancPlugins::ConstructFindRequestHandler()
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3327 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3328 if (HasFindHandler())
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3329 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3330 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	3331 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3332 else
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3333 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3334 return NULL;
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3335 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3336 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3337
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3338
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3339 bool OrthancPlugins::HasFindHandler()
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3340 {
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3341 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	3342 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	3343 }
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3344
f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	3345
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	3346 IMoveRequestHandler* OrthancPlugins::ConstructMoveRequestHandler()
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	3347 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	3348 if (HasMoveHandler())
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	3349 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	3350 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	3351 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	3352 else
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	3353 {
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	3354 return NULL;
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	3355 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	3356 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	3357
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	3358
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	3359 bool OrthancPlugins::HasMoveHandler()
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	3360 {
2000 39329372b667 Speedup in plugins by removing unnecessary locks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1999 diff changeset	3361 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	3362 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	3363 }
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	3364
364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	3365
1906 d7c1cb559431 optimization for multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	3366 bool OrthancPlugins::HasCustomImageDecoder()
d7c1cb559431 optimization for multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	3367 {
d7c1cb559431 optimization for multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	3368 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	3369 return !pimpl_->decodeImageCallbacks_.empty();
1906 d7c1cb559431 optimization for multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	3370 }
d7c1cb559431 optimization for multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	3371
d7c1cb559431 optimization for multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	3372
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	3373 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	3374 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	3375 unsigned int frame)
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	3376 {
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	3377 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	3378
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	3379 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	3380 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	3381 decoder != pimpl_->decodeImageCallbacks_.end(); ++decoder)
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	3382 {
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	3383 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	3384 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	3385 pluginImage != NULL)
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	3386 {
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	3387 return reinterpret_cast<ImageAccessor*>(pluginImage);
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	3388 }
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	3389 }
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	3390
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	3391 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	3392 }
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	3393
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	3394
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	3395 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	3396 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	3397 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	3398 {
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	3399 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	3400
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	3401 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	3402 {
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	3403 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	3404 }
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	3405 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	3406 {
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	3407 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	3408 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	3409 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	3410 }
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1825 diff changeset	3411 }
1961 ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3412
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3413
1961 ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3414 bool OrthancPlugins::IsAllowed(HttpMethod method,
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3415 const char* uri,
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3416 const char* ip,
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3417 const char* username,
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3418 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	3419 const IHttpHandler::GetArguments& getArguments)
1961 ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3420 {
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3421 OrthancPluginHttpMethod cMethod = Plugins::Convert(method);
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3422
1962 22ddb22fce83 sample plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1961 diff changeset	3423 std::vector<const char*> httpKeys(httpHeaders.size());
22ddb22fce83 sample plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1961 diff changeset	3424 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	3425
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3426 size_t pos = 0;
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3427 for (IHttpHandler::Arguments::const_iterator
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3428 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	3429 {
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3430 httpKeys[pos] = it->first.c_str();
1962 22ddb22fce83 sample plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1961 diff changeset	3431 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	3432 }
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3433
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3434 std::vector<const char*> getKeys(getArguments.size());
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3435 std::vector<const char*> getValues(getArguments.size());
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3436
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3437 for (size_t i = 0; i < getArguments.size(); i++)
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3438 {
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3439 getKeys[i] = getArguments[i].first.c_str();
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3440 getValues[i] = getArguments[i].second.c_str();
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3441 }
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3442
2354 415450f11cc7 rename Orthanc 1.2.1 as 1.3.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	3443 // 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	3444 for (PImpl::IncomingHttpRequestFilters2::const_iterator
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3445 filter = pimpl_->incomingHttpRequestFilters2_.begin();
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3446 filter != pimpl_->incomingHttpRequestFilters2_.end(); ++filter)
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3447 {
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3448 int32_t allowed = (*filter) (cMethod, uri, ip,
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3449 httpKeys.size(),
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3450 httpKeys.empty() ? NULL : &httpKeys[0],
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3451 httpValues.empty() ? NULL : &httpValues[0],
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3452 getKeys.size(),
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3453 getKeys.empty() ? NULL : &getKeys[0],
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3454 getValues.empty() ? NULL : &getValues[0]);
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3455
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3456 if (allowed == 0)
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3457 {
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3458 return false;
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3459 }
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3460 else if (allowed != 1)
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3461 {
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3462 // The callback is only allowed to answer 0 or 1
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3463 throw OrthancException(ErrorCode_Plugin);
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3464 }
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3465 }
1961 ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3466
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3467 for (PImpl::IncomingHttpRequestFilters::const_iterator
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3468 filter = pimpl_->incomingHttpRequestFilters_.begin();
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3469 filter != pimpl_->incomingHttpRequestFilters_.end(); ++filter)
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3470 {
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3471 int32_t allowed = (*filter) (cMethod, uri, ip, httpKeys.size(),
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3472 httpKeys.empty() ? NULL : &httpKeys[0],
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3473 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	3474
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3475 if (allowed == 0)
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3476 {
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3477 return false;
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3478 }
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3479 else if (allowed != 1)
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3480 {
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3481 // The callback is only allowed to answer 0 or 1
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3482 throw OrthancException(ErrorCode_Plugin);
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2256 diff changeset	3483 }
1961 ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3484 }
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3485
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3486 return true;
ef1e9856c26f New callback to filter incoming HTTP requests: OrthancPluginRegisterIncomingHttpRequestFilter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1918 diff changeset	3487 }
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3488
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3489
2815 925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3490 IJob* OrthancPlugins::UnserializeJob(const std::string& type,
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3491 const Json::Value& value)
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3492 {
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3493 const std::string serialized = value.toStyledString();
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3494
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3495 boost::mutex::scoped_lock lock(pimpl_->jobsUnserializersMutex_);
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3496
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3497 for (PImpl::JobsUnserializers::iterator
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3498 unserializer = pimpl_->jobsUnserializers_.begin();
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3499 unserializer != pimpl_->jobsUnserializers_.end(); ++unserializer)
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3500 {
2815 925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3501 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	3502 if (job != NULL)
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3503 {
2815 925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3504 return reinterpret_cast<PluginsJob*>(job);
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3505 }
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3506 }
37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3507
2815 925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2814 diff changeset	3508 return NULL;
2808 37583cd183ed primitives to create jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	3509 }
897 bafc9d592632 REST callbacks are working Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3510 }

Mercurial > hg > orthanc

annotate Plugins/Engine/OrthancPlugins.cpp @ 2823:807169f85ba9