orthanc: OrthancServer/Sources/ServerContext.h annotate

annotate OrthancServer/Sources/ServerContext.h @ 4473:68f52897c119

new URIs: /tools/accepted-transfer-syntaxes and /tools/unknown-sop-class-accepted to replace Lua callbacks for transfer syntaxes

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 26 Jan 2021 14:48:10 +0100
parents	fe774d8e904b
children	7b99e8bb8246

rev	line source
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
4eb0c7ce86c9 refactoring for store 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: 1778 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1285 diff changeset	4 * Department, University Hospital of Liege, Belgium
4437 d9473bd5ed43 upgrade to year 2021 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4384 diff changeset	5 * Copyright (C) 2017-2021 Osimis S.A., Belgium
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 *
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * In addition, as a special exception, the copyright holders of this
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * program give permission to link the code of its release with the
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * the linked executables. You must obey the GNU General Public License
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * modify file(s) with this exception, you may extend this exception to
4eb0c7ce86c9 refactoring for store 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
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * you do not wish to do so, delete this exception statement from your
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 * version. If you delete this exception statement from all source files
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 * in the program, then also delete it here.
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 *
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * This program is distributed in the hope that it will be useful, but
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34 #pragma once
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
2610 3ff4c50647ea moving the old scheduler to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	36 #include "IServerListener.h"
3ff4c50647ea moving the old scheduler to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	37 #include "LuaScripting.h"
3ff4c50647ea moving the old scheduler to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	38 #include "OrthancHttpHandler.h"
3ff4c50647ea moving the old scheduler to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	39 #include "ServerIndex.h"
3660 f159b731c47d IStorageCommitmentFactory Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	40 #include "ServerJobs/IStorageCommitmentFactory.h"
2610 3ff4c50647ea moving the old scheduler to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2570 diff changeset	41
4375 208029732d51 New config option "DeidentifyDimseQueryLogs" Mark Poscablo <Mark.Poscablo@varian.com> parents: 4205 diff changeset	42 #include "../../OrthancFramework/Sources/DicomFormat/DicomElement.h"
208029732d51 New config option "DeidentifyDimseQueryLogs" Mark Poscablo <Mark.Poscablo@varian.com> parents: 4205 diff changeset	43 #include "../../OrthancFramework/Sources/DicomParsing/DicomModification.h"
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	44 #include "../../OrthancFramework/Sources/DicomParsing/IDicomTranscoder.h"
4457 789676a8c96a Refactoring and improvements to the cache of DICOM files in ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	45 #include "../../OrthancFramework/Sources/DicomParsing/ParsedDicomCache.h"
789676a8c96a Refactoring and improvements to the cache of DICOM files in ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	46 #include "../../OrthancFramework/Sources/MultiThreading/Semaphore.h"
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	47
1124 790ff7a5b3bf IStorageArea abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1123 diff changeset	48
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 namespace Orthanc
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 {
3097 ac72032d69a2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3095 diff changeset	51 class DicomInstanceToStore;
ac72032d69a2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3095 diff changeset	52 class IStorageArea;
ac72032d69a2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3095 diff changeset	53 class JobsEngine;
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3165 diff changeset	54 class MetricsRegistry;
3085 c829758b9ca0 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3061 diff changeset	55 class OrthancPlugins;
3095 beeeb6096f27 removing dependencies upon ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3085 diff changeset	56 class ParsedDicomFile;
3097 ac72032d69a2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3095 diff changeset	57 class RestApiOutput;
ac72032d69a2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3095 diff changeset	58 class SetOfInstancesJob;
3095 beeeb6096f27 removing dependencies upon ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3085 diff changeset	59 class SharedArchive;
3097 ac72032d69a2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3095 diff changeset	60 class SharedMessageQueue;
3736 0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	61 class StorageCommitmentReports;
3097 ac72032d69a2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3095 diff changeset	62
3085 c829758b9ca0 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3061 diff changeset	63
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	64 /**
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	65 * This class is responsible for maintaining the storage area on the
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	66 * filesystem (including compression), as well as the index of the
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	67 * DICOM store. It implements the required locking mechanisms.
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	68 **/
3660 f159b731c47d IStorageCommitmentFactory Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	69 class ServerContext :
f159b731c47d IStorageCommitmentFactory Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	70 public IStorageCommitmentFactory,
3930 b99acc213937 transcoder plugins and GDCM transcoding are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3928 diff changeset	71 public IDicomTranscoder,
3660 f159b731c47d IStorageCommitmentFactory Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	72 private JobsRegistry::IObserver
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73 {
3021 2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	74 public:
2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	75 class ILookupVisitor : public boost::noncopyable
2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	76 {
2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	77 public:
2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	78 virtual ~ILookupVisitor()
2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	79 {
2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	80 }
2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	81
2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	82 virtual bool IsDicomAsJsonNeeded() const = 0;
2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	83
2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	84 virtual void MarkAsComplete() = 0;
2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	85
4196 37310bb1cd30 Fix handling of "ModalitiesInStudy" (0008,0061) in C-FIND and "/tools/find" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	86 // NB: "dicomAsJson" must not be deleted, and can be NULL if
37310bb1cd30 Fix handling of "ModalitiesInStudy" (0008,0061) in C-FIND and "/tools/find" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	87 // "!IsDicomAsJsonNeeded()"
3021 2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	88 virtual void Visit(const std::string& publicId,
2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	89 const std::string& instanceId,
2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	90 const DicomMap& mainDicomTags,
2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	91 const Json::Value* dicomAsJson) = 0;
2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	92 };
2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	93
2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	94
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	95 private:
2738 3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	96 class LuaServerListener : public IServerListener
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	97 {
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	98 private:
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	99 ServerContext& context_;
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	100
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	101 public:
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4196 diff changeset	102 explicit LuaServerListener(ServerContext& context) :
2738 3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	103 context_(context)
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	104 {
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	105 }
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	106
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	107 virtual void SignalStoredInstance(const std::string& publicId,
3916 0e3849268a55 new plugin SDK primitives related to OrthancPluginDicomInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3913 diff changeset	108 const DicomInstanceToStore& instance,
4205 d962a2996637 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	109 const Json::Value& simplifiedTags) ORTHANC_OVERRIDE
2738 3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	110 {
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	111 context_.mainLua_.SignalStoredInstance(publicId, instance, simplifiedTags);
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	112 }
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	113
4205 d962a2996637 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	114 virtual void SignalChange(const ServerIndexChange& change) ORTHANC_OVERRIDE
2738 3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	115 {
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	116 context_.mainLua_.SignalChange(change);
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	117 }
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	118
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	119 virtual bool FilterIncomingInstance(const DicomInstanceToStore& instance,
4205 d962a2996637 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	120 const Json::Value& simplified) ORTHANC_OVERRIDE
2738 3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	121 {
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	122 return context_.filterLua_.FilterIncomingInstance(instance, simplified);
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	123 }
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	124 };
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	125
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	126 class ServerListener
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	127 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	128 private:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	129 IServerListener *listener_;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	130 std::string description_;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	131
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	132 public:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	133 ServerListener(IServerListener& listener,
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	134 const std::string& description) :
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	135 listener_(&listener),
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	136 description_(description)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	137 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	138 }
996 cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 946 diff changeset	139
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	140 IServerListener& GetListener()
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	141 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	142 return *listener_;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	143 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	144
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	145 const std::string& GetDescription()
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	146 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	147 return description_;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	148 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	149 };
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	150
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	151 typedef std::list<ServerListener> ServerListeners;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	152
998 4136fab6a639 callback on stored instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	153
2668 d26dd081df97 saving jobs engine on exit Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	154 static void ChangeThread(ServerContext* that,
d26dd081df97 saving jobs engine on exit Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	155 unsigned int sleepDelay);
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	156
2672 3efc44fac209 periodically saving jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2671 diff changeset	157 static void SaveJobsThread(ServerContext* that,
3efc44fac209 periodically saving jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2671 diff changeset	158 unsigned int sleepDelay);
3efc44fac209 periodically saving jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2671 diff changeset	159
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	160 void ReadDicomAsJsonInternal(std::string& result,
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	161 const std::string& instancePublicId);
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	162
2668 d26dd081df97 saving jobs engine on exit Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	163 void SaveJobsEngine();
d26dd081df97 saving jobs engine on exit Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	164
3762 1a346a4dc1b4 adding missing ORTHANC_OVERRIDE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3736 diff changeset	165 virtual void SignalJobSubmitted(const std::string& jobId) ORTHANC_OVERRIDE;
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2672 diff changeset	166
3762 1a346a4dc1b4 adding missing ORTHANC_OVERRIDE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3736 diff changeset	167 virtual void SignalJobSuccess(const std::string& jobId) ORTHANC_OVERRIDE;
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2672 diff changeset	168
3762 1a346a4dc1b4 adding missing ORTHANC_OVERRIDE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3736 diff changeset	169 virtual void SignalJobFailure(const std::string& jobId) ORTHANC_OVERRIDE;
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2672 diff changeset	170
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	171 ServerIndex index_;
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1456 diff changeset	172 IStorageArea& area_;
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1456 diff changeset	173
236 6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	174 bool compressionEnabled_;
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1456 diff changeset	175 bool storeMD5_;
4457 789676a8c96a Refactoring and improvements to the cache of DICOM files in ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	176
789676a8c96a Refactoring and improvements to the cache of DICOM files in ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	177 Semaphore largeDicomThrottler_; // New in Orthanc 1.9.0 (notably for very large DICOM files in WSI)
789676a8c96a Refactoring and improvements to the cache of DICOM files in ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	178 ParsedDicomCache dicomCache_;
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	179
2738 3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	180 LuaScripting mainLua_;
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	181 LuaScripting filterLua_;
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	182 LuaServerListener luaListener_;
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	183 std::unique_ptr<SharedArchive> mediaArchive_;
2976 cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2965 diff changeset	184
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	185 // The "JobsEngine" must be after "LuaScripting", as
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	186 // "LuaScripting" embeds "LuaJobManager" that registers as an
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	187 // observer to "SequenceOfOperationsJob", whose lifetime
2976 cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2965 diff changeset	188 // corresponds to that of "JobsEngine". It must also be after
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2965 diff changeset	189 // "mediaArchive_", as jobs might access this archive.
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	190 JobsEngine jobsEngine_;
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	191
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	192 #if ORTHANC_ENABLE_PLUGINS == 1
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	193 OrthancPlugins* plugins_;
1632 eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	194 #endif
eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	195
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	196 ServerListeners listeners_;
3947 cf6eb4fc6841 fix issue 179: use a shared mutex to avoid deadlock in python plugins Alain Mazy <alain@mazy.be> parents: 3945 diff changeset	197 boost::shared_mutex listenersMutex_;
388 466c992a9a42 testing filters inside orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	198
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	199 bool done_;
2673 8e0bc055d18c JobsRegistry::IObserver Sebastien Jodogne <s.jodogne@gmail.com> parents: 2672 diff changeset	200 bool haveJobsChanged_;
2815 925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	201 bool isJobsEngineUnserialized_;
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	202 SharedMessageQueue pendingChanges_;
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	203 boost::thread changeThread_;
2672 3efc44fac209 periodically saving jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2671 diff changeset	204 boost::thread saveJobsThread_;
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	205
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	206 std::unique_ptr<SharedArchive> queryRetrieveArchive_;
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	207 std::string defaultLocalAet_;
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	208 OrthancHttpHandler httpHandler_;
3165 1fe524e211af New configuration option: "SaveJobs" to specify whether jobs are stored in the database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	209 bool saveJobs_;
3677 4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	210 FindStorageAccessMode findStorageAccessMode_;
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	211 unsigned int limitFindInstances_;
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	212 unsigned int limitFindResults_;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	213
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	214 std::unique_ptr<MetricsRegistry> metricsRegistry_;
3534 cac8ffcb9cef forcing AuthenticationEnabled to false is considered as insecure if remote access is allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 3533 diff changeset	215 bool isHttpServerSecure_;
3535 41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	216 bool isExecuteLuaEnabled_;
3813 aaaa442bfe39 moving SetOverwriteInstances from ServerIndex to ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3762 diff changeset	217 bool overwriteInstances_;
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3165 diff changeset	218
3736 0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	219 std::unique_ptr<StorageCommitmentReports> storageCommitmentReports_;
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	220
3911 0ef7f4528be2 renamed option TranscodingEnabled to TranscodeDicomProtocol Sebastien Jodogne <s.jodogne@gmail.com> parents: 3910 diff changeset	221 bool transcodeDicomProtocol_;
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	222 std::unique_ptr<IDicomTranscoder> dcmtkTranscoder_;
3931 e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	223 BuiltinDecoderTranscoderOrder builtinDecoderTranscoderOrder_;
3939 c205f670098e new configuration options: BuiltinDecoderTranscoderOrder and IngestTranscoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3931 diff changeset	224 bool isIngestTranscoding_;
c205f670098e new configuration options: BuiltinDecoderTranscoderOrder and IngestTranscoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3931 diff changeset	225 DicomTransferSyntax ingestTransferSyntax_;
4384 7e0d015ad109 new configuration options IngestTranscodingOfUncompressed and IngestTranscodingOfCompressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4376 diff changeset	226 bool ingestTranscodingOfUncompressed_;
7e0d015ad109 new configuration options IngestTranscodingOfUncompressed and IngestTranscodingOfCompressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4376 diff changeset	227 bool ingestTranscodingOfCompressed_;
4473 68f52897c119 new URIs: /tools/accepted-transfer-syntaxes and /tools/unknown-sop-class-accepted to replace Lua callbacks for transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	228
68f52897c119 new URIs: /tools/accepted-transfer-syntaxes and /tools/unknown-sop-class-accepted to replace Lua callbacks for transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	229 // New in Orthanc 1.9.0
68f52897c119 new URIs: /tools/accepted-transfer-syntaxes and /tools/unknown-sop-class-accepted to replace Lua callbacks for transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	230 DicomTransferSyntax preferredTransferSyntax_;
68f52897c119 new URIs: /tools/accepted-transfer-syntaxes and /tools/unknown-sop-class-accepted to replace Lua callbacks for transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	231 boost::mutex dynamicOptionsMutex_;
68f52897c119 new URIs: /tools/accepted-transfer-syntaxes and /tools/unknown-sop-class-accepted to replace Lua callbacks for transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	232 bool isUnknownSopClassAccepted_;
68f52897c119 new URIs: /tools/accepted-transfer-syntaxes and /tools/unknown-sop-class-accepted to replace Lua callbacks for transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	233 std::set<DicomTransferSyntax> acceptedTransferSyntaxes_;
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	234
3912 7610af1532c3 prototyping automated transcoding of incoming DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 3911 diff changeset	235 StoreStatus StoreAfterTranscoding(std::string& resultPublicId,
7610af1532c3 prototyping automated transcoding of incoming DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 3911 diff changeset	236 DicomInstanceToStore& dicom,
7610af1532c3 prototyping automated transcoding of incoming DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 3911 diff changeset	237 StoreInstanceMode mode);
7610af1532c3 prototyping automated transcoding of incoming DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 3911 diff changeset	238
4196 37310bb1cd30 Fix handling of "ModalitiesInStudy" (0008,0061) in C-FIND and "/tools/find" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	239 void ApplyInternal(ILookupVisitor& visitor,
37310bb1cd30 Fix handling of "ModalitiesInStudy" (0008,0061) in C-FIND and "/tools/find" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	240 const DatabaseLookup& lookup,
37310bb1cd30 Fix handling of "ModalitiesInStudy" (0008,0061) in C-FIND and "/tools/find" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	241 ResourceType queryLevel,
37310bb1cd30 Fix handling of "ModalitiesInStudy" (0008,0061) in C-FIND and "/tools/find" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	242 size_t since,
37310bb1cd30 Fix handling of "ModalitiesInStudy" (0008,0061) in C-FIND and "/tools/find" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	243 size_t limit);
37310bb1cd30 Fix handling of "ModalitiesInStudy" (0008,0061) in C-FIND and "/tools/find" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	244
4457 789676a8c96a Refactoring and improvements to the cache of DICOM files in ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	245 void PublishDicomCacheMetrics();
789676a8c96a Refactoring and improvements to the cache of DICOM files in ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	246
4376 b002f9abe802 review of changeset 4375:208029732d51 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4375 diff changeset	247 // This DicomModification object is intended to be used as a
b002f9abe802 review of changeset 4375:208029732d51 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4375 diff changeset	248 // "rules engine" when de-identifying logs for C-Find, C-Get, and
b002f9abe802 review of changeset 4375:208029732d51 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4375 diff changeset	249 // C-Move queries (new in Orthanc 1.8.2)
4375 208029732d51 New config option "DeidentifyDimseQueryLogs" Mark Poscablo <Mark.Poscablo@varian.com> parents: 4205 diff changeset	250 DicomModification logsDeidentifierRules_;
4376 b002f9abe802 review of changeset 4375:208029732d51 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4375 diff changeset	251 bool deidentifyLogs_;
4375 208029732d51 New config option "DeidentifyDimseQueryLogs" Mark Poscablo <Mark.Poscablo@varian.com> parents: 4205 diff changeset	252
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253 public:
996 cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 946 diff changeset	254 class DicomCacheLocker : public boost::noncopyable
778 aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	255 {
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	256 private:
4457 789676a8c96a Refactoring and improvements to the cache of DICOM files in ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	257 ServerContext& context_;
789676a8c96a Refactoring and improvements to the cache of DICOM files in ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	258 std::string instancePublicId_;
789676a8c96a Refactoring and improvements to the cache of DICOM files in ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	259 std::unique_ptr<ParsedDicomCache::Accessor> accessor_;
789676a8c96a Refactoring and improvements to the cache of DICOM files in ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	260 std::unique_ptr<ParsedDicomFile> dicom_;
789676a8c96a Refactoring and improvements to the cache of DICOM files in ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	261 size_t dicomSize_;
789676a8c96a Refactoring and improvements to the cache of DICOM files in ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	262 std::unique_ptr<Semaphore::Locker> largeDicomLocker_;
778 aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	263
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	264 public:
4457 789676a8c96a Refactoring and improvements to the cache of DICOM files in ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	265 DicomCacheLocker(ServerContext& context,
778 aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	266 const std::string& instancePublicId);
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	267
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	268 ~DicomCacheLocker();
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	269
4457 789676a8c96a Refactoring and improvements to the cache of DICOM files in ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	270 ParsedDicomFile& GetDicom() const;
778 aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	271 };
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	272
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1456 diff changeset	273 ServerContext(IDatabaseWrapper& database,
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2626 diff changeset	274 IStorageArea& area,
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	275 bool unitTesting,
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	276 size_t maxCompletedJobs);
1134 ba9fd42284d0 preparing storage plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1133 diff changeset	277
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	278 ~ServerContext();
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	279
2815 925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	280 void SetupJobsEngine(bool unitTesting,
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	281 bool loadJobsFromDatabase);
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	282
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	283 ServerIndex& GetIndex()
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	284 {
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	285 return index_;
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	286 }
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	287
236 6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	288 void SetCompressionEnabled(bool enabled);
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	289
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	290 bool IsCompressionEnabled() const
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	291 {
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	292 return compressionEnabled_;
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	293 }
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	294
1126 bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1124 diff changeset	295 void RemoveFile(const std::string& fileUuid,
bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1124 diff changeset	296 FileContentType type);
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	297
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	298 bool AddAttachment(const std::string& resourceId,
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	299 FileContentType attachmentType,
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	300 const void* data,
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	301 size_t size);
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	302
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1003 diff changeset	303 StoreStatus Store(std::string& resultPublicId,
3814 023b2a9f3aa1 new enum: StoreInstanceMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3813 diff changeset	304 DicomInstanceToStore& dicom,
023b2a9f3aa1 new enum: StoreInstanceMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3813 diff changeset	305 StoreInstanceMode mode);
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1003 diff changeset	306
1146 200fcac0deb4 optimization for access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	307 void AnswerAttachment(RestApiOutput& output,
1700 f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	308 const std::string& resourceId,
1146 200fcac0deb4 optimization for access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	309 FileContentType content);
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	310
1700 f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	311 void ChangeAttachmentCompression(const std::string& resourceId,
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	312 FileContentType attachmentType,
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	313 CompressionType compression);
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	314
2127 bfa92c9328d7 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	315 void ReadDicomAsJson(std::string& result,
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	316 const std::string& instancePublicId,
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	317 const std::set<DicomTag>& ignoreTagLength);
2127 bfa92c9328d7 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	318
2124 2b1520efa282 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2122 diff changeset	319 void ReadDicomAsJson(Json::Value& result,
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	320 const std::string& instancePublicId,
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	321 const std::set<DicomTag>& ignoreTagLength);
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	322
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	323 void ReadDicomAsJson(std::string& result,
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	324 const std::string& instancePublicId)
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	325 {
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	326 std::set<DicomTag> ignoreTagLength;
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	327 ReadDicomAsJson(result, instancePublicId, ignoreTagLength);
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	328 }
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	329
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	330 void ReadDicomAsJson(Json::Value& result,
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	331 const std::string& instancePublicId)
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	332 {
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	333 std::set<DicomTag> ignoreTagLength;
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	334 ReadDicomAsJson(result, instancePublicId, ignoreTagLength);
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	335 }
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	336
2124 2b1520efa282 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2122 diff changeset	337 void ReadDicom(std::string& dicom,
2b1520efa282 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2122 diff changeset	338 const std::string& instancePublicId)
2b1520efa282 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2122 diff changeset	339 {
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	340 ReadAttachment(dicom, instancePublicId, FileContentType_Dicom, true);
2124 2b1520efa282 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2122 diff changeset	341 }
2b1520efa282 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2122 diff changeset	342
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	343 // TODO CACHING MECHANISM AT THIS POINT
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	344 void ReadAttachment(std::string& result,
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	345 const std::string& instancePublicId,
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	346 FileContentType content,
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	347 bool uncompressIfNeeded);
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	348
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	349 void ReadAttachment(std::string& result,
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	350 const FileInfo& attachment);
1778 776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1758 diff changeset	351
695 c59bc408fb10 parameter to disable the computation of the MD5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	352 void SetStoreMD5ForAttachments(bool storeMD5);
c59bc408fb10 parameter to disable the computation of the MD5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	353
c59bc408fb10 parameter to disable the computation of the MD5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	354 bool IsStoreMD5ForAttachments() const
c59bc408fb10 parameter to disable the computation of the MD5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	355 {
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1456 diff changeset	356 return storeMD5_;
695 c59bc408fb10 parameter to disable the computation of the MD5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	357 }
771 537837f50fbb refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 699 diff changeset	358
2570 2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	359 JobsEngine& GetJobsEngine()
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	360 {
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	361 return jobsEngine_;
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	362 }
2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	363
1145 0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	364 bool DeleteResource(Json::Value& target,
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	365 const std::string& uuid,
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	366 ResourceType expectedType);
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	367
1198 1169528a9a5f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	368 void SignalChange(const ServerIndexChange& change);
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1223 diff changeset	369
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	370 SharedArchive& GetQueryRetrieveArchive()
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	371 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2876 diff changeset	372 return *queryRetrieveArchive_;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	373 }
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	374
2965 9c0b0a6d8b54 MediaArchiveSize configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2950 diff changeset	375 SharedArchive& GetMediaArchive()
9c0b0a6d8b54 MediaArchiveSize configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2950 diff changeset	376 {
9c0b0a6d8b54 MediaArchiveSize configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2950 diff changeset	377 return *mediaArchive_;
9c0b0a6d8b54 MediaArchiveSize configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2950 diff changeset	378 }
9c0b0a6d8b54 MediaArchiveSize configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2950 diff changeset	379
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	380 const std::string& GetDefaultLocalApplicationEntityTitle() const
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	381 {
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	382 return defaultLocalAet_;
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	383 }
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	384
2617 912a767911b0 back to a single Lua context Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	385 LuaScripting& GetLuaScripting()
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	386 {
2738 3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2673 diff changeset	387 return mainLua_;
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	388 }
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	389
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	390 OrthancHttpHandler& GetHttpHandler()
b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	391 {
b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	392 return httpHandler_;
b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	393 }
b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	394
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1444 diff changeset	395 void Stop();
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1444 diff changeset	396
3021 2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	397 void Apply(ILookupVisitor& visitor,
3033 5da6d1063d8f effectively replacing LookupResource by DatabaseLookup in searches Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	398 const DatabaseLookup& lookup,
5da6d1063d8f effectively replacing LookupResource by DatabaseLookup in searches Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	399 ResourceType queryLevel,
2304 563bf878407a Argument "Since" in URI "/tools/find" (related to issue 53) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	400 size_t since,
563bf878407a Argument "Since" in URI "/tools/find" (related to issue 53) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	401 size_t limit);
1757 98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1753 diff changeset	402
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	403 bool LookupOrReconstructMetadata(std::string& target,
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	404 const std::string& publicId,
4460 6831de40acd9 New metadata automatically computed at the series level: "RemoteAET" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	405 ResourceType level,
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	406 MetadataType type);
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	407
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	408
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	409 /**
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	410 * Management of the plugins
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	411 **/
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	412
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	413 #if ORTHANC_ENABLE_PLUGINS == 1
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	414 void SetPlugins(OrthancPlugins& plugins);
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	415
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	416 void ResetPlugins();
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	417
1632 eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	418 const OrthancPlugins& GetPlugins() const;
1741 06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1700 diff changeset	419
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1700 diff changeset	420 OrthancPlugins& GetPlugins();
1632 eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	421 #endif
eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	422
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	423 bool HasPlugins() const;
2626 e09021ddc00d cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	424
e09021ddc00d cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	425 void AddChildInstances(SetOfInstancesJob& job,
e09021ddc00d cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	426 const std::string& publicId);
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2876 diff changeset	427
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2876 diff changeset	428 void SignalUpdatedModalities();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2876 diff changeset	429
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2876 diff changeset	430 void SignalUpdatedPeers();
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3165 diff changeset	431
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3165 diff changeset	432 MetricsRegistry& GetMetricsRegistry()
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3165 diff changeset	433 {
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3165 diff changeset	434 return *metricsRegistry_;
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3165 diff changeset	435 }
3533 2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	436
3534 cac8ffcb9cef forcing AuthenticationEnabled to false is considered as insecure if remote access is allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 3533 diff changeset	437 void SetHttpServerSecure(bool isSecure)
3533 2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	438 {
3534 cac8ffcb9cef forcing AuthenticationEnabled to false is considered as insecure if remote access is allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 3533 diff changeset	439 isHttpServerSecure_ = isSecure;
3533 2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	440 }
2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	441
3534 cac8ffcb9cef forcing AuthenticationEnabled to false is considered as insecure if remote access is allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 3533 diff changeset	442 bool IsHttpServerSecure() const
3533 2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	443 {
3534 cac8ffcb9cef forcing AuthenticationEnabled to false is considered as insecure if remote access is allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 3533 diff changeset	444 return isHttpServerSecure_;
3533 2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	445 }
3535 41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	446
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	447 void SetExecuteLuaEnabled(bool enabled)
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	448 {
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	449 isExecuteLuaEnabled_ = enabled;
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	450 }
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	451
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	452 bool IsExecuteLuaEnabled() const
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	453 {
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	454 return isExecuteLuaEnabled_;
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	455 }
3660 f159b731c47d IStorageCommitmentFactory Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	456
3813 aaaa442bfe39 moving SetOverwriteInstances from ServerIndex to ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3762 diff changeset	457 void SetOverwriteInstances(bool overwrite)
aaaa442bfe39 moving SetOverwriteInstances from ServerIndex to ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3762 diff changeset	458 {
aaaa442bfe39 moving SetOverwriteInstances from ServerIndex to ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3762 diff changeset	459 overwriteInstances_ = overwrite;
aaaa442bfe39 moving SetOverwriteInstances from ServerIndex to ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3762 diff changeset	460 }
aaaa442bfe39 moving SetOverwriteInstances from ServerIndex to ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3762 diff changeset	461
aaaa442bfe39 moving SetOverwriteInstances from ServerIndex to ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3762 diff changeset	462 bool IsOverwriteInstances() const
aaaa442bfe39 moving SetOverwriteInstances from ServerIndex to ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3762 diff changeset	463 {
aaaa442bfe39 moving SetOverwriteInstances from ServerIndex to ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3762 diff changeset	464 return overwriteInstances_;
aaaa442bfe39 moving SetOverwriteInstances from ServerIndex to ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3762 diff changeset	465 }
aaaa442bfe39 moving SetOverwriteInstances from ServerIndex to ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3762 diff changeset	466
3660 f159b731c47d IStorageCommitmentFactory Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	467 virtual IStorageCommitmentFactory::ILookupHandler*
f159b731c47d IStorageCommitmentFactory Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	468 CreateStorageCommitment(const std::string& jobId,
f159b731c47d IStorageCommitmentFactory Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	469 const std::string& transactionUid,
f159b731c47d IStorageCommitmentFactory Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	470 const std::vector<std::string>& sopClassUids,
3662 d8371b4302ff OrthancPluginRegisterStorageCommitmentScpCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3660 diff changeset	471 const std::vector<std::string>& sopInstanceUids,
d8371b4302ff OrthancPluginRegisterStorageCommitmentScpCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3660 diff changeset	472 const std::string& remoteAet,
d8371b4302ff OrthancPluginRegisterStorageCommitmentScpCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3660 diff changeset	473 const std::string& calledAet) ORTHANC_OVERRIDE;
3736 0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	474
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	475 StorageCommitmentReports& GetStorageCommitmentReports()
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	476 {
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	477 return *storageCommitmentReports_;
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	478 }
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	479
3928 4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3916 diff changeset	480 ImageAccessor* DecodeDicomFrame(const std::string& publicId,
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3916 diff changeset	481 unsigned int frameIndex);
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3916 diff changeset	482
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3916 diff changeset	483 ImageAccessor* DecodeDicomFrame(const DicomInstanceToStore& dicom,
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3916 diff changeset	484 unsigned int frameIndex);
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3916 diff changeset	485
3980 e42f5445d20d Fix decoding of DICOM images for plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 3959 diff changeset	486 ImageAccessor* DecodeDicomFrame(const void* dicom,
e42f5445d20d Fix decoding of DICOM images for plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 3959 diff changeset	487 size_t size,
e42f5445d20d Fix decoding of DICOM images for plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 3959 diff changeset	488 unsigned int frameIndex);
e42f5445d20d Fix decoding of DICOM images for plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 3959 diff changeset	489
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	490 void StoreWithTranscoding(std::string& sopClassUid,
8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	491 std::string& sopInstanceUid,
8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	492 DicomStoreUserConnection& connection,
8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	493 const std::string& dicom,
8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	494 bool hasMoveOriginator,
8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	495 const std::string& moveOriginatorAet,
8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	496 uint16_t moveOriginatorId);
8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	497
3930 b99acc213937 transcoder plugins and GDCM transcoding are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3928 diff changeset	498 // This method can be used even if the global option
3911 0ef7f4528be2 renamed option TranscodingEnabled to TranscodeDicomProtocol Sebastien Jodogne <s.jodogne@gmail.com> parents: 3910 diff changeset	499 // "TranscodeDicomProtocol" is set to "false"
3944 aae045f802f4 preparing simplified interface for IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3939 diff changeset	500 virtual bool Transcode(DicomImage& target,
aae045f802f4 preparing simplified interface for IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3939 diff changeset	501 DicomImage& source /* in, "GetParsed()" possibly modified */,
aae045f802f4 preparing simplified interface for IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3939 diff changeset	502 const std::set<DicomTransferSyntax>& allowedSyntaxes,
aae045f802f4 preparing simplified interface for IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3939 diff changeset	503 bool allowNewSopInstanceUid) ORTHANC_OVERRIDE;
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3951 diff changeset	504
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3951 diff changeset	505 bool IsTranscodeDicomProtocol() const
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3951 diff changeset	506 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3951 diff changeset	507 return transcodeDicomProtocol_;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3951 diff changeset	508 }
4375 208029732d51 New config option "DeidentifyDimseQueryLogs" Mark Poscablo <Mark.Poscablo@varian.com> parents: 4205 diff changeset	509
4376 b002f9abe802 review of changeset 4375:208029732d51 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4375 diff changeset	510 const std::string& GetDeidentifiedContent(const DicomElement& element) const;
4473 68f52897c119 new URIs: /tools/accepted-transfer-syntaxes and /tools/unknown-sop-class-accepted to replace Lua callbacks for transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	511
68f52897c119 new URIs: /tools/accepted-transfer-syntaxes and /tools/unknown-sop-class-accepted to replace Lua callbacks for transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	512 void GetAcceptedTransferSyntaxes(std::set<DicomTransferSyntax>& syntaxes);
68f52897c119 new URIs: /tools/accepted-transfer-syntaxes and /tools/unknown-sop-class-accepted to replace Lua callbacks for transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	513
68f52897c119 new URIs: /tools/accepted-transfer-syntaxes and /tools/unknown-sop-class-accepted to replace Lua callbacks for transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	514 void SetAcceptedTransferSyntaxes(const std::set<DicomTransferSyntax>& syntaxes);
68f52897c119 new URIs: /tools/accepted-transfer-syntaxes and /tools/unknown-sop-class-accepted to replace Lua callbacks for transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	515
68f52897c119 new URIs: /tools/accepted-transfer-syntaxes and /tools/unknown-sop-class-accepted to replace Lua callbacks for transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	516 bool IsUnknownSopClassAccepted();
68f52897c119 new URIs: /tools/accepted-transfer-syntaxes and /tools/unknown-sop-class-accepted to replace Lua callbacks for transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	517
68f52897c119 new URIs: /tools/accepted-transfer-syntaxes and /tools/unknown-sop-class-accepted to replace Lua callbacks for transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4465 diff changeset	518 void SetUnknownSopClassAccepted(bool accepted);
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	519 };
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	520 }

Mercurial > hg > orthanc

annotate OrthancServer/Sources/ServerContext.h @ 4473:68f52897c119