orthanc: OrthancServer/OrthancInitialization.cpp annotate

annotate OrthancServer/OrthancInitialization.cpp @ 2665:389d050a2e66 jobs

fix deadlock, speed up unit tests

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 08 Jun 2018 13:51:31 +0200
parents	8b6b0b6ece6b
children	eaf10085ffa1

rev	line source
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1892 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1275 diff changeset	4 * Department, University Hospital of Liege, Belgium
2447 878b59270859 upgrade to year 2018 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	5 * Copyright (C) 2017-2018 Osimis S.A., Belgium
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	11 *
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	12 * In addition, as a special exception, the copyright holders of this
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	13 * program give permission to link the code of its release with the
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	16 * the linked executables. You must obey the GNU General Public License
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	18 * modify file(s) with this exception, you may extend this exception to
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	20 * you do not wish to do so, delete this exception statement from your
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	21 * version. If you delete this exception statement from all source files
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	22 * in the program, then also delete it here.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * This program is distributed in the hope that it will be useful, but
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
3959d33612cc initial commit 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"
2547 8b6b0b6ece6b MinGW, ORTHANC_FRAMEWORK_URL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	35
8b6b0b6ece6b MinGW, ORTHANC_FRAMEWORK_URL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	36 #if defined(_WIN32)
8b6b0b6ece6b MinGW, ORTHANC_FRAMEWORK_URL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	37 // "Please include winsock2.h before windows.h"
8b6b0b6ece6b MinGW, ORTHANC_FRAMEWORK_URL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	38 # include <winsock2.h>
8b6b0b6ece6b MinGW, ORTHANC_FRAMEWORK_URL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	39 #endif
8b6b0b6ece6b MinGW, ORTHANC_FRAMEWORK_URL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	40
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	41 #include "OrthancInitialization.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	42
476 4aae0261515e move HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 457 diff changeset	43 #include "../Core/HttpClient.h"
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1429 diff changeset	44 #include "../Core/Logging.h"
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	45 #include "../Core/OrthancException.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46 #include "../Core/Toolbox.h"
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1429 diff changeset	47 #include "../Core/FileStorage/FilesystemStorage.h"
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1429 diff changeset	48
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	49 #include "ServerEnumerations.h"
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1429 diff changeset	50 #include "DatabaseWrapper.h"
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	51 #include "../Core/DicomParsing/FromDcmtkBridge.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53 #include <boost/lexical_cast.hpp>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54 #include <boost/filesystem.hpp>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55 #include <curl/curl.h>
2217 4f39ab2cb453 flush Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	56 #include <boost/thread/recursive_mutex.hpp>
1274 b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	57
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	58 #include <dcmtk/dcmnet/dul.h> // For dcmDisableGethostbyaddr()
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	59
b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	60
b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	61
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	62 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	64 static boost::recursive_mutex globalMutex_;
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	65 static Json::Value configuration_;
394 9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	66 static boost::filesystem::path defaultDirectory_;
1145 0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	67 static std::string configurationAbsolutePath_;
1610 2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	68 static FontRegistry fontRegistry_;
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	69 static const char* configurationFileArg_ = NULL;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	70
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	71
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	72 static std::string GetGlobalStringParameterInternal(const std::string& parameter,
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	73 const std::string& defaultValue)
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	74 {
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	75 if (configuration_.isMember(parameter))
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	76 {
1592 d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	77 if (configuration_[parameter].type() != Json::stringValue)
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	78 {
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	79 LOG(ERROR) << "The configuration option \"" << parameter << "\" must be a string";
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	80 throw OrthancException(ErrorCode_BadParameterType);
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	81 }
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	82 else
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	83 {
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	84 return configuration_[parameter].asString();
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	85 }
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	86 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	87 else
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	88 {
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	89 return defaultValue;
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	90 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	91 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	92
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	93
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	94 static bool GetGlobalBoolParameterInternal(const std::string& parameter,
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	95 bool defaultValue)
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	96 {
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	97 if (configuration_.isMember(parameter))
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	98 {
1592 d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	99 if (configuration_[parameter].type() != Json::booleanValue)
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	100 {
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	101 LOG(ERROR) << "The configuration option \"" << parameter << "\" must be a Boolean (true or false)";
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	102 throw OrthancException(ErrorCode_BadParameterType);
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	103 }
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	104 else
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	105 {
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	106 return configuration_[parameter].asBool();
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	107 }
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	108 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	109 else
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	110 {
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	111 return defaultValue;
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	112 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	113 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	114
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	115
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	116
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	117 static void AddFileToConfiguration(Json::Value& target,
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	118 const boost::filesystem::path& path)
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	119 {
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	120 LOG(WARNING) << "Reading the configuration from: " << path;
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	121
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	122 Json::Value config;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	123
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	124 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	125 std::string content;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	126 SystemToolbox::ReadFile(content, path.string());
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	127
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	128 Json::Value tmp;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	129 Json::Reader reader;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	130 if (!reader.parse(content, tmp) \|\|
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	131 tmp.type() != Json::objectValue)
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	132 {
1596 f2e3d030ea59 BadJson error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	133 LOG(ERROR) << "The configuration file does not follow the JSON syntax: " << path;
f2e3d030ea59 BadJson error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	134 throw OrthancException(ErrorCode_BadJson);
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	135 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	136
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	137 Toolbox::CopyJsonWithoutComments(config, tmp);
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	138 }
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	139
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	140 if (target.size() == 0)
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	141 {
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	142 target = config;
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	143 }
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	144 else
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	145 {
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	146 Json::Value::Members members = config.getMemberNames();
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	147 for (Json::Value::ArrayIndex i = 0; i < members.size(); i++)
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	148 {
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	149 if (target.isMember(members[i]))
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	150 {
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	151 LOG(ERROR) << "The configuration section \"" << members[i] << "\" is defined in 2 different configuration files";
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	152 throw OrthancException(ErrorCode_BadFileFormat);
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	153 }
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	154 else
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	155 {
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	156 target[members[i]] = config[members[i]];
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	157 }
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	158 }
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	159 }
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	160 }
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	161
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	162
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	163 static void ScanFolderForConfiguration(Json::Value& target,
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	164 const char* folder)
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	165 {
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	166 using namespace boost::filesystem;
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	167
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	168 LOG(WARNING) << "Scanning folder \"" << folder << "\" for configuration files";
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	169
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	170 directory_iterator end_it; // default construction yields past-the-end
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	171 for (directory_iterator it(folder);
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	172 it != end_it;
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	173 ++it)
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	174 {
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	175 if (!is_directory(it->status()))
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	176 {
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	177 std::string extension = boost::filesystem::extension(it->path());
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	178 Toolbox::ToLowerCase(extension);
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	179
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	180 if (extension == ".json")
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	181 {
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	182 AddFileToConfiguration(target, it->path().string());
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	183 }
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	184 }
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	185 }
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	186 }
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	187
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	188
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	189 static void ReadConfiguration(Json::Value& target,
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	190 const char* configurationFile)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	191 {
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	192 target = Json::objectValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	193
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	194 if (configurationFile)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	195 {
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	196 if (!boost::filesystem::exists(configurationFile))
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	197 {
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	198 LOG(ERROR) << "Inexistent path to configuration: " << configurationFile;
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: 1424 diff changeset	199 throw OrthancException(ErrorCode_InexistentFile);
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	200 }
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	201
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	202 if (boost::filesystem::is_directory(configurationFile))
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	203 {
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	204 ScanFolderForConfiguration(target, configurationFile);
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	205 }
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	206 else
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	207 {
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	208 AddFileToConfiguration(target, configurationFile);
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	209 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	210 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	211 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	212 {
660 f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	213 #if ORTHANC_STANDALONE == 1
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	214 // No default path for the standalone configuration
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	215 LOG(WARNING) << "Using the default Orthanc configuration";
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	216 return;
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	217
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	218 #else
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	219 // In a non-standalone build, we use the
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	220 // "Resources/Configuration.json" from the Orthanc source code
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	221
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	222 boost::filesystem::path p = ORTHANC_PATH;
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	223 p /= "Resources";
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	224 p /= "Configuration.json";
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	225
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	226 AddFileToConfiguration(target, p);
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	227 #endif
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	228 }
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	229 }
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	230
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	231
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	232
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	233 static void ReadGlobalConfiguration(const char* configurationFile)
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	234 {
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	235 // Read the content of the configuration
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	236 configurationFileArg_ = configurationFile;
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	237 ReadConfiguration(configuration_, configurationFile);
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	238
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	239 // Adapt the paths to the configurations
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	240 defaultDirectory_ = boost::filesystem::current_path();
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	241 configurationAbsolutePath_ = "";
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	242
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	243 if (configurationFile)
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	244 {
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	245 if (boost::filesystem::is_directory(configurationFile))
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	246 {
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	247 defaultDirectory_ = boost::filesystem::path(configurationFile);
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	248 configurationAbsolutePath_ = boost::filesystem::absolute(configurationFile).parent_path().string();
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	249 }
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	250 else
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	251 {
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	252 defaultDirectory_ = boost::filesystem::path(configurationFile).parent_path();
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	253 configurationAbsolutePath_ = boost::filesystem::absolute(configurationFile).string();
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	254 }
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	255 }
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	256 else
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	257 {
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	258 #if ORTHANC_STANDALONE != 1
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	259 // In a non-standalone build, we use the
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	260 // "Resources/Configuration.json" from the Orthanc source code
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	261
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	262 boost::filesystem::path p = ORTHANC_PATH;
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	263 p /= "Resources";
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	264 p /= "Configuration.json";
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	265 configurationAbsolutePath_ = boost::filesystem::absolute(p).string();
87 8517e2c44283 path to configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	266 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	267 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	268 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	269
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	270
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	271 static void ValidateGlobalConfiguration()
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	272 {
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	273 std::set<std::string> ids;
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	274
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	275 Configuration::GetListOfOrthancPeers(ids);
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	276 for (std::set<std::string>::const_iterator it = ids.begin(); it != ids.end(); ++it)
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	277 {
2020 a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	278 WebServiceParameters peer;
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	279 Configuration::GetOrthancPeer(peer, *it);
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	280 }
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	281
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	282 Configuration::GetListOfDicomModalities(ids);
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	283 for (std::set<std::string>::const_iterator it = ids.begin(); it != ids.end(); ++it)
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	284 {
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	285 RemoteModalityParameters modality;
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	286 Configuration::GetDicomModalityUsingSymbolicName(modality, *it);
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	287 }
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	288 }
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	289
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	290
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	291 static void RegisterUserMetadata()
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	292 {
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	293 if (configuration_.isMember("UserMetadata"))
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	294 {
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	295 const Json::Value& parameter = configuration_["UserMetadata"];
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	296
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	297 Json::Value::Members members = parameter.getMemberNames();
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	298 for (size_t i = 0; i < members.size(); i++)
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	299 {
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	300 const std::string& name = members[i];
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	301
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	302 if (!parameter[name].isInt())
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	303 {
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	304 LOG(ERROR) << "Not a number in this user-defined metadata: " << name;
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	305 throw OrthancException(ErrorCode_BadParameterType);
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	306 }
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	307
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	308 int metadata = parameter[name].asInt();
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	309
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	310 LOG(INFO) << "Registering user-defined metadata: " << name << " (index "
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	311 << metadata << ")";
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	312
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	313 try
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	314 {
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	315 RegisterUserMetadata(metadata, name);
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	316 }
657 5425bb6f1ea5 further cppcheck fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	317 catch (OrthancException&)
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	318 {
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	319 LOG(ERROR) << "Cannot register this user-defined metadata: " << name;
657 5425bb6f1ea5 further cppcheck fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	320 throw;
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	321 }
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	322 }
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	323 }
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	324 }
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	325
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	326
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	327 static void RegisterUserContentType()
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	328 {
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	329 if (configuration_.isMember("UserContentType"))
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	330 {
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	331 const Json::Value& parameter = configuration_["UserContentType"];
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	332
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	333 Json::Value::Members members = parameter.getMemberNames();
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	334 for (size_t i = 0; i < members.size(); i++)
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	335 {
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	336 const std::string& name = members[i];
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	337 std::string mime = "application/octet-stream";
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	338
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	339 const Json::Value& value = parameter[name];
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	340 int contentType;
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	341
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	342 if (value.isArray() &&
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	343 value.size() == 2 &&
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	344 value[0].isInt() &&
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	345 value[1].isString())
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	346 {
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	347 contentType = value[0].asInt();
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	348 mime = value[1].asString();
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	349 }
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	350 else if (value.isInt())
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	351 {
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	352 contentType = value.asInt();
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	353 }
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	354 else
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	355 {
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	356 LOG(ERROR) << "Not a number in this user-defined attachment type: " << name;
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	357 throw OrthancException(ErrorCode_BadParameterType);
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	358 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	359
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	360 LOG(INFO) << "Registering user-defined attachment type: " << name << " (index "
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	361 << contentType << ") with MIME type \"" << mime << "\"";
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	362
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	363 try
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	364 {
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	365 RegisterUserContentType(contentType, name, mime);
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	366 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	367 catch (OrthancException&)
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	368 {
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	369 throw;
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	370 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	371 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	372 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	373 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	374
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	375
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	376 static void LoadCustomDictionary(const Json::Value& configuration)
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	377 {
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	378 if (configuration.type() != Json::objectValue \|\|
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	379 !configuration.isMember("Dictionary") \|\|
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	380 configuration["Dictionary"].type() != Json::objectValue)
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	381 {
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	382 return;
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	383 }
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	384
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	385 Json::Value::Members tags(configuration["Dictionary"].getMemberNames());
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	386
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	387 for (Json::Value::ArrayIndex i = 0; i < tags.size(); i++)
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	388 {
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	389 const Json::Value& content = configuration["Dictionary"][tags[i]];
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	390 if (content.type() != Json::arrayValue \|\|
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	391 content.size() < 2 \|\|
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2099 diff changeset	392 content.size() > 5 \|\|
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	393 content[0].type() != Json::stringValue \|\|
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	394 content[1].type() != Json::stringValue \|\|
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	395 (content.size() >= 3 && content[2].type() != Json::intValue) \|\|
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2099 diff changeset	396 (content.size() >= 4 && content[3].type() != Json::intValue) \|\|
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2099 diff changeset	397 (content.size() >= 5 && content[4].type() != Json::stringValue))
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	398 {
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	399 throw OrthancException(ErrorCode_BadFileFormat);
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	400 }
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	401
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	402 DicomTag tag(FromDcmtkBridge::ParseTag(tags[i]));
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	403 ValueRepresentation vr = StringToValueRepresentation(content[0].asString(), true);
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	404 std::string name = content[1].asString();
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	405 unsigned int minMultiplicity = (content.size() >= 2) ? content[2].asUInt() : 1;
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	406 unsigned int maxMultiplicity = (content.size() >= 3) ? content[3].asUInt() : 1;
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2099 diff changeset	407 std::string privateCreator = (content.size() >= 4) ? content[4].asString() : "";
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	408
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2099 diff changeset	409 FromDcmtkBridge::RegisterDictionaryTag(tag, vr, name, minMultiplicity, maxMultiplicity, privateCreator);
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	410 }
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	411 }
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	412
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	413
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	414 static void ConfigurePkcs11(const Json::Value& config)
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	415 {
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	416 if (config.type() != Json::objectValue \|\|
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	417 !config.isMember("Module") \|\|
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	418 config["Module"].type() != Json::stringValue)
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	419 {
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	420 LOG(ERROR) << "No path to the PKCS#11 module (DLL or .so) is provided for HTTPS client authentication";
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	421 throw OrthancException(ErrorCode_BadFileFormat);
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	422 }
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	423
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	424 std::string pin;
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	425 if (config.isMember("Pin"))
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	426 {
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	427 if (config["Pin"].type() == Json::stringValue)
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	428 {
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	429 pin = config["Pin"].asString();
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	430 }
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	431 else
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	432 {
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	433 LOG(ERROR) << "The PIN number in the PKCS#11 configuration must be a string";
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	434 throw OrthancException(ErrorCode_BadFileFormat);
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	435 }
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	436 }
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	437
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	438 bool verbose = false;
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	439 if (config.isMember("Verbose"))
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	440 {
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	441 if (config["Verbose"].type() == Json::booleanValue)
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	442 {
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	443 verbose = config["Verbose"].asBool();
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	444 }
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	445 else
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	446 {
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	447 LOG(ERROR) << "The Verbose option in the PKCS#11 configuration must be a Boolean";
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	448 throw OrthancException(ErrorCode_BadFileFormat);
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	449 }
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	450 }
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	451
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	452 HttpClient::InitializePkcs11(config["Module"].asString(), pin, verbose);
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	453 }
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	454
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	455
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1610 diff changeset	456
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	457 void OrthancInitialize(const char* configurationFile)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	458 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	459 boost::recursive_mutex::scoped_lock lock(globalMutex_);
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	460
2099 bcbc9137a535 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	461 HttpClient::InitializeOpenSsl();
1526 096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	462
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	463 InitializeServerEnumerations();
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	464
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	465 // Read the user-provided configuration
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	466 ReadGlobalConfiguration(configurationFile);
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	467 ValidateGlobalConfiguration();
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	468
2330 9c7a80c87ae9 "Locale" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	469 if (configuration_.isMember("Locale"))
9c7a80c87ae9 "Locale" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	470 {
9c7a80c87ae9 "Locale" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	471 std::string locale = GetGlobalStringParameterInternal("Locale", "");
9c7a80c87ae9 "Locale" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	472 Toolbox::InitializeGlobalLocale(configuration_["Locale"].asCString());
9c7a80c87ae9 "Locale" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	473 }
9c7a80c87ae9 "Locale" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	474 else
9c7a80c87ae9 "Locale" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	475 {
9c7a80c87ae9 "Locale" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	476 Toolbox::InitializeGlobalLocale(NULL);
9c7a80c87ae9 "Locale" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	477 }
9c7a80c87ae9 "Locale" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	478
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	479 if (configuration_.isMember("DefaultEncoding"))
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	480 {
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	481 std::string encoding = GetGlobalStringParameterInternal("DefaultEncoding", "");
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	482 SetDefaultDicomEncoding(StringToEncoding(encoding.c_str()));
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	483 }
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	484 else
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	485 {
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	486 SetDefaultDicomEncoding(ORTHANC_DEFAULT_DICOM_ENCODING);
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	487 }
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	488
2022 fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	489 if (configuration_.isMember("Pkcs11"))
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	490 {
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	491 ConfigurePkcs11(configuration_["Pkcs11"]);
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	492 }
fefbe71c2272 Possibility to use PKCS#11 authentication for hardware security modules with Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	493
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1928 diff changeset	494 HttpClient::GlobalInitialize();
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	495
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	496 RegisterUserMetadata();
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	497 RegisterUserContentType();
685 b01cc78caba4 possibility to disable the DICOM/HTTP servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 660 diff changeset	498
2151 8cbb55089a1d New configuration option: "LoadPrivateDictionary" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	499 FromDcmtkBridge::InitializeDictionary(GetGlobalBoolParameterInternal("LoadPrivateDictionary", true));
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	500 LoadCustomDictionary(configuration_);
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	501
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	502 FromDcmtkBridge::InitializeCodecs();
1610 2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	503
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	504 fontRegistry_.AddFromResource(EmbeddedResources::FONT_UBUNTU_MONO_BOLD_16);
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	505
b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	506 /* Disable "gethostbyaddr" (which results in memory leaks) and use raw IP addresses */
b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	507 dcmDisableGethostbyaddr.set(OFTrue);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	508 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	509
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	510
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	511
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	512 void OrthancFinalize()
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	513 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	514 boost::recursive_mutex::scoped_lock lock(globalMutex_);
457 997282a61ff8 cleaner names Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	515 HttpClient::GlobalFinalize();
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	516 FromDcmtkBridge::FinalizeCodecs();
2099 bcbc9137a535 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	517 HttpClient::FinalizeOpenSsl();
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	518 Toolbox::FinalizeGlobalLocale();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	519 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	520
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	521
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	522 std::string Configuration::GetGlobalStringParameter(const std::string& parameter,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	523 const std::string& defaultValue)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	524 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	525 boost::recursive_mutex::scoped_lock lock(globalMutex_);
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	526 return GetGlobalStringParameterInternal(parameter, defaultValue);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	527 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	528
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	529
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	530 int Configuration::GetGlobalIntegerParameter(const std::string& parameter,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	531 int defaultValue)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	532 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	533 boost::recursive_mutex::scoped_lock lock(globalMutex_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	534
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	535 if (configuration_.isMember(parameter))
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	536 {
1592 d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	537 if (configuration_[parameter].type() != Json::intValue)
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	538 {
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	539 LOG(ERROR) << "The configuration option \"" << parameter << "\" must be an integer";
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	540 throw OrthancException(ErrorCode_BadParameterType);
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	541 }
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	542 else
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	543 {
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	544 return configuration_[parameter].asInt();
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	545 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	546 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	547 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	548 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	549 return defaultValue;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	550 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	551 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	552
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	553
2069 fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 2022 diff changeset	554 unsigned int Configuration::GetGlobalUnsignedIntegerParameter(const std::string& parameter,
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 2022 diff changeset	555 unsigned int defaultValue)
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 2022 diff changeset	556 {
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 2022 diff changeset	557 int v = GetGlobalIntegerParameter(parameter, defaultValue);
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 2022 diff changeset	558
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 2022 diff changeset	559 if (v < 0)
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 2022 diff changeset	560 {
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 2022 diff changeset	561 LOG(ERROR) << "The configuration option \"" << parameter << "\" must be a positive integer";
2071 27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	562 throw OrthancException(ErrorCode_ParameterOutOfRange);
2069 fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 2022 diff changeset	563 }
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 2022 diff changeset	564 else
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 2022 diff changeset	565 {
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 2022 diff changeset	566 return static_cast<unsigned int>(v);
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 2022 diff changeset	567 }
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 2022 diff changeset	568 }
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 2022 diff changeset	569
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 2022 diff changeset	570
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	571 bool Configuration::GetGlobalBoolParameter(const std::string& parameter,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	572 bool defaultValue)
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	573 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	574 boost::recursive_mutex::scoped_lock lock(globalMutex_);
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	575 return GetGlobalBoolParameterInternal(parameter, defaultValue);
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	576 }
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	577
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	578
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	579 void Configuration::GetDicomModalityUsingSymbolicName(RemoteModalityParameters& modality,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	580 const std::string& name)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	581 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	582 boost::recursive_mutex::scoped_lock lock(globalMutex_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	583
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	584 if (!configuration_.isMember("DicomModalities"))
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	585 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	586 LOG(ERROR) << "No modality with symbolic name: " << name;
52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	587 throw OrthancException(ErrorCode_InexistentItem);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	588 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	589
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	590 const Json::Value& modalities = configuration_["DicomModalities"];
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	591 if (modalities.type() != Json::objectValue \|\|
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	592 !modalities.isMember(name))
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	593 {
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	594 LOG(ERROR) << "No modality with symbolic name: " << name;
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	595 throw OrthancException(ErrorCode_InexistentItem);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	596 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	597
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	598 try
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	599 {
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	600 modality.FromJson(modalities[name]);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	601 }
1545 33d34bc4ac15 fix msvc warnings jodogne parents: 1534 diff changeset	602 catch (OrthancException&)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	603 {
1429 7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	604 LOG(ERROR) << "Syntax error in the definition of DICOM modality \"" << name
752 45715eadc2e0 port number as a string Sebastien Jodogne <s.jodogne@gmail.com> parents: 725 diff changeset	605 << "\". Please check your configuration file.";
942 b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 847 diff changeset	606 throw;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	607 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	608 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	609
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	610
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	611
2020 a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	612 void Configuration::GetOrthancPeer(WebServiceParameters& peer,
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	613 const std::string& name)
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	614 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	615 boost::recursive_mutex::scoped_lock lock(globalMutex_);
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	616
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	617 if (!configuration_.isMember("OrthancPeers"))
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	618 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	619 LOG(ERROR) << "No peer with symbolic name: " << name;
52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	620 throw OrthancException(ErrorCode_InexistentItem);
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	621 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	622
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	623 try
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	624 {
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	625 const Json::Value& modalities = configuration_["OrthancPeers"];
752 45715eadc2e0 port number as a string Sebastien Jodogne <s.jodogne@gmail.com> parents: 725 diff changeset	626 if (modalities.type() != Json::objectValue \|\|
45715eadc2e0 port number as a string Sebastien Jodogne <s.jodogne@gmail.com> parents: 725 diff changeset	627 !modalities.isMember(name))
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	628 {
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	629 LOG(ERROR) << "No peer with symbolic name: " << name;
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	630 throw OrthancException(ErrorCode_InexistentItem);
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	631 }
752 45715eadc2e0 port number as a string Sebastien Jodogne <s.jodogne@gmail.com> parents: 725 diff changeset	632
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	633 peer.FromJson(modalities[name]);
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	634 }
1545 33d34bc4ac15 fix msvc warnings jodogne parents: 1534 diff changeset	635 catch (OrthancException&)
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	636 {
752 45715eadc2e0 port number as a string Sebastien Jodogne <s.jodogne@gmail.com> parents: 725 diff changeset	637 LOG(ERROR) << "Syntax error in the definition of peer \"" << name
45715eadc2e0 port number as a string Sebastien Jodogne <s.jodogne@gmail.com> parents: 725 diff changeset	638 << "\". Please check your configuration file.";
942 b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 847 diff changeset	639 throw;
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	640 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	641 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	642
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	643
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	644 static bool ReadKeys(std::set<std::string>& target,
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	645 const char* parameter,
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	646 bool onlyAlphanumeric)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	647 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	648 boost::recursive_mutex::scoped_lock lock(globalMutex_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	649
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	650 target.clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	651
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	652 if (!configuration_.isMember(parameter))
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	653 {
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	654 return true;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	655 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	656
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	657 const Json::Value& modalities = configuration_[parameter];
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	658 if (modalities.type() != Json::objectValue)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	659 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	660 LOG(ERROR) << "Bad format of the \"DicomModalities\" configuration section";
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	661 throw OrthancException(ErrorCode_BadFileFormat);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	662 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	663
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	664 Json::Value::Members members = modalities.getMemberNames();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	665 for (size_t i = 0; i < members.size(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	666 {
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	667 if (onlyAlphanumeric)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	668 {
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	669 for (size_t j = 0; j < members[i].size(); j++)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	670 {
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	671 if (!isalnum(members[i][j]) && members[i][j] != '-')
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	672 {
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	673 return false;
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	674 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	675 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	676 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	677
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	678 target.insert(members[i]);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	679 }
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	680
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	681 return true;
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	682 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	683
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	684
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	685 void Configuration::GetListOfDicomModalities(std::set<std::string>& target)
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	686 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	687 target.clear();
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	688
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	689 if (!ReadKeys(target, "DicomModalities", true))
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	690 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	691 LOG(ERROR) << "Only alphanumeric and dash characters are allowed in the names of the modalities";
52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	692 throw OrthancException(ErrorCode_BadFileFormat);
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	693 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	694 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	695
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	696
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	697 void Configuration::GetListOfOrthancPeers(std::set<std::string>& target)
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	698 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	699 target.clear();
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	700
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	701 if (!ReadKeys(target, "OrthancPeers", true))
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	702 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	703 LOG(ERROR) << "Only alphanumeric and dash characters are allowed in the names of Orthanc peers";
52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	704 throw OrthancException(ErrorCode_BadFileFormat);
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	705 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	706 }
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	707
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	708
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	709
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	710 void Configuration::SetupRegisteredUsers(MongooseServer& httpServer)
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	711 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	712 boost::recursive_mutex::scoped_lock lock(globalMutex_);
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	713
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	714 httpServer.ClearUsers();
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	715
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	716 if (!configuration_.isMember("RegisteredUsers"))
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	717 {
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	718 return;
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	719 }
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	720
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	721 const Json::Value& users = configuration_["RegisteredUsers"];
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	722 if (users.type() != Json::objectValue)
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	723 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	724 LOG(ERROR) << "Badly formatted list of users";
52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	725 throw OrthancException(ErrorCode_BadFileFormat);
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	726 }
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	727
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	728 Json::Value::Members usernames = users.getMemberNames();
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	729 for (size_t i = 0; i < usernames.size(); i++)
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	730 {
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	731 const std::string& username = usernames[i];
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	732 std::string password = users[username].asString();
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	733 httpServer.RegisterUser(username.c_str(), password.c_str());
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	734 }
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	735 }
394 9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	736
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	737
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	738 std::string Configuration::InterpretRelativePath(const std::string& baseDirectory,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	739 const std::string& relativePath)
394 9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	740 {
429 09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	741 boost::filesystem::path base(baseDirectory);
09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	742 boost::filesystem::path relative(relativePath);
09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	743
428 6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	744 /**
6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	745 The following lines should be equivalent to this one:
6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	746
429 09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	747 return (base / relative).string();
428 6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	748
6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	749 However, for some unknown reason, some versions of Boost do not
429 09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	750 make the proper path resolution when "baseDirectory" is an
428 6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	751 absolute path. So, a hack is used below.
752 45715eadc2e0 port number as a string Sebastien Jodogne <s.jodogne@gmail.com> parents: 725 diff changeset	752 **/
428 6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	753
429 09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	754 if (relative.is_absolute())
427 9d2e1009076a fix for fedora 18 Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	755 {
429 09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	756 return relative.string();
427 9d2e1009076a fix for fedora 18 Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	757 }
9d2e1009076a fix for fedora 18 Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	758 else
9d2e1009076a fix for fedora 18 Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	759 {
429 09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	760 return (base / relative).string();
427 9d2e1009076a fix for fedora 18 Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	761 }
394 9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	762 }
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	763
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	764 std::string Configuration::InterpretStringParameterAsPath(const std::string& parameter)
429 09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	765 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	766 boost::recursive_mutex::scoped_lock lock(globalMutex_);
429 09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	767 return InterpretRelativePath(defaultDirectory_.string(), parameter);
09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	768 }
09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	769
394 9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	770
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	771 void Configuration::GetGlobalListOfStringsParameter(std::list<std::string>& target,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	772 const std::string& key)
394 9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	773 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	774 boost::recursive_mutex::scoped_lock lock(globalMutex_);
394 9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	775
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	776 target.clear();
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	777
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	778 if (!configuration_.isMember(key))
394 9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	779 {
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	780 return;
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	781 }
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	782
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	783 const Json::Value& lst = configuration_[key];
394 9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	784
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	785 if (lst.type() != Json::arrayValue)
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	786 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	787 LOG(ERROR) << "Badly formatted list of strings";
52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	788 throw OrthancException(ErrorCode_BadFileFormat);
394 9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	789 }
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	790
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	791 for (Json::Value::ArrayIndex i = 0; i < lst.size(); i++)
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	792 {
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	793 target.push_back(lst[i].asString());
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	794 }
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	795 }
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	796
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	797
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	798 bool Configuration::IsSameAETitle(const std::string& aet1,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	799 const std::string& aet2)
690 2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	800 {
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	801 if (GetGlobalBoolParameter("StrictAetComparison", false))
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	802 {
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	803 // Case-sensitive matching
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	804 return aet1 == aet2;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	805 }
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	806 else
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	807 {
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	808 // Case-insensitive matching (default)
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	809 std::string tmp1, tmp2;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	810 Toolbox::ToLowerCase(tmp1, aet1);
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	811 Toolbox::ToLowerCase(tmp2, aet2);
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	812 return tmp1 == tmp2;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	813 }
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	814 }
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	815
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	816
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	817 bool Configuration::LookupDicomModalityUsingAETitle(RemoteModalityParameters& modality,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	818 const std::string& aet)
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	819 {
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	820 std::set<std::string> modalities;
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	821 GetListOfDicomModalities(modalities);
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	822
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	823 for (std::set<std::string>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 617 diff changeset	824 it = modalities.begin(); it != modalities.end(); ++it)
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	825 {
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	826 try
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	827 {
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	828 GetDicomModalityUsingSymbolicName(modality, *it);
725 ef4569ae7952 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 696 diff changeset	829
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	830 if (IsSameAETitle(aet, modality.GetApplicationEntityTitle()))
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	831 {
617 a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	832 return true;
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	833 }
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	834 }
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	835 catch (OrthancException&)
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	836 {
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	837 }
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	838 }
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	839
617 a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	840 return false;
a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	841 }
a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	842
a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	843
2352 3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	844 bool Configuration::IsKnownAETitle(const std::string& aet,
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	845 const std::string& ip)
617 a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	846 {
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	847 RemoteModalityParameters modality;
2352 3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	848
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	849 if (!LookupDicomModalityUsingAETitle(modality, aet))
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	850 {
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	851 LOG(WARNING) << "Modality \"" << aet
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	852 << "\" is not listed in the \"DicomModalities\" configuration option";
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	853 return false;
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	854 }
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	855 else if (!Configuration::GetGlobalBoolParameter("DicomCheckModalityHost", false) \|\|
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	856 ip == modality.GetHost())
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	857 {
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	858 return true;
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	859 }
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	860 else
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	861 {
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	862 LOG(WARNING) << "Forbidding access from AET \"" << aet
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	863 << "\" given its hostname (" << ip << ") does not match "
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	864 << "the \"DicomModalities\" configuration option ("
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	865 << modality.GetHost() << " was expected)";
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	866 return false;
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2330 diff changeset	867 }
617 a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	868 }
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	869
31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	870
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	871 RemoteModalityParameters Configuration::GetModalityUsingSymbolicName(const std::string& name)
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	872 {
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	873 RemoteModalityParameters modality;
557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	874 GetDicomModalityUsingSymbolicName(modality, name);
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	875
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	876 return modality;
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	877 }
31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	878
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 772 diff changeset	879
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	880 RemoteModalityParameters Configuration::GetModalityUsingAet(const std::string& aet)
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	881 {
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	882 RemoteModalityParameters modality;
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	883
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	884 if (LookupDicomModalityUsingAETitle(modality, aet))
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	885 {
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	886 return modality;
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	887 }
31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	888 else
31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	889 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	890 LOG(ERROR) << "Unknown modality for AET: " << aet;
52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	891 throw OrthancException(ErrorCode_InexistentItem);
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	892 }
31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	893 }
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	894
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	895
812 8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	896 void Configuration::UpdateModality(const std::string& symbolicName,
8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	897 const RemoteModalityParameters& modality)
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	898 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	899 boost::recursive_mutex::scoped_lock lock(globalMutex_);
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	900
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	901 if (!configuration_.isMember("DicomModalities"))
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1326 diff changeset	902 {
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	903 configuration_["DicomModalities"] = Json::objectValue;
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1326 diff changeset	904 }
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1326 diff changeset	905
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	906 Json::Value& modalities = configuration_["DicomModalities"];
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	907 if (modalities.type() != Json::objectValue)
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	908 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	909 LOG(ERROR) << "Bad file format for modality: " << symbolicName;
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	910 throw OrthancException(ErrorCode_BadFileFormat);
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	911 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	912
812 8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	913 modalities.removeMember(symbolicName);
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	914
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	915 Json::Value v;
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	916 modality.ToJson(v);
812 8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	917 modalities[symbolicName] = v;
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	918 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	919
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	920
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	921 void Configuration::RemoveModality(const std::string& symbolicName)
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	922 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	923 boost::recursive_mutex::scoped_lock lock(globalMutex_);
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	924
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	925 if (!configuration_.isMember("DicomModalities"))
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	926 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	927 LOG(ERROR) << "No modality with symbolic name: " << symbolicName;
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	928 throw OrthancException(ErrorCode_BadFileFormat);
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	929 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	930
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	931 Json::Value& modalities = configuration_["DicomModalities"];
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	932 if (modalities.type() != Json::objectValue)
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	933 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	934 LOG(ERROR) << "Bad file format for the \"DicomModalities\" configuration section";
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	935 throw OrthancException(ErrorCode_BadFileFormat);
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	936 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	937
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	938 modalities.removeMember(symbolicName.c_str());
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	939 }
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	940
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	941
812 8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	942 void Configuration::UpdatePeer(const std::string& symbolicName,
2020 a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	943 const WebServiceParameters& peer)
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	944 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	945 boost::recursive_mutex::scoped_lock lock(globalMutex_);
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	946
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	947 if (!configuration_.isMember("OrthancPeers"))
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1326 diff changeset	948 {
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	949 LOG(ERROR) << "No peer with symbolic name: " << symbolicName;
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	950 configuration_["OrthancPeers"] = Json::objectValue;
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1326 diff changeset	951 }
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1326 diff changeset	952
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	953 Json::Value& peers = configuration_["OrthancPeers"];
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	954 if (peers.type() != Json::objectValue)
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	955 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	956 LOG(ERROR) << "Bad file format for the \"OrthancPeers\" configuration section";
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	957 throw OrthancException(ErrorCode_BadFileFormat);
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	958 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	959
812 8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	960 peers.removeMember(symbolicName);
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	961
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	962 Json::Value v;
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	963 peer.ToJson(v);
812 8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	964 peers[symbolicName] = v;
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	965 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	966
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	967
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	968 void Configuration::RemovePeer(const std::string& symbolicName)
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	969 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	970 boost::recursive_mutex::scoped_lock lock(globalMutex_);
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	971
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	972 if (!configuration_.isMember("OrthancPeers"))
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	973 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	974 LOG(ERROR) << "No peer with symbolic name: " << symbolicName;
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	975 throw OrthancException(ErrorCode_BadFileFormat);
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	976 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	977
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	978 Json::Value& peers = configuration_["OrthancPeers"];
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	979 if (peers.type() != Json::objectValue)
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	980 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	981 LOG(ERROR) << "Bad file format for the \"OrthancPeers\" configuration section";
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	982 throw OrthancException(ErrorCode_BadFileFormat);
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	983 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	984
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	985 peers.removeMember(symbolicName.c_str());
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	986 }
1145 0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	987
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	988
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	989
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	990 const std::string& Configuration::GetConfigurationAbsolutePath()
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	991 {
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	992 return configurationAbsolutePath_;
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	993 }
1274 b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	994
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	995
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	996 static IDatabaseWrapper* CreateSQLiteWrapper()
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	997 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	998 std::string storageDirectoryStr = Configuration::GetGlobalStringParameter("StorageDirectory", "OrthancStorage");
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	999
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1000 // Open the database
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1001 boost::filesystem::path indexDirectory = Configuration::InterpretStringParameterAsPath(
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1002 Configuration::GetGlobalStringParameter("IndexDirectory", storageDirectoryStr));
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1003
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1004 LOG(WARNING) << "SQLite index directory: " << indexDirectory;
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1005
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1006 try
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1007 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1008 boost::filesystem::create_directories(indexDirectory);
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1009 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1010 catch (boost::filesystem::filesystem_error)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1011 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1012 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1013
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1014 return new DatabaseWrapper(indexDirectory.string() + "/index");
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1015 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1016
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1017
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1018 namespace
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1019 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1020 // Anonymous namespace to avoid clashes between compilation modules
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1021
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1022 class FilesystemStorageWithoutDicom : public IStorageArea
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1023 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1024 private:
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1025 FilesystemStorage storage_;
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1026
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1027 public:
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1028 FilesystemStorageWithoutDicom(const std::string& path) : storage_(path)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1029 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1030 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1031
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1032 virtual void Create(const std::string& uuid,
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1033 const void* content,
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1034 size_t size,
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1035 FileContentType type)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1036 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1037 if (type != FileContentType_Dicom)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1038 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1039 storage_.Create(uuid, content, size, type);
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1040 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1041 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1042
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1043 virtual void Read(std::string& content,
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1044 const std::string& uuid,
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1045 FileContentType type)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1046 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1047 if (type != FileContentType_Dicom)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1048 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1049 storage_.Read(content, uuid, type);
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1050 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1051 else
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1052 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1053 throw OrthancException(ErrorCode_UnknownResource);
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1054 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1055 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1056
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1057 virtual void Remove(const std::string& uuid,
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1058 FileContentType type)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1059 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1060 if (type != FileContentType_Dicom)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1061 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1062 storage_.Remove(uuid, type);
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1063 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1064 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1065 };
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1066 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1067
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1068
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1069 static IStorageArea* CreateFilesystemStorage()
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1070 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1071 std::string storageDirectoryStr = Configuration::GetGlobalStringParameter("StorageDirectory", "OrthancStorage");
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1072
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1073 boost::filesystem::path storageDirectory = Configuration::InterpretStringParameterAsPath(storageDirectoryStr);
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1074 LOG(WARNING) << "Storage directory: " << storageDirectory;
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1075
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1076 if (Configuration::GetGlobalBoolParameter("StoreDicom", true))
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1077 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1078 return new FilesystemStorage(storageDirectory.string());
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1079 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1080 else
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1081 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1082 LOG(WARNING) << "The DICOM files will not be stored, Orthanc running in index-only mode";
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1083 return new FilesystemStorageWithoutDicom(storageDirectory.string());
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1084 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1085 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1086
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1087
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1088 IDatabaseWrapper* Configuration::CreateDatabaseWrapper()
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1089 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1090 return CreateSQLiteWrapper();
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1091 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1092
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1093
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1094 IStorageArea* Configuration::CreateStorageArea()
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1095 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1096 return CreateFilesystemStorage();
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1097 }
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	1098
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	1099
1587 d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	1100 void Configuration::GetConfiguration(Json::Value& result)
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	1101 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	1102 boost::recursive_mutex::scoped_lock lock(globalMutex_);
1587 d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	1103 result = configuration_;
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	1104 }
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	1105
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	1106
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	1107 void Configuration::FormatConfiguration(std::string& result)
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	1108 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	1109 Json::Value config;
1587 d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	1110 GetConfiguration(config);
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	1111
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	1112 Json::StyledWriter w;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	1113 result = w.write(config);
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	1114 }
1610 2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	1115
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	1116
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	1117 const FontRegistry& Configuration::GetFontRegistry()
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	1118 {
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	1119 return fontRegistry_;
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	1120 }
1928 84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	1121
84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	1122
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2151 diff changeset	1123 void Configuration::SetDefaultEncoding(Encoding encoding)
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2151 diff changeset	1124 {
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1125 SetDefaultDicomEncoding(encoding);
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2151 diff changeset	1126
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2151 diff changeset	1127 {
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1128 // Propagate the encoding to the configuration file that is
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1129 // stored in memory
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2151 diff changeset	1130 boost::recursive_mutex::scoped_lock lock(globalMutex_);
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1131 configuration_["DefaultEncoding"] = EnumerationToString(encoding);
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2151 diff changeset	1132 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2151 diff changeset	1133 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2151 diff changeset	1134
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2151 diff changeset	1135
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	1136 bool Configuration::HasConfigurationChanged()
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	1137 {
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	1138 Json::Value starting;
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	1139 GetConfiguration(starting);
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	1140
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	1141 Json::Value current;
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	1142 ReadConfiguration(current, configurationFileArg_);
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	1143
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	1144 Json::FastWriter writer;
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	1145 std::string a = writer.write(starting);
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	1146 std::string b = writer.write(current);
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	1147
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	1148 return a != b;
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	1149 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1150 }

Mercurial > hg > orthanc

annotate OrthancServer/OrthancInitialization.cpp @ 2665:389d050a2e66 jobs