orthanc: OrthancServer/ServerContext.cpp annotate

annotate OrthancServer/ServerContext.cpp @ 1427:d710ea64f0fd

Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API)

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 29 Jun 2015 12:42:54 +0200
parents	b22ba8c5edbe
children	461e7554bff7

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
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1285 diff changeset	3 * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics
6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1285 diff changeset	4 * Department, University Hospital of Liege, Belgium
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	5 *
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 * This program is free software: you can redistribute it and/or
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * 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	8 * published by the Free Software Foundation, either version 3 of the
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * License, or (at your option) any later version.
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 *
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 * In addition, as a special exception, the copyright holders of this
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * 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	13 * OpenSSL project's "OpenSSL" library (or with modified versions of it
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * that use the same license as the "OpenSSL" library), and distribute
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * the linked executables. You must obey the GNU General Public License
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * 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	17 * 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	18 * 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	19 * 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	20 * version. If you delete this exception statement from all source files
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 * in the program, then also delete it here.
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 *
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 * 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	24 * WITHOUT ANY WARRANTY; without even the implied warranty of
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * General Public License for more details.
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 *
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 * 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	29 * 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	30 **/
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
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	33 #include "PrecompiledHeadersServer.h"
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34 #include "ServerContext.h"
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	36 #include "../Core/HttpServer/FilesystemHttpSender.h"
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	37 #include "../Core/Lua/LuaFunctionCall.h"
795 d466b3606aca refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 794 diff changeset	38 #include "FromDcmtkBridge.h"
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	39 #include "ServerToolbox.h"
771 537837f50fbb refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 730 diff changeset	40 #include "OrthancInitialization.h"
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	41
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	42 #include <glog/logging.h>
394 9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	43 #include <EmbeddedResources.h>
794 437c4a83d2cc refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	44 #include <dcmtk/dcmdata/dcfilefo.h>
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45
1001 f3929718ea7e autorouting primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 998 diff changeset	46
1065 921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	47 #include "Scheduler/CallSystemCommand.h"
1001 f3929718ea7e autorouting primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 998 diff changeset	48 #include "Scheduler/DeleteInstanceCommand.h"
1008 187ed107a59f modify command Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	49 #include "Scheduler/ModifyInstanceCommand.h"
1001 f3929718ea7e autorouting primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 998 diff changeset	50 #include "Scheduler/StoreScuCommand.h"
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	51 #include "Scheduler/StorePeerCommand.h"
1010 160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1009 diff changeset	52 #include "OrthancRestApi/OrthancRestApi.h"
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1129 diff changeset	53 #include "../Plugins/Engine/OrthancPlugins.h"
1001 f3929718ea7e autorouting primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 998 diff changeset	54
f3929718ea7e autorouting primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 998 diff changeset	55
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 288 diff changeset	56 #define ENABLE_DICOM_CACHE 1
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 288 diff changeset	57
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	58 static const char* RECEIVED_INSTANCE_FILTER = "ReceivedInstanceFilter";
996 cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	59 static const char* ON_STORED_INSTANCE = "OnStoredInstance";
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	60
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	61 static const size_t DICOM_CACHE_SIZE = 2;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	62
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	63 /**
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	64 * IMPORTANT: We make the assumption that the same instance of
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	65 * FileStorage can be accessed from multiple threads. This seems OK
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	66 * since the filesystem implements the required locking mechanisms,
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	67 * but maybe a read-writer lock on the "FileStorage" could be
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	68 * useful. Conversely, "ServerIndex" already implements mutex-based
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	69 * locking.
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	70 **/
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	71
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	72 namespace Orthanc
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	74 ServerContext::ServerContext(IDatabaseWrapper& database) :
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	75 index_(*this, database),
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	76 compressionEnabled_(false),
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	77 provider_(*this),
995 8c67382f44a7 limit number of jobs in the scheduler Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	78 dicomCache_(provider_, DICOM_CACHE_SIZE),
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	79 scheduler_(Configuration::GetGlobalIntegerParameter("LimitJobs", 10)),
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	80 plugins_(NULL),
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1341 diff changeset	81 pluginsManager_(NULL),
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	82 queryRetrieveArchive_(Configuration::GetGlobalIntegerParameter("QueryRetrieveSize", 10)),
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	83 defaultLocalAet_(Configuration::GetGlobalStringParameter("DicomAet", "ORTHANC"))
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	84 {
1284 21ea32170764 Option "DicomAssociationCloseDelay" to set delay before closing DICOM association Sebastien Jodogne <s.jodogne@gmail.com> parents: 1273 diff changeset	85 uint64_t s = Configuration::GetGlobalIntegerParameter("DicomAssociationCloseDelay", 5); // In seconds
21ea32170764 Option "DicomAssociationCloseDelay" to set delay before closing DICOM association Sebastien Jodogne <s.jodogne@gmail.com> parents: 1273 diff changeset	86 scu_.SetMillisecondsBeforeClose(s * 1000); // Milliseconds are expected here
774 4e3593c3511d NEWS Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	87
394 9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	88 lua_.Execute(Orthanc::EmbeddedResources::LUA_TOOLBOX);
1273 88010d8e12cf Support of HTTP proxy Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	89 lua_.SetHttpProxy(Configuration::GetGlobalStringParameter("HttpProxy", ""));
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	90 }
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91
236 6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	92 void ServerContext::SetCompressionEnabled(bool enabled)
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	93 {
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	94 if (enabled)
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	95 LOG(WARNING) << "Disk compression is enabled";
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	96 else
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	97 LOG(WARNING) << "Disk compression is disabled";
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	98
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	99 compressionEnabled_ = enabled;
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	100 }
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	101
1126 bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1124 diff changeset	102 void ServerContext::RemoveFile(const std::string& fileUuid,
bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1124 diff changeset	103 FileContentType type)
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	104 {
1126 bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1124 diff changeset	105 accessor_.Remove(fileUuid, type);
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	106 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	107
996 cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	108
998 4136fab6a639 callback on stored instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	109 bool ServerContext::ApplyReceivedInstanceFilter(const Json::Value& simplified,
996 cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	110 const std::string& remoteAet)
cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	111 {
cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	112 LuaContextLocker locker(*this);
cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	113
cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	114 if (locker.GetLua().IsExistingFunction(RECEIVED_INSTANCE_FILTER))
cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	115 {
cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	116 LuaFunctionCall call(locker.GetLua(), RECEIVED_INSTANCE_FILTER);
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	117 call.PushJson(simplified);
996 cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	118 call.PushString(remoteAet);
cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	119
cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	120 if (!call.ExecutePredicate())
cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	121 {
cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	122 return false;
cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	123 }
cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	124 }
cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	125
cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	126 return true;
cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	127 }
cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	128
cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	129
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	130 static IServerCommand* ParseOperation(ServerContext& context,
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	131 const std::string& operation,
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	132 const Json::Value& parameters)
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	133 {
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	134 if (operation == "delete")
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	135 {
1010 160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1009 diff changeset	136 LOG(INFO) << "Lua script to delete instance " << parameters["Instance"].asString();
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	137 return new DeleteInstanceCommand(context);
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	138 }
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	139
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	140 if (operation == "store-scu")
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	141 {
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	142 std::string localAet;
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	143 if (parameters.isMember("LocalAet"))
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	144 {
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	145 localAet = parameters["LocalAet"].asString();
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	146 }
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	147 else
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	148 {
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	149 localAet = context.GetDefaultLocalApplicationEntityTitle();
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	150 }
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	151
1010 160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1009 diff changeset	152 std::string modality = parameters["Modality"].asString();
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1009 diff changeset	153 LOG(INFO) << "Lua script to send instance " << parameters["Instance"].asString()
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	154 << " to modality " << modality << " using Store-SCU";
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	155 return new StoreScuCommand(context, localAet,
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	156 Configuration::GetModalityUsingSymbolicName(modality), true);
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	157 }
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	158
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	159 if (operation == "store-peer")
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	160 {
1010 160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1009 diff changeset	161 std::string peer = parameters["Peer"].asString();
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1009 diff changeset	162 LOG(INFO) << "Lua script to send instance " << parameters["Instance"].asString()
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	163 << " to peer " << peer << " using HTTP";
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	164
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	165 OrthancPeerParameters parameters;
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	166 Configuration::GetOrthancPeer(parameters, peer);
1165 0561f2087cc9 Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	167 return new StorePeerCommand(context, parameters, true);
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	168 }
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	169
1008 187ed107a59f modify command Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	170 if (operation == "modify")
187ed107a59f modify command Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	171 {
1010 160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1009 diff changeset	172 LOG(INFO) << "Lua script to modify instance " << parameters["Instance"].asString();
1341 479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	173 DicomModification modification;
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	174 OrthancRestApi::ParseModifyRequest(modification, parameters);
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	175
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	176 std::auto_ptr<ModifyInstanceCommand> command(new ModifyInstanceCommand(context, modification));
1008 187ed107a59f modify command Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	177 return command.release();
187ed107a59f modify command Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	178 }
187ed107a59f modify command Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	179
1065 921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	180 if (operation == "call-system")
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	181 {
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	182 LOG(INFO) << "Lua script to call system command on " << parameters["Instance"].asString();
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	183
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	184 const Json::Value& argsIn = parameters["Arguments"];
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	185 if (argsIn.type() != Json::arrayValue)
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	186 {
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	187 throw OrthancException(ErrorCode_BadParameterType);
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	188 }
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	189
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	190 std::vector<std::string> args;
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	191 args.reserve(argsIn.size());
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	192 for (Json::Value::ArrayIndex i = 0; i < argsIn.size(); ++i)
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	193 {
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	194 // http://jsoncpp.sourceforge.net/namespace_json.html#7d654b75c16a57007925868e38212b4e
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	195 switch (argsIn[i].type())
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	196 {
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	197 case Json::stringValue:
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	198 args.push_back(argsIn[i].asString());
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	199 break;
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	200
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	201 case Json::intValue:
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	202 args.push_back(boost::lexical_cast<std::string>(argsIn[i].asInt()));
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	203 break;
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	204
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	205 case Json::uintValue:
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	206 args.push_back(boost::lexical_cast<std::string>(argsIn[i].asUInt()));
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	207 break;
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	208
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	209 case Json::realValue:
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	210 args.push_back(boost::lexical_cast<std::string>(argsIn[i].asFloat()));
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	211 break;
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	212
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	213 default:
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	214 throw OrthancException(ErrorCode_BadParameterType);
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	215 }
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	216 }
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	217
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	218 return new CallSystemCommand(context, parameters["Command"].asString(), args);
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	219 }
921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	220
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	221 throw OrthancException(ErrorCode_ParameterOutOfRange);
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	222 }
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	223
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	224
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	225 void ServerContext::ApplyLuaOnStoredInstance(const std::string& instanceId,
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	226 const Json::Value& simplifiedDicom,
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1284 diff changeset	227 const Json::Value& metadata,
5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1284 diff changeset	228 const std::string& remoteAet,
5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1284 diff changeset	229 const std::string& calledAet)
998 4136fab6a639 callback on stored instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	230 {
4136fab6a639 callback on stored instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	231 LuaContextLocker locker(*this);
4136fab6a639 callback on stored instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	232
4136fab6a639 callback on stored instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	233 if (locker.GetLua().IsExistingFunction(ON_STORED_INSTANCE))
4136fab6a639 callback on stored instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	234 {
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	235 locker.GetLua().Execute("_InitializeJob()");
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	236
998 4136fab6a639 callback on stored instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	237 LuaFunctionCall call(locker.GetLua(), ON_STORED_INSTANCE);
4136fab6a639 callback on stored instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	238 call.PushString(instanceId);
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1001 diff changeset	239 call.PushJson(simplifiedDicom);
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1001 diff changeset	240 call.PushJson(metadata);
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1284 diff changeset	241 call.PushJson(remoteAet);
5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1284 diff changeset	242 call.PushJson(calledAet);
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	243 call.Execute();
998 4136fab6a639 callback on stored instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	244
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	245 Json::Value operations;
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	246 LuaFunctionCall call2(locker.GetLua(), "_AccessJob");
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	247 call2.ExecuteToJson(operations);
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	248
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	249 if (operations.type() != Json::arrayValue)
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	250 {
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	251 throw OrthancException(ErrorCode_InternalError);
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	252 }
1001 f3929718ea7e autorouting primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 998 diff changeset	253
f3929718ea7e autorouting primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 998 diff changeset	254 ServerJob job;
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	255 ServerCommandInstance* previousCommand = NULL;
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	256
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	257 for (Json::Value::ArrayIndex i = 0; i < operations.size(); ++i)
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	258 {
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	259 if (operations[i].type() != Json::objectValue \|\|
1010 160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1009 diff changeset	260 !operations[i].isMember("Operation"))
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	261 {
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	262 throw OrthancException(ErrorCode_InternalError);
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	263 }
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	264
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	265 const Json::Value& parameters = operations[i];
1010 160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1009 diff changeset	266 std::string operation = parameters["Operation"].asString();
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1001 diff changeset	267
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	268 ServerCommandInstance& command = job.AddCommand(ParseOperation(*this, operation, operations[i]));
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	269
1010 160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1009 diff changeset	270 if (!parameters.isMember("Instance"))
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	271 {
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	272 throw OrthancException(ErrorCode_InternalError);
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	273 }
1001 f3929718ea7e autorouting primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 998 diff changeset	274
1010 160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1009 diff changeset	275 std::string instance = parameters["Instance"].asString();
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1009 diff changeset	276 if (instance.empty())
1008 187ed107a59f modify command Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	277 {
1010 160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1009 diff changeset	278 previousCommand->ConnectOutput(command);
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1009 diff changeset	279 }
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1009 diff changeset	280 else
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1009 diff changeset	281 {
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1009 diff changeset	282 command.AddInput(instance);
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1009 diff changeset	283 }
1008 187ed107a59f modify command Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	284
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	285 previousCommand = &command;
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	286 }
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	287
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	288 job.SetDescription(std::string("Lua script: ") + ON_STORED_INSTANCE);
1001 f3929718ea7e autorouting primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 998 diff changeset	289 scheduler_.Submit(job);
f3929718ea7e autorouting primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 998 diff changeset	290 }
998 4136fab6a639 callback on stored instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	291 }
4136fab6a639 callback on stored instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	292
4136fab6a639 callback on stored instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	293
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	294 StoreStatus ServerContext::Store(std::string& resultPublicId,
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	295 DicomInstanceToStore& dicom)
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	296 {
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	297 try
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	298 {
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	299 DicomInstanceHasher hasher(dicom.GetSummary());
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	300 resultPublicId = hasher.HashInstance();
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	301
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	302 Json::Value simplified;
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	303 SimplifyTags(simplified, dicom.GetJson());
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	304
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	305 // Test if the instance must be filtered out
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	306 if (!ApplyReceivedInstanceFilter(simplified, dicom.GetRemoteAet()))
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	307 {
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	308 LOG(INFO) << "An incoming instance has been discarded by the filter";
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	309 return StoreStatus_FilteredOut;
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	310 }
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	311
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	312 if (compressionEnabled_)
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	313 {
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	314 accessor_.SetCompressionForNextOperations(CompressionType_Zlib);
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	315 }
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	316 else
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	317 {
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	318 accessor_.SetCompressionForNextOperations(CompressionType_None);
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	319 }
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	320
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	321 FileInfo dicomInfo = accessor_.Write(dicom.GetBufferData(), dicom.GetBufferSize(), FileContentType_Dicom);
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	322 FileInfo jsonInfo = accessor_.Write(dicom.GetJson().toStyledString(), FileContentType_DicomAsJson);
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	323
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	324 ServerIndex::Attachments attachments;
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	325 attachments.push_back(dicomInfo);
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	326 attachments.push_back(jsonInfo);
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	327
1067 ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	328 typedef std::map<MetadataType, std::string> InstanceMetadata;
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	329 InstanceMetadata instanceMetadata;
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	330 StoreStatus status = index_.Store(instanceMetadata, dicom.GetSummary(), attachments,
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	331 dicom.GetRemoteAet(), dicom.GetMetadata());
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	332
1067 ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	333 dicom.GetMetadata().clear();
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	334
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	335 for (InstanceMetadata::const_iterator it = instanceMetadata.begin();
1304 7b6925b0890d cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	336 it != instanceMetadata.end(); ++it)
1067 ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	337 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	338 dicom.GetMetadata().insert(std::make_pair(std::make_pair(ResourceType_Instance, it->first),
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	339 it->second));
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	340 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	341
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	342 if (status != StoreStatus_Success)
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	343 {
1126 bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1124 diff changeset	344 accessor_.Remove(dicomInfo.GetUuid(), FileContentType_Dicom);
bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1124 diff changeset	345 accessor_.Remove(jsonInfo.GetUuid(), FileContentType_DicomAsJson);
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	346 }
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	347
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	348 switch (status)
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	349 {
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	350 case StoreStatus_Success:
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	351 LOG(INFO) << "New instance stored";
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	352 break;
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	353
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	354 case StoreStatus_AlreadyStored:
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	355 LOG(INFO) << "Already stored";
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	356 break;
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	357
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	358 case StoreStatus_Failure:
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	359 LOG(ERROR) << "Store failure";
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	360 break;
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	361
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	362 default:
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	363 // This should never happen
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	364 break;
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	365 }
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	366
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	367 if (status == StoreStatus_Success \|\|
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	368 status == StoreStatus_AlreadyStored)
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	369 {
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	370 Json::Value metadata = Json::objectValue;
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	371 for (std::map<MetadataType, std::string>::const_iterator
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	372 it = instanceMetadata.begin();
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	373 it != instanceMetadata.end(); ++it)
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	374 {
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	375 metadata[EnumerationToString(it->first)] = it->second;
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	376 }
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	377
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	378 try
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	379 {
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1284 diff changeset	380 ApplyLuaOnStoredInstance(resultPublicId, simplified, metadata,
5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1284 diff changeset	381 dicom.GetRemoteAet(), dicom.GetCalledAet());
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	382 }
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	383 catch (OrthancException& e)
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	384 {
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1284 diff changeset	385 LOG(ERROR) << "Error in " << ON_STORED_INSTANCE << " callback (Lua): " << e.What();
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	386 }
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	387
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	388 if (plugins_ != NULL)
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	389 {
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	390 try
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	391 {
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	392 plugins_->SignalStoredInstance(dicom, resultPublicId);
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	393 }
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	394 catch (OrthancException& e)
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	395 {
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1284 diff changeset	396 LOG(ERROR) << "Error in " << ON_STORED_INSTANCE << " callback (plugins): " << e.What();
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	397 }
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	398 }
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	399 }
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	400
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	401 return status;
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	402 }
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	403 catch (OrthancException& e)
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	404 {
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	405 if (e.GetErrorCode() == ErrorCode_InexistentTag)
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	406 {
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	407 LogMissingRequiredTag(dicom.GetSummary());
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	408 }
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	409
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	410 throw;
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	411 }
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	412 }
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	413
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	414
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	415
1146 200fcac0deb4 optimization for access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	416 void ServerContext::AnswerAttachment(RestApiOutput& output,
200fcac0deb4 optimization for access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	417 const std::string& instancePublicId,
200fcac0deb4 optimization for access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	418 FileContentType content)
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	419 {
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	420 FileInfo attachment;
236 6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	421 if (!index_.LookupAttachment(attachment, instancePublicId, content))
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	422 {
236 6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	423 throw OrthancException(ErrorCode_InternalError);
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	424 }
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	425
236 6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	426 accessor_.SetCompressionForNextOperations(attachment.GetCompressionType());
320 1b0ffed55ab0 fix download dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	427
1126 bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1124 diff changeset	428 std::auto_ptr<HttpFileSender> sender(accessor_.ConstructHttpFileSender(attachment.GetUuid(), attachment.GetContentType()));
1146 200fcac0deb4 optimization for access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	429 sender->SetContentType(GetMimeType(content));
320 1b0ffed55ab0 fix download dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	430 sender->SetDownloadFilename(instancePublicId + ".dcm");
236 6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	431 output.AnswerFile(*sender);
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	432 }
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	433
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	434
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	435 void ServerContext::ReadJson(Json::Value& result,
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	436 const std::string& instancePublicId)
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	437 {
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	438 std::string s;
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 696 diff changeset	439 ReadFile(s, instancePublicId, FileContentType_DicomAsJson);
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	440
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	441 Json::Reader reader;
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	442 if (!reader.parse(s, result))
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	443 {
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	444 throw OrthancException("Corrupted JSON file");
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	445 }
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	446 }
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	447
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	448
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	449 void ServerContext::ReadFile(std::string& result,
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	450 const std::string& instancePublicId,
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 696 diff changeset	451 FileContentType content,
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 696 diff changeset	452 bool uncompressIfNeeded)
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	453 {
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	454 FileInfo attachment;
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	455 if (!index_.LookupAttachment(attachment, instancePublicId, content))
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	456 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	457 throw OrthancException(ErrorCode_InternalError);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	458 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	459
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 696 diff changeset	460 if (uncompressIfNeeded)
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 696 diff changeset	461 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 696 diff changeset	462 accessor_.SetCompressionForNextOperations(attachment.GetCompressionType());
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 696 diff changeset	463 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 696 diff changeset	464 else
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 696 diff changeset	465 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 696 diff changeset	466 accessor_.SetCompressionForNextOperations(CompressionType_None);
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 696 diff changeset	467 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 696 diff changeset	468
1126 bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1124 diff changeset	469 accessor_.Read(result, attachment.GetUuid(), attachment.GetContentType());
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	470 }
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	471
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	472
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	473 IDynamicObject* ServerContext::DicomCacheProvider::Provide(const std::string& instancePublicId)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	474 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	475 std::string content;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	476 context_.ReadFile(content, instancePublicId, FileContentType_Dicom);
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	477 return new ParsedDicomFile(content);
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	478 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	479
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	480
778 aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 774 diff changeset	481 ServerContext::DicomCacheLocker::DicomCacheLocker(ServerContext& that,
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 774 diff changeset	482 const std::string& instancePublicId) :
1129 8dabdc0d3007 fix possible deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 1126 diff changeset	483 that_(that),
8dabdc0d3007 fix possible deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 1126 diff changeset	484 lock_(that_.dicomCacheMutex_)
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	485 {
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 288 diff changeset	486 #if ENABLE_DICOM_CACHE == 0
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 288 diff changeset	487 static std::auto_ptr<IDynamicObject> p;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 288 diff changeset	488 p.reset(provider_.Provide(instancePublicId));
778 aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 774 diff changeset	489 dicom_ = dynamic_cast<ParsedDicomFile*>(p.get());
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 288 diff changeset	490 #else
778 aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 774 diff changeset	491 dicom_ = &dynamic_cast<ParsedDicomFile&>(that_.dicomCache_.Access(instancePublicId));
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 774 diff changeset	492 #endif
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 774 diff changeset	493 }
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 774 diff changeset	494
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 774 diff changeset	495
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 774 diff changeset	496 ServerContext::DicomCacheLocker::~DicomCacheLocker()
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 774 diff changeset	497 {
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	498 }
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	499
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	500
695 c59bc408fb10 parameter to disable the computation of the MD5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	501 void ServerContext::SetStoreMD5ForAttachments(bool storeMD5)
c59bc408fb10 parameter to disable the computation of the MD5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	502 {
c59bc408fb10 parameter to disable the computation of the MD5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	503 LOG(INFO) << "Storing MD5 for attachments: " << (storeMD5 ? "yes" : "no");
c59bc408fb10 parameter to disable the computation of the MD5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	504 accessor_.SetStoreMD5(storeMD5);
c59bc408fb10 parameter to disable the computation of the MD5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	505 }
c59bc408fb10 parameter to disable the computation of the MD5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	506
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	507
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	508 bool ServerContext::AddAttachment(const std::string& resourceId,
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	509 FileContentType attachmentType,
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	510 const void* data,
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	511 size_t size)
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	512 {
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	513 LOG(INFO) << "Adding attachment " << EnumerationToString(attachmentType) << " to resource " << resourceId;
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	514
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	515 if (compressionEnabled_)
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	516 {
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	517 accessor_.SetCompressionForNextOperations(CompressionType_Zlib);
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	518 }
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	519 else
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	520 {
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	521 accessor_.SetCompressionForNextOperations(CompressionType_None);
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	522 }
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	523
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	524 FileInfo info = accessor_.Write(data, size, attachmentType);
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	525 StoreStatus status = index_.AddAttachment(info, resourceId);
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	526
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	527 if (status != StoreStatus_Success)
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	528 {
1126 bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1124 diff changeset	529 accessor_.Remove(info.GetUuid(), info.GetContentType());
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	530 return false;
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	531 }
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	532 else
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	533 {
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	534 return true;
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	535 }
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	536 }
1145 0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	537
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	538
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	539 bool ServerContext::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	540 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	541 ResourceType expectedType)
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	542 {
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	543 return index_.DeleteResource(target, uuid, expectedType);
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	544 }
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1165 diff changeset	545
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1165 diff changeset	546
1198 1169528a9a5f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	547 void ServerContext::SignalChange(const ServerIndexChange& change)
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1165 diff changeset	548 {
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1165 diff changeset	549 if (plugins_ != NULL)
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1165 diff changeset	550 {
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1165 diff changeset	551 try
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1165 diff changeset	552 {
1198 1169528a9a5f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	553 plugins_->SignalChange(change);
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1165 diff changeset	554 }
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1165 diff changeset	555 catch (OrthancException& e)
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1165 diff changeset	556 {
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1165 diff changeset	557 LOG(ERROR) << "Error in OnChangeCallback (plugins): " << e.What();
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1165 diff changeset	558 }
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1165 diff changeset	559 }
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1165 diff changeset	560 }
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	561
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	562
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	563 bool ServerContext::HasPlugins() const
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	564 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	565 return (pluginsManager_ && plugins_);
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	566 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	567
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	568
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	569 const PluginsManager& ServerContext::GetPluginsManager() const
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	570 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	571 if (HasPlugins())
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	572 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	573 return *pluginsManager_;
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	574 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	575 else
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	576 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	577 throw OrthancException(ErrorCode_InternalError);
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	578 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	579 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	580
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	581
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	582 const OrthancPlugins& ServerContext::GetOrthancPlugins() const
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	583 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	584 if (HasPlugins())
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	585 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	586 return *plugins_;
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	587 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	588 else
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	589 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	590 throw OrthancException(ErrorCode_InternalError);
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	591 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	592 }
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	593 }

Mercurial > hg > orthanc

annotate OrthancServer/ServerContext.cpp @ 1427:d710ea64f0fd