orthanc: OrthancServer/ServerContext.cpp annotate

annotate OrthancServer/ServerContext.cpp @ 2250:b5c8c0590f7f

fix in /changes

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 18 Jan 2017 12:19:22 +0100
parents	a3a65de1840f
children	563bf878407a

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: 1860 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
2244 a3a65de1840f shared copyright with osimis Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	5 * Copyright (C) 2017 Osimis, 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
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	34 #include "PrecompiledHeadersServer.h"
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "ServerContext.h"
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	37 #include "../Core/FileStorage/StorageAccessor.h"
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	38 #include "../Core/HttpServer/FilesystemHttpSender.h"
1525 f9b0169eb6bb testing Sebastien Jodogne <s.jodogne@gmail.com> parents: 1523 diff changeset	39 #include "../Core/HttpServer/HttpStreamTranscoder.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1459 diff changeset	40 #include "../Core/Logging.h"
795 d466b3606aca refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 794 diff changeset	41 #include "FromDcmtkBridge.h"
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	42 #include "ServerToolbox.h"
771 537837f50fbb refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 730 diff changeset	43 #include "OrthancInitialization.h"
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	44
394 9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	45 #include <EmbeddedResources.h>
794 437c4a83d2cc refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	46 #include <dcmtk/dcmdata/dcfilefo.h>
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47
1001 f3929718ea7e autorouting primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 998 diff changeset	48
1065 921532f67770 Lua scripts can invoke system commands, with CallSystem() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	49 #include "Scheduler/CallSystemCommand.h"
1001 f3929718ea7e autorouting primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 998 diff changeset	50 #include "Scheduler/DeleteInstanceCommand.h"
1008 187ed107a59f modify command Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	51 #include "Scheduler/ModifyInstanceCommand.h"
1001 f3929718ea7e autorouting primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 998 diff changeset	52 #include "Scheduler/StoreScuCommand.h"
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	53 #include "Scheduler/StorePeerCommand.h"
1010 160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1009 diff changeset	54 #include "OrthancRestApi/OrthancRestApi.h"
1133 382e162c074c rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1129 diff changeset	55 #include "../Plugins/Engine/OrthancPlugins.h"
2122 2ecc95a239f7 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	56 #include "Search/LookupResource.h"
1001 f3929718ea7e autorouting primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 998 diff changeset	57
f3929718ea7e autorouting primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 998 diff changeset	58
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 288 diff changeset	59 #define ENABLE_DICOM_CACHE 1
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 288 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 {
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	74 void ServerContext::ChangeThread(ServerContext* that)
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	75 {
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	76 while (!that->done_)
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	77 {
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	78 std::auto_ptr<IDynamicObject> obj(that->pendingChanges_.Dequeue(100));
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	79
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	80 if (obj.get() != NULL)
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	81 {
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	82 const ServerIndexChange& change = dynamic_cast<const ServerIndexChange&>(*obj.get());
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	83
1456 68827c07e683 fix recursive calls with Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1453 diff changeset	84 boost::recursive_mutex::scoped_lock lock(that->listenersMutex_);
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	85 for (ServerListeners::iterator it = that->listeners_.begin();
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	86 it != that->listeners_.end(); ++it)
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	87 {
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	88 try
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	89 {
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	90 try
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	91 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	92 it->GetListener().SignalChange(change);
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	93 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	94 catch (std::bad_alloc&)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	95 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	96 LOG(ERROR) << "Not enough memory while signaling a change";
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	97 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	98 catch (...)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	99 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	100 throw OrthancException(ErrorCode_InternalError);
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	101 }
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	102 }
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	103 catch (OrthancException& e)
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	104 {
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	105 LOG(ERROR) << "Error in the " << it->GetDescription()
2135 cadfe0a2a393 fix in the sample basic plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 2134 diff changeset	106 << " callback while signaling a change: " << e.What()
cadfe0a2a393 fix in the sample basic plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 2134 diff changeset	107 << " (code " << e.GetErrorCode() << ")";
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	108 }
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	109 }
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	110 }
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	111 }
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	112 }
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	113
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	114
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	115 ServerContext::ServerContext(IDatabaseWrapper& database,
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	116 IStorageArea& area) :
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	117 index_(*this, database),
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	118 area_(area),
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 409 diff changeset	119 compressionEnabled_(false),
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	120 storeMD5_(true),
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	121 provider_(*this),
995 8c67382f44a7 limit number of jobs in the scheduler Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	122 dicomCache_(provider_, DICOM_CACHE_SIZE),
2069 fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	123 scheduler_(Configuration::GetGlobalUnsignedIntegerParameter("LimitJobs", 10)),
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	124 lua_(*this),
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2135 diff changeset	125 #if ORTHANC_ENABLE_PLUGINS == 1
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	126 plugins_(NULL),
1632 eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	127 #endif
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	128 done_(false),
2069 fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	129 queryRetrieveArchive_(Configuration::GetGlobalUnsignedIntegerParameter("QueryRetrieveSize", 10)),
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	130 defaultLocalAet_(Configuration::GetGlobalStringParameter("DicomAet", "ORTHANC"))
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	131 {
2069 fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	132 uint64_t s = Configuration::GetGlobalUnsignedIntegerParameter("DicomAssociationCloseDelay", 5); // In seconds
1284 21ea32170764 Option "DicomAssociationCloseDelay" to set delay before closing DICOM association Sebastien Jodogne <s.jodogne@gmail.com> parents: 1273 diff changeset	133 scu_.SetMillisecondsBeforeClose(s * 1000); // Milliseconds are expected here
774 4e3593c3511d NEWS Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	134
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	135 listeners_.push_back(ServerListener(lua_, "Lua"));
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	136
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	137 changeThread_ = boost::thread(ChangeThread, this);
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	138 }
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	139
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	140
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	141
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	142 ServerContext::~ServerContext()
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	143 {
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	144 if (!done_)
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	145 {
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	146 LOG(ERROR) << "INTERNAL ERROR: ServerContext::Stop() should be invoked manually to avoid mess in the destruction order!";
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	147 Stop();
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	148 }
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	149 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	150
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	151
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	152 void ServerContext::Stop()
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	153 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	154 if (!done_)
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	155 {
1459 040d58493998 security Sebastien Jodogne <s.jodogne@gmail.com> parents: 1456 diff changeset	156 {
040d58493998 security Sebastien Jodogne <s.jodogne@gmail.com> parents: 1456 diff changeset	157 boost::recursive_mutex::scoped_lock lock(listenersMutex_);
040d58493998 security Sebastien Jodogne <s.jodogne@gmail.com> parents: 1456 diff changeset	158 listeners_.clear();
040d58493998 security Sebastien Jodogne <s.jodogne@gmail.com> parents: 1456 diff changeset	159 }
040d58493998 security Sebastien Jodogne <s.jodogne@gmail.com> parents: 1456 diff changeset	160
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	161 done_ = true;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	162
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	163 if (changeThread_.joinable())
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	164 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	165 changeThread_.join();
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	166 }
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	167
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	168 scu_.Finalize();
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	169
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	170 // Do not change the order below!
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	171 scheduler_.Stop();
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	172 index_.Stop();
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	173 }
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	174 }
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	175
0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	176
236 6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	177 void ServerContext::SetCompressionEnabled(bool enabled)
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	178 {
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	179 if (enabled)
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	180 LOG(WARNING) << "Disk compression is enabled";
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	181 else
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	182 LOG(WARNING) << "Disk compression is disabled";
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	183
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	184 compressionEnabled_ = enabled;
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	185 }
6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	186
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	187
1126 bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1124 diff changeset	188 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	189 FileContentType type)
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	190 {
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	191 area_.Remove(fileUuid, type);
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	192 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	193
996 cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 995 diff changeset	194
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	195 StoreStatus ServerContext::Store(std::string& resultPublicId,
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	196 DicomInstanceToStore& dicom)
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	197 {
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	198 try
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	199 {
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	200 StorageAccessor accessor(area_);
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	201
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	202 DicomInstanceHasher hasher(dicom.GetSummary());
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	203 resultPublicId = hasher.HashInstance();
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	204
1574 0c29ebe80ac9 give access to full request origin in ReceivedInstanceFilter (Lua) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1550 diff changeset	205 Json::Value simplifiedTags;
2120 4b02ec79728a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	206 ServerToolbox::SimplifyTags(simplifiedTags, dicom.GetJson(), DicomToJsonFormat_Human);
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	207
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	208 // Test if the instance must be filtered out
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	209 bool accepted = true;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	210
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	211 {
1456 68827c07e683 fix recursive calls with Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1453 diff changeset	212 boost::recursive_mutex::scoped_lock lock(listenersMutex_);
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	213
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	214 for (ServerListeners::iterator it = listeners_.begin(); it != listeners_.end(); ++it)
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	215 {
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	216 try
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	217 {
1574 0c29ebe80ac9 give access to full request origin in ReceivedInstanceFilter (Lua) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1550 diff changeset	218 if (!it->GetListener().FilterIncomingInstance(dicom, simplifiedTags))
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	219 {
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	220 accepted = false;
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	221 break;
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	222 }
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	223 }
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	224 catch (OrthancException& e)
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	225 {
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	226 LOG(ERROR) << "Error in the " << it->GetDescription()
2135 cadfe0a2a393 fix in the sample basic plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 2134 diff changeset	227 << " callback while receiving an instance: " << e.What()
cadfe0a2a393 fix in the sample basic plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 2134 diff changeset	228 << " (code " << e.GetErrorCode() << ")";
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	229 throw;
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	230 }
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	231 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	232 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	233
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	234 if (!accepted)
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	235 {
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	236 LOG(INFO) << "An incoming instance has been discarded by the filter";
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	237 return StoreStatus_FilteredOut;
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	238 }
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	239
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	240 // TODO Should we use "gzip" instead?
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	241 CompressionType compression = (compressionEnabled_ ? CompressionType_ZlibWithSize : CompressionType_None);
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	242
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	243 FileInfo dicomInfo = accessor.Write(dicom.GetBufferData(), dicom.GetBufferSize(),
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	244 FileContentType_Dicom, compression, storeMD5_);
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	245 FileInfo jsonInfo = accessor.Write(dicom.GetJson().toStyledString(),
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	246 FileContentType_DicomAsJson, compression, storeMD5_);
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	247
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	248 ServerIndex::Attachments attachments;
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	249 attachments.push_back(dicomInfo);
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	250 attachments.push_back(jsonInfo);
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	251
1067 ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	252 typedef std::map<MetadataType, std::string> InstanceMetadata;
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	253 InstanceMetadata instanceMetadata;
1822 9ed9458aa44f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1778 diff changeset	254 StoreStatus status = index_.Store(instanceMetadata, dicom, attachments);
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	255
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	256 // Only keep the metadata for the "instance" level
1067 ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	257 dicom.GetMetadata().clear();
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	258
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	259 for (InstanceMetadata::const_iterator it = instanceMetadata.begin();
1304 7b6925b0890d cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	260 it != instanceMetadata.end(); ++it)
1067 ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	261 {
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	262 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	263 it->second));
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	264 }
ace99e272203 access metadata in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	265
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	266 if (status != StoreStatus_Success)
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	267 {
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	268 accessor.Remove(dicomInfo);
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	269 accessor.Remove(jsonInfo);
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	270 }
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	271
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	272 switch (status)
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	273 {
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	274 case StoreStatus_Success:
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	275 LOG(INFO) << "New instance stored";
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	276 break;
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	277
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	278 case StoreStatus_AlreadyStored:
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	279 LOG(INFO) << "Already stored";
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	280 break;
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	281
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	282 case StoreStatus_Failure:
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	283 LOG(ERROR) << "Store failure";
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	284 break;
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	285
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	286 default:
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	287 // This should never happen
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	288 break;
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	289 }
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	290
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	291 if (status == StoreStatus_Success \|\|
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	292 status == StoreStatus_AlreadyStored)
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	293 {
1456 68827c07e683 fix recursive calls with Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1453 diff changeset	294 boost::recursive_mutex::scoped_lock lock(listenersMutex_);
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	295
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	296 for (ServerListeners::iterator it = listeners_.begin(); it != listeners_.end(); ++it)
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	297 {
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	298 try
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	299 {
1574 0c29ebe80ac9 give access to full request origin in ReceivedInstanceFilter (Lua) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1550 diff changeset	300 it->GetListener().SignalStoredInstance(resultPublicId, dicom, simplifiedTags);
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	301 }
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	302 catch (OrthancException& e)
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	303 {
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	304 LOG(ERROR) << "Error in the " << it->GetDescription()
2135 cadfe0a2a393 fix in the sample basic plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 2134 diff changeset	305 << " callback while receiving an instance: " << e.What()
cadfe0a2a393 fix in the sample basic plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 2134 diff changeset	306 << " (code " << e.GetErrorCode() << ")";
1066 bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	307 }
bb82e5e818e9 OnStoredInstance callback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1065 diff changeset	308 }
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	309 }
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 return status;
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	312 }
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	313 catch (OrthancException& e)
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	314 {
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	315 if (e.GetErrorCode() == ErrorCode_InexistentTag)
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	316 {
2120 4b02ec79728a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	317 ServerToolbox::LogMissingRequiredTag(dicom.GetSummary());
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	318 }
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 throw;
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	321 }
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	322 }
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
1146 200fcac0deb4 optimization for access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	325 void ServerContext::AnswerAttachment(RestApiOutput& output,
1700 f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	326 const std::string& resourceId,
1146 200fcac0deb4 optimization for access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	327 FileContentType content)
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	328 {
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	329 FileInfo attachment;
1700 f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	330 if (!index_.LookupAttachment(attachment, resourceId, content))
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	331 {
1700 f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	332 throw OrthancException(ErrorCode_UnknownResource);
236 6d9be2b470b4 compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	333 }
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	334
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	335 StorageAccessor accessor(area_);
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1758 diff changeset	336 accessor.AnswerFile(output, attachment, GetFileContentMime(content));
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	337 }
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	338
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	339
1700 f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	340 void ServerContext::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	341 FileContentType attachmentType,
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	342 CompressionType compression)
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	343 {
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	344 LOG(INFO) << "Changing compression type for attachment "
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	345 << EnumerationToString(attachmentType)
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	346 << " of resource " << resourceId << " to "
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	347 << compression;
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	348
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	349 FileInfo attachment;
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	350 if (!index_.LookupAttachment(attachment, resourceId, attachmentType))
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	351 {
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	352 throw OrthancException(ErrorCode_UnknownResource);
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	353 }
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	354
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	355 if (attachment.GetCompressionType() == compression)
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	356 {
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	357 // Nothing to do
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	358 return;
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	359 }
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	360
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	361 std::string content;
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	362
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	363 StorageAccessor accessor(area_);
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	364 accessor.Read(content, attachment);
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	365
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	366 FileInfo modified = accessor.Write(content.empty() ? NULL : content.c_str(),
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	367 content.size(), attachmentType, compression, storeMD5_);
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	368
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	369 try
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	370 {
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	371 StoreStatus status = index_.AddAttachment(modified, resourceId);
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	372 if (status != StoreStatus_Success)
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	373 {
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	374 accessor.Remove(modified);
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	375 throw OrthancException(ErrorCode_Database);
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	376 }
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	377 }
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	378 catch (OrthancException&)
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	379 {
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	380 accessor.Remove(modified);
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	381 throw;
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	382 }
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	383 }
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	384
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	385
2127 bfa92c9328d7 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	386 void ServerContext::ReadDicomAsJson(std::string& result,
bfa92c9328d7 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	387 const std::string& instancePublicId)
bfa92c9328d7 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	388 {
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	389 FileInfo attachment;
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	390 if (index_.LookupAttachment(attachment, instancePublicId, FileContentType_DicomAsJson))
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	391 {
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	392 ReadAttachment(result, attachment);
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	393 return;
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	394 }
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	395
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	396 // The "DICOM as JSON" summary is not available from the Orthanc
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	397 // store (most probably deleted), reconstruct it from the DICOM file
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	398 std::string dicom;
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	399 ReadDicom(dicom, instancePublicId);
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	400
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	401 LOG(INFO) << "Reconstructing the missing DICOM-as-JSON summary for instance: " << instancePublicId;
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	402
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	403 ParsedDicomFile parsed(dicom);
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	404
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	405 Json::Value summary;
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	406 parsed.DatasetToJson(summary);
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	407
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	408 result = summary.toStyledString();
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	409
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	410 if (!AddAttachment(instancePublicId, FileContentType_DicomAsJson, result.c_str(), result.size()))
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	411 {
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	412 LOG(WARNING) << "Cannot associate the DICOM-as-JSON summary to instance: " << instancePublicId;
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	413 throw OrthancException(ErrorCode_InternalError);
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	414 }
2127 bfa92c9328d7 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	415 }
bfa92c9328d7 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	416
bfa92c9328d7 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	417
2124 2b1520efa282 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2122 diff changeset	418 void ServerContext::ReadDicomAsJson(Json::Value& result,
2b1520efa282 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2122 diff changeset	419 const std::string& instancePublicId)
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	420 {
2127 bfa92c9328d7 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	421 std::string tmp;
bfa92c9328d7 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	422 ReadDicomAsJson(tmp, instancePublicId);
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	423
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	424 Json::Reader reader;
2127 bfa92c9328d7 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	425 if (!reader.parse(tmp, result))
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	426 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	427 throw OrthancException(ErrorCode_CorruptedFile);
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	428 }
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	429 }
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	430
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	431
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	432 void ServerContext::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	433 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	434 FileContentType content,
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	435 bool uncompressIfNeeded)
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	436 {
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	437 FileInfo attachment;
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	438 if (!index_.LookupAttachment(attachment, instancePublicId, content))
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	439 {
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	440 LOG(WARNING) << "Unable to read attachment " << EnumerationToString(content) << " of instance " << instancePublicId;
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	441 throw OrthancException(ErrorCode_InternalError);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	442 }
1550 2c7d5eb588e6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	443
2c7d5eb588e6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	444 if (uncompressIfNeeded)
2c7d5eb588e6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	445 {
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	446 ReadAttachment(result, attachment);
1550 2c7d5eb588e6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	447 }
2c7d5eb588e6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	448 else
2c7d5eb588e6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	449 {
2c7d5eb588e6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	450 // Do not interpret the content of the storage area, return the
2c7d5eb588e6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	451 // raw data
2c7d5eb588e6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	452 area_.Read(result, attachment.GetUuid(), content);
2c7d5eb588e6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	453 }
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	454 }
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	455
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	456
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	457 void ServerContext::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	458 const FileInfo& attachment)
1778 776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	459 {
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	460 // This will decompress the attachment
1778 776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	461 StorageAccessor accessor(area_);
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	462 accessor.Read(result, attachment);
1778 776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	463 }
776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	464
776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	465
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	466 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	467 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	468 std::string content;
2124 2b1520efa282 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2122 diff changeset	469 context_.ReadDicom(content, instancePublicId);
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	470 return new ParsedDicomFile(content);
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
778 aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 774 diff changeset	474 ServerContext::DicomCacheLocker::DicomCacheLocker(ServerContext& that,
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 774 diff changeset	475 const std::string& instancePublicId) :
1129 8dabdc0d3007 fix possible deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 1126 diff changeset	476 that_(that),
8dabdc0d3007 fix possible deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 1126 diff changeset	477 lock_(that_.dicomCacheMutex_)
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	478 {
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 288 diff changeset	479 #if ENABLE_DICOM_CACHE == 0
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 288 diff changeset	480 static std::auto_ptr<IDynamicObject> p;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 288 diff changeset	481 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	482 dicom_ = dynamic_cast<ParsedDicomFile*>(p.get());
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 288 diff changeset	483 #else
778 aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 774 diff changeset	484 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	485 #endif
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 774 diff changeset	486 }
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 774 diff changeset	487
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 774 diff changeset	488
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 774 diff changeset	489 ServerContext::DicomCacheLocker::~DicomCacheLocker()
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 774 diff changeset	490 {
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	491 }
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	492
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	493
695 c59bc408fb10 parameter to disable the computation of the MD5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	494 void ServerContext::SetStoreMD5ForAttachments(bool storeMD5)
c59bc408fb10 parameter to disable the computation of the MD5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	495 {
c59bc408fb10 parameter to disable the computation of the MD5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	496 LOG(INFO) << "Storing MD5 for attachments: " << (storeMD5 ? "yes" : "no");
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	497 storeMD5_ = storeMD5;
695 c59bc408fb10 parameter to disable the computation of the MD5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	498 }
c59bc408fb10 parameter to disable the computation of the MD5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	499
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	500
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	501 bool ServerContext::AddAttachment(const std::string& resourceId,
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	502 FileContentType attachmentType,
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	503 const void* data,
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	504 size_t size)
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	505 {
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	506 LOG(INFO) << "Adding attachment " << EnumerationToString(attachmentType) << " to resource " << resourceId;
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	507
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	508 // TODO Should we use "gzip" instead?
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	509 CompressionType compression = (compressionEnabled_ ? CompressionType_ZlibWithSize : CompressionType_None);
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	510
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	511 StorageAccessor accessor(area_);
e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	512 FileInfo attachment = accessor.Write(data, size, attachmentType, compression, storeMD5_);
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	513
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	514 StoreStatus status = index_.AddAttachment(attachment, resourceId);
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	515 if (status != StoreStatus_Success)
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	516 {
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1548 diff changeset	517 accessor.Remove(attachment);
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	518 return false;
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	519 }
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	520 else
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	521 {
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	522 return true;
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 }
1145 0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	525
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	526
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	527 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	528 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	529 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	530 {
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	531 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	532 }
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1165 diff changeset	533
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1165 diff changeset	534
1198 1169528a9a5f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	535 void ServerContext::SignalChange(const ServerIndexChange& change)
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1165 diff changeset	536 {
1436 0a3e3be59094 uncoupling of SignalChange for Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	537 pendingChanges_.Enqueue(change.Clone());
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1165 diff changeset	538 }
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	539
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	540
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2135 diff changeset	541 #if ORTHANC_ENABLE_PLUGINS == 1
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	542 void ServerContext::SetPlugins(OrthancPlugins& plugins)
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	543 {
1459 040d58493998 security Sebastien Jodogne <s.jodogne@gmail.com> parents: 1456 diff changeset	544 boost::recursive_mutex::scoped_lock lock(listenersMutex_);
040d58493998 security Sebastien Jodogne <s.jodogne@gmail.com> parents: 1456 diff changeset	545
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	546 plugins_ = &plugins;
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	547
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	548 // TODO REFACTOR THIS
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	549 listeners_.clear();
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	550 listeners_.push_back(ServerListener(lua_, "Lua"));
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	551 listeners_.push_back(ServerListener(plugins, "plugin"));
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	552 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	553
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	554
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	555 void ServerContext::ResetPlugins()
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	556 {
1459 040d58493998 security Sebastien Jodogne <s.jodogne@gmail.com> parents: 1456 diff changeset	557 boost::recursive_mutex::scoped_lock lock(listenersMutex_);
040d58493998 security Sebastien Jodogne <s.jodogne@gmail.com> parents: 1456 diff changeset	558
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	559 plugins_ = NULL;
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	560
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	561 // TODO REFACTOR THIS
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	562 listeners_.clear();
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	563 listeners_.push_back(ServerListener(lua_, "Lua"));
1232 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
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	566
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	567 const OrthancPlugins& ServerContext::GetPlugins() const
1232 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 if (HasPlugins())
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 return *plugins_;
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 else
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 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	576 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	577 }
1632 eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	578
1741 06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	579 OrthancPlugins& ServerContext::GetPlugins()
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	580 {
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	581 if (HasPlugins())
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	582 {
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	583 return *plugins_;
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	584 }
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	585 else
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	586 {
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	587 throw OrthancException(ErrorCode_InternalError);
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	588 }
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	589 }
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	590
1632 eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	591 #endif
eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	592
eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	593
eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	594 bool ServerContext::HasPlugins() const
eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	595 {
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2135 diff changeset	596 #if ORTHANC_ENABLE_PLUGINS == 1
1632 eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	597 return (plugins_ != NULL);
eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	598 #else
eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	599 return false;
eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	600 #endif
eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	601 }
1757 98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	602
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	603
1758 318c2e83c2bd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	604 bool ServerContext::Apply(std::list<std::string>& result,
1757 98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	605 const ::Orthanc::LookupResource& lookup,
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	606 size_t maxResults)
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	607 {
1758 318c2e83c2bd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	608 result.clear();
318c2e83c2bd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	609
1757 98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	610 std::vector<std::string> resources, instances;
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	611 GetIndex().FindCandidates(resources, instances, lookup);
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	612
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	613 assert(resources.size() == instances.size());
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	614
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	615 for (size_t i = 0; i < instances.size(); i++)
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	616 {
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	617 Json::Value dicom;
2124 2b1520efa282 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2122 diff changeset	618 ReadDicomAsJson(dicom, instances[i]);
1757 98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	619
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	620 if (lookup.IsMatch(dicom))
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	621 {
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	622 if (maxResults != 0 &&
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	623 result.size() >= maxResults)
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	624 {
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	625 return false; // too many results
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	626 }
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	627 else
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	628 {
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	629 result.push_back(resources[i]);
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	630 }
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	631 }
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	632 }
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	633
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	634 return true; // finished
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	635 }
98abb8d7f905 ServerContext::Apply lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	636
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	637 }

Mercurial > hg > orthanc

annotate OrthancServer/ServerContext.cpp @ 2250:b5c8c0590f7f