orthanc: OrthancServer/OrthancInitialization.cpp annotate

annotate OrthancServer/OrthancInitialization.cpp @ 2006:6301bbcbcaed

more generic support of value representations

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 09 Jun 2016 14:48:40 +0200
parents	ce90d109bb64
children	4dafe2a0d3ab

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
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	5 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 * This program is free software: you can redistribute it and/or
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * modify it under the terms of the GNU General Public License as
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * published by the Free Software Foundation, either version 3 of the
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	10 *
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	11 * In addition, as a special exception, the copyright holders of this
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	12 * 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	13 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	14 * that use the same license as the "OpenSSL" library), and distribute
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	15 * the linked executables. You must obey the GNU General Public License
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	16 * 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	17 * 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	18 * 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	19 * 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	20 * version. If you delete this exception statement from all source files
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	21 * in the program, then also delete it here.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 * 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	24 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * General Public License for more details.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 * You should have received a copy of the GNU General Public License
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 **/
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
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	33 #include "PrecompiledHeadersServer.h"
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	34 #include "OrthancInitialization.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
476 4aae0261515e move HttpClient Sebastien Jodogne <s.jodogne@gmail.com> parents: 457 diff changeset	36 #include "../Core/HttpClient.h"
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1429 diff changeset	37 #include "../Core/Logging.h"
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	38 #include "../Core/OrthancException.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39 #include "../Core/Toolbox.h"
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1429 diff changeset	40 #include "../Core/FileStorage/FilesystemStorage.h"
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1429 diff changeset	41
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	42 #include "ServerEnumerations.h"
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1429 diff changeset	43 #include "DatabaseWrapper.h"
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1610 diff changeset	44 #include "FromDcmtkBridge.h"
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	45 #include "ToDcmtkBridge.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47 #include <boost/lexical_cast.hpp>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48 #include <boost/filesystem.hpp>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 #include <curl/curl.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 #include <boost/thread.hpp>
1274 b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	51
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	52
1526 096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	53 #if ORTHANC_SSL_ENABLED == 1
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	54 // For OpenSSL initialization and finalization
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	55 #include <openssl/conf.h>
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	56 #include <openssl/engine.h>
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	57 #include <openssl/err.h>
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	58 #include <openssl/evp.h>
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	59 #include <openssl/ssl.h>
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	60 #endif
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	61
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	62
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	63 #if ORTHANC_JPEG_ENABLED == 1
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	64 #include <dcmtk/dcmjpeg/djdecode.h>
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	65 #endif
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	66
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	67
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	68 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	69 #include <dcmtk/dcmjpls/djdecode.h>
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	70 #endif
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	71
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	72
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	73 #include <dcmtk/dcmnet/dul.h>
b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	74
b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	75
b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	76
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	77 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	78 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	79 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	80 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	81 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	82 static std::string configurationAbsolutePath_;
1610 2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	83 static FontRegistry fontRegistry_;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	84
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	85
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	86 static std::string GetGlobalStringParameterInternal(const std::string& parameter,
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	87 const std::string& defaultValue)
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 if (configuration_.isMember(parameter))
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	90 {
1592 d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	91 if (configuration_[parameter].type() != Json::stringValue)
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	92 {
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	93 LOG(ERROR) << "The configuration option \"" << parameter << "\" must be a string";
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	94 throw OrthancException(ErrorCode_BadParameterType);
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	95 }
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	96 else
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	97 {
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	98 return configuration_[parameter].asString();
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	99 }
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	100 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	101 else
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	102 {
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	103 return defaultValue;
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	104 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	105 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	106
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	107
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	108 static bool GetGlobalBoolParameterInternal(const std::string& parameter,
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	109 bool defaultValue)
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 if (configuration_.isMember(parameter))
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	112 {
1592 d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	113 if (configuration_[parameter].type() != Json::booleanValue)
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	114 {
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	115 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	116 throw OrthancException(ErrorCode_BadParameterType);
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	117 }
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	118 else
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	119 {
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	120 return configuration_[parameter].asBool();
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	121 }
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	122 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	123 else
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	124 {
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	125 return defaultValue;
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	126 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	127 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	128
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	129
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	130
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	131 static void AddFileToConfiguration(const boost::filesystem::path& 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	132 {
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	133 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	134
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	135 Json::Value config;
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 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	138 std::string content;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	139 Toolbox::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	140
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	141 Json::Value tmp;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	142 Json::Reader reader;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	143 if (!reader.parse(content, tmp) \|\|
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	144 tmp.type() != Json::objectValue)
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	145 {
1596 f2e3d030ea59 BadJson error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	146 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	147 throw OrthancException(ErrorCode_BadJson);
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	148 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	149
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	150 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	151 }
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
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 if (configuration_.size() == 0)
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 {
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	155 configuration_ = 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	156 }
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 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	158 {
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	159 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	160 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	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 if (configuration_.isMember(members[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	163 {
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	164 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	165 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	166 }
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 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	168 {
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	169 configuration_[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	170 }
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 }
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 }
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 }
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
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 static void ScanFolderForConfiguration(const char* 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	177 {
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 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	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 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	181
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	182 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	183 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	184 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	185 ++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	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 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	188 {
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	189 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	190 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	191
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	192 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	193 {
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	194 AddFileToConfiguration(it->path().string());
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	195 }
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 }
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 }
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	199
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
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	201 static void ReadGlobalConfiguration(const char* configurationFile)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	202 {
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	203 // Prepare the default configuration
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	204 defaultDirectory_ = boost::filesystem::current_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	205 configuration_ = Json::objectValue;
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 configurationAbsolutePath_ = "";
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	207
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	208 if (configurationFile)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	209 {
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	210 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	211 {
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	212 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	213 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	214 }
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	215
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	216 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	217 {
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	218 defaultDirectory_ = boost::filesystem::path(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	219 configurationAbsolutePath_ = boost::filesystem::absolute(configurationFile).parent_path().string();
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	220 ScanFolderForConfiguration(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	221 }
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 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	223 {
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 defaultDirectory_ = boost::filesystem::path(configurationFile).parent_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	225 configurationAbsolutePath_ = boost::filesystem::absolute(configurationFile).string();
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	226 AddFileToConfiguration(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	227 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	228 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	230 {
660 f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	231 #if ORTHANC_STANDALONE == 1
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	232 // No default path for the standalone configuration
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	233 LOG(WARNING) << "Using the default Orthanc configuration";
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	234 return;
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	235
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	236 #else
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	237 // In a non-standalone build, we use the
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	238 // "Resources/Configuration.json" from the Orthanc source code
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	239
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	240 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	241 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	242 p /= "Configuration.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	243 configurationAbsolutePath_ = boost::filesystem::absolute(p).string();
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	244
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	245 AddFileToConfiguration(p);
87 8517e2c44283 path to configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	246 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	247 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	251 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	252 {
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	253 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	254
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	255 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	256 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	257 {
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	258 OrthancPeerParameters peer;
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	259 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	260 }
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	261
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	262 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	263 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	264 {
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	265 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	266 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	267 }
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	268 }
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	269
0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	270
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	271 static void RegisterUserMetadata()
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	272 {
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	273 if (configuration_.isMember("UserMetadata"))
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	274 {
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	275 const Json::Value& parameter = configuration_["UserMetadata"];
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	276
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	277 Json::Value::Members members = parameter.getMemberNames();
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	278 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	279 {
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	280 const std::string& name = members[i];
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	281
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	282 if (!parameter[name].isInt())
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	283 {
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	284 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	285 throw OrthancException(ErrorCode_BadParameterType);
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	286 }
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	287
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	288 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	289
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	290 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	291 << metadata << ")";
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	292
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	293 try
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	294 {
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	295 RegisterUserMetadata(metadata, name);
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	296 }
657 5425bb6f1ea5 further cppcheck fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	297 catch (OrthancException&)
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	298 {
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	299 LOG(ERROR) << "Cannot register this user-defined metadata: " << name;
657 5425bb6f1ea5 further cppcheck fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	300 throw;
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	301 }
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	302 }
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	303 }
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	304 }
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	305
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	306
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	307 static void RegisterUserContentType()
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	308 {
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	309 if (configuration_.isMember("UserContentType"))
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	310 {
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	311 const Json::Value& parameter = configuration_["UserContentType"];
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	312
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	313 Json::Value::Members members = parameter.getMemberNames();
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	314 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	315 {
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	316 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	317 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	318
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	319 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	320 int contentType;
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	321
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	322 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	323 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	324 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	325 value[1].isString())
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	326 {
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	327 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	328 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	329 }
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	330 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	331 {
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	332 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	333 }
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	334 else
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	335 {
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	336 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	337 throw OrthancException(ErrorCode_BadParameterType);
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	338 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	339
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	340 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	341 << contentType << ") with MIME type \"" << mime << "\"";
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	342
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	343 try
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	344 {
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1765 diff changeset	345 RegisterUserContentType(contentType, name, mime);
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	346 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	347 catch (OrthancException&)
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	348 {
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	349 throw;
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	350 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	351 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	352 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	353 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	354
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	355
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	356 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	357 {
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	358 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	359 !configuration.isMember("Dictionary") \|\|
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	360 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	361 {
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	362 return;
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	363 }
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	364
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	365 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	366
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	367 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	368 {
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	369 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	370 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	371 content.size() < 2 \|\|
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	372 content.size() > 4 \|\|
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	373 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	374 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	375 (content.size() >= 3 && content[2].type() != Json::intValue) \|\|
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	376 (content.size() >= 4 && content[3].type() != Json::intValue))
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 throw OrthancException(ErrorCode_BadFileFormat);
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	379 }
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	380
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	381 DicomTag tag(FromDcmtkBridge::ParseTag(tags[i]));
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	382 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	383 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	384 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	385 unsigned int maxMultiplicity = (content.size() >= 3) ? content[3].asUInt() : 1;
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 FromDcmtkBridge::RegisterDictionaryTag(tag, vr, name, minMultiplicity, maxMultiplicity);
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 }
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	390
57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	391
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1610 diff changeset	392
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	393 void OrthancInitialize(const char* configurationFile)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	394 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	395 boost::recursive_mutex::scoped_lock lock(globalMutex_);
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	396
1526 096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	397 #if ORTHANC_SSL_ENABLED == 1
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	398 // https://wiki.openssl.org/index.php/Library_Initialization
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	399 SSL_library_init();
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	400 SSL_load_error_strings();
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	401 OpenSSL_add_all_algorithms();
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	402 ERR_load_crypto_strings();
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	403
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	404 curl_global_init(CURL_GLOBAL_ALL);
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	405 #else
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	406 curl_global_init(CURL_GLOBAL_ALL & ~CURL_GLOBAL_SSL);
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	407 #endif
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	408
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	409 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	410
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	411 // Read the user-provided configuration
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	412 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	413 ValidateGlobalConfiguration();
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	414
1987 ce90d109bb64 new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 1928 diff changeset	415 HttpClient::GlobalInitialize();
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	416
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	417 RegisterUserMetadata();
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	418 RegisterUserContentType();
685 b01cc78caba4 possibility to disable the DICOM/HTTP servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 660 diff changeset	419
1656 d3ba98d6b6e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1610 diff changeset	420 FromDcmtkBridge::InitializeDictionary();
1765 57b9e6890482 New configuration option: "Dictionary" to declare custom DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1656 diff changeset	421 LoadCustomDictionary(configuration_);
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	422
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	423 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	424 LOG(WARNING) << "Registering JPEG Lossless codecs";
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	425 DJLSDecoderRegistration::registerCodecs();
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	426 #endif
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	427
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	428 #if ORTHANC_JPEG_ENABLED == 1
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	429 LOG(WARNING) << "Registering JPEG codecs";
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	430 DJDecoderRegistration::registerCodecs();
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	431 #endif
1610 2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	432
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	433 fontRegistry_.AddFromResource(EmbeddedResources::FONT_UBUNTU_MONO_BOLD_16);
1927 b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	434
b60f27664b8f simplification in FromDcmtkBridge Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	435 /* 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	436 dcmDisableGethostbyaddr.set(OFTrue);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	437 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	438
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	439
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	440
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	441 void OrthancFinalize()
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	442 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	443 boost::recursive_mutex::scoped_lock lock(globalMutex_);
457 997282a61ff8 cleaner names Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	444 HttpClient::GlobalFinalize();
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	445
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	446 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	447 // Unregister JPEG-LS codecs
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	448 DJLSDecoderRegistration::cleanup();
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	449 #endif
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	450
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	451 #if ORTHANC_JPEG_ENABLED == 1
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	452 // Unregister JPEG codecs
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	453 DJDecoderRegistration::cleanup();
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	454 #endif
1526 096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	455
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	456 curl_global_cleanup();
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	457
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	458 #if ORTHANC_SSL_ENABLED == 1
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	459 // Finalize OpenSSL
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	460 // https://wiki.openssl.org/index.php/Library_Initialization#Cleanup
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	461 FIPS_mode_set(0);
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	462 ENGINE_cleanup();
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	463 CONF_modules_unload(1);
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	464 EVP_cleanup();
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	465 CRYPTO_cleanup_all_ex_data();
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	466 ERR_remove_state(0);
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	467 ERR_free_strings();
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	468 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	469 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	470
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	471
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	472 std::string Configuration::GetGlobalStringParameter(const std::string& parameter,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	473 const std::string& defaultValue)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	474 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	475 boost::recursive_mutex::scoped_lock lock(globalMutex_);
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	476 return GetGlobalStringParameterInternal(parameter, defaultValue);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	477 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	478
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	479
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	480 int Configuration::GetGlobalIntegerParameter(const std::string& parameter,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	481 int defaultValue)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	482 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	483 boost::recursive_mutex::scoped_lock lock(globalMutex_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	484
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	485 if (configuration_.isMember(parameter))
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	486 {
1592 d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	487 if (configuration_[parameter].type() != Json::intValue)
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	488 {
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	489 LOG(ERROR) << "The configuration option \"" << parameter << "\" must be an integer";
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	490 throw OrthancException(ErrorCode_BadParameterType);
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	491 }
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	492 else
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	493 {
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	494 return configuration_[parameter].asInt();
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	495 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	496 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	497 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	498 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	499 return defaultValue;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	500 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	501 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	502
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	503
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	504 bool Configuration::GetGlobalBoolParameter(const std::string& parameter,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	505 bool defaultValue)
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	506 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	507 boost::recursive_mutex::scoped_lock lock(globalMutex_);
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	508 return GetGlobalBoolParameterInternal(parameter, defaultValue);
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	509 }
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	510
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	511
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	512 void Configuration::GetDicomModalityUsingSymbolicName(RemoteModalityParameters& modality,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	513 const std::string& name)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	514 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	515 boost::recursive_mutex::scoped_lock lock(globalMutex_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	516
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	517 if (!configuration_.isMember("DicomModalities"))
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	518 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	519 LOG(ERROR) << "No modality with symbolic name: " << name;
52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	520 throw OrthancException(ErrorCode_InexistentItem);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	521 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	522
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	523 const Json::Value& modalities = configuration_["DicomModalities"];
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	524 if (modalities.type() != Json::objectValue \|\|
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	525 !modalities.isMember(name))
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	526 {
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	527 LOG(ERROR) << "No modality with symbolic name: " << name;
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	528 throw OrthancException(ErrorCode_InexistentItem);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	529 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	530
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	531 try
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	532 {
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	533 modality.FromJson(modalities[name]);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	534 }
1545 33d34bc4ac15 fix msvc warnings jodogne parents: 1534 diff changeset	535 catch (OrthancException&)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	536 {
1429 7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	537 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	538 << "\". Please check your configuration file.";
942 b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 847 diff changeset	539 throw;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	540 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	541 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	542
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	543
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	544
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	545 void Configuration::GetOrthancPeer(OrthancPeerParameters& peer,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	546 const std::string& name)
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	547 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	548 boost::recursive_mutex::scoped_lock lock(globalMutex_);
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	549
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	550 if (!configuration_.isMember("OrthancPeers"))
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	551 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	552 LOG(ERROR) << "No peer with symbolic name: " << name;
52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	553 throw OrthancException(ErrorCode_InexistentItem);
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	554 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	555
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	556 try
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	557 {
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	558 const Json::Value& modalities = configuration_["OrthancPeers"];
752 45715eadc2e0 port number as a string Sebastien Jodogne <s.jodogne@gmail.com> parents: 725 diff changeset	559 if (modalities.type() != Json::objectValue \|\|
45715eadc2e0 port number as a string Sebastien Jodogne <s.jodogne@gmail.com> parents: 725 diff changeset	560 !modalities.isMember(name))
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	561 {
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	562 LOG(ERROR) << "No peer with symbolic name: " << name;
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	563 throw OrthancException(ErrorCode_InexistentItem);
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	564 }
752 45715eadc2e0 port number as a string Sebastien Jodogne <s.jodogne@gmail.com> parents: 725 diff changeset	565
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	566 peer.FromJson(modalities[name]);
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	567 }
1545 33d34bc4ac15 fix msvc warnings jodogne parents: 1534 diff changeset	568 catch (OrthancException&)
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	569 {
752 45715eadc2e0 port number as a string Sebastien Jodogne <s.jodogne@gmail.com> parents: 725 diff changeset	570 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	571 << "\". Please check your configuration file.";
942 b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 847 diff changeset	572 throw;
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	573 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	574 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	575
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	576
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	577 static bool ReadKeys(std::set<std::string>& target,
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	578 const char* parameter,
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	579 bool onlyAlphanumeric)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	580 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	581 boost::recursive_mutex::scoped_lock lock(globalMutex_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	582
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	583 target.clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	584
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	585 if (!configuration_.isMember(parameter))
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	586 {
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	587 return true;
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_[parameter];
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	591 if (modalities.type() != Json::objectValue)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	592 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	593 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	594 throw OrthancException(ErrorCode_BadFileFormat);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	595 }
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 Json::Value::Members members = modalities.getMemberNames();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	598 for (size_t i = 0; i < members.size(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	599 {
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	600 if (onlyAlphanumeric)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	601 {
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	602 for (size_t j = 0; j < members[i].size(); j++)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	603 {
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	604 if (!isalnum(members[i][j]) && members[i][j] != '-')
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	605 {
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	606 return false;
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	607 }
0 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 target.insert(members[i]);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	612 }
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	613
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	614 return true;
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	615 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	616
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	617
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	618 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	619 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	620 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	621
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	622 if (!ReadKeys(target, "DicomModalities", true))
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	623 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	624 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	625 throw OrthancException(ErrorCode_BadFileFormat);
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	626 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	627 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	628
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	629
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	630 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	631 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	632 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	633
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	634 if (!ReadKeys(target, "OrthancPeers", true))
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	635 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	636 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	637 throw OrthancException(ErrorCode_BadFileFormat);
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	638 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	639 }
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	640
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	641
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	642
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	643 void Configuration::SetupRegisteredUsers(MongooseServer& httpServer)
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	644 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	645 boost::recursive_mutex::scoped_lock lock(globalMutex_);
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	646
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	647 httpServer.ClearUsers();
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	648
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	649 if (!configuration_.isMember("RegisteredUsers"))
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	650 {
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	651 return;
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	652 }
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	653
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	654 const Json::Value& users = configuration_["RegisteredUsers"];
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	655 if (users.type() != Json::objectValue)
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	656 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	657 LOG(ERROR) << "Badly formatted list of users";
52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	658 throw OrthancException(ErrorCode_BadFileFormat);
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	659 }
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	660
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	661 Json::Value::Members usernames = users.getMemberNames();
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	662 for (size_t i = 0; i < usernames.size(); i++)
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	663 {
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	664 const std::string& username = usernames[i];
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	665 std::string password = users[username].asString();
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	666 httpServer.RegisterUser(username.c_str(), password.c_str());
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	667 }
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	668 }
394 9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	669
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	670
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	671 std::string Configuration::InterpretRelativePath(const std::string& baseDirectory,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	672 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	673 {
429 09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	674 boost::filesystem::path base(baseDirectory);
09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	675 boost::filesystem::path relative(relativePath);
09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	676
428 6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	677 /**
6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	678 The following lines should be equivalent to this one:
6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	679
429 09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	680 return (base / relative).string();
428 6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	681
6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	682 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	683 make the proper path resolution when "baseDirectory" is an
428 6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	684 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	685 **/
428 6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	686
429 09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	687 if (relative.is_absolute())
427 9d2e1009076a fix for fedora 18 Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	688 {
429 09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	689 return relative.string();
427 9d2e1009076a fix for fedora 18 Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	690 }
9d2e1009076a fix for fedora 18 Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	691 else
9d2e1009076a fix for fedora 18 Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	692 {
429 09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	693 return (base / relative).string();
427 9d2e1009076a fix for fedora 18 Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	694 }
394 9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	695 }
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	696
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	697 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	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 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	700 return InterpretRelativePath(defaultDirectory_.string(), parameter);
09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	701 }
09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	702
394 9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	703
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	704 void Configuration::GetGlobalListOfStringsParameter(std::list<std::string>& target,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	705 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	706 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	707 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	708
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	709 target.clear();
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	710
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	711 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	712 {
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	713 return;
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	714 }
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 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 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	717
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	718 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	719 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	720 LOG(ERROR) << "Badly formatted list of strings";
52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	721 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	722 }
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	723
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	724 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	725 {
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	726 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	727 }
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	728 }
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	729
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	730
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	731 bool Configuration::IsSameAETitle(const std::string& aet1,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	732 const std::string& aet2)
690 2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	733 {
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	734 if (GetGlobalBoolParameter("StrictAetComparison", false))
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	735 {
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	736 // Case-sensitive matching
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	737 return aet1 == aet2;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	738 }
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	739 else
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	740 {
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	741 // Case-insensitive matching (default)
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	742 std::string tmp1, tmp2;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	743 Toolbox::ToLowerCase(tmp1, aet1);
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	744 Toolbox::ToLowerCase(tmp2, aet2);
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	745 return tmp1 == tmp2;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	746 }
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	747 }
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	748
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	749
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	750 bool Configuration::LookupDicomModalityUsingAETitle(RemoteModalityParameters& modality,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	751 const std::string& aet)
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	752 {
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	753 std::set<std::string> modalities;
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	754 GetListOfDicomModalities(modalities);
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	755
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	756 for (std::set<std::string>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 617 diff changeset	757 it = modalities.begin(); it != modalities.end(); ++it)
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	758 {
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	759 try
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	760 {
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	761 GetDicomModalityUsingSymbolicName(modality, *it);
725 ef4569ae7952 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 696 diff changeset	762
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	763 if (IsSameAETitle(aet, modality.GetApplicationEntityTitle()))
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	764 {
617 a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	765 return true;
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	766 }
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	767 }
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	768 catch (OrthancException&)
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	769 {
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	770 }
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	771 }
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	772
617 a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	773 return false;
a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	774 }
a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	775
a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	776
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	777 bool Configuration::IsKnownAETitle(const std::string& aet)
617 a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	778 {
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	779 RemoteModalityParameters modality;
557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	780 return LookupDicomModalityUsingAETitle(modality, aet);
617 a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	781 }
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	782
31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	783
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	784 RemoteModalityParameters Configuration::GetModalityUsingSymbolicName(const std::string& name)
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	785 {
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	786 RemoteModalityParameters modality;
557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	787 GetDicomModalityUsingSymbolicName(modality, name);
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	788
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	789 return modality;
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	790 }
31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	791
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 772 diff changeset	792
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	793 RemoteModalityParameters Configuration::GetModalityUsingAet(const std::string& aet)
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	794 {
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	795 RemoteModalityParameters modality;
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	796
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	797 if (LookupDicomModalityUsingAETitle(modality, aet))
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	798 {
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	799 return modality;
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	800 }
31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	801 else
31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	802 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	803 LOG(ERROR) << "Unknown modality for AET: " << aet;
52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	804 throw OrthancException(ErrorCode_InexistentItem);
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	805 }
31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	806 }
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	807
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	808
812 8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	809 void Configuration::UpdateModality(const std::string& symbolicName,
8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	810 const RemoteModalityParameters& modality)
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	811 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	812 boost::recursive_mutex::scoped_lock lock(globalMutex_);
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	813
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	814 if (!configuration_.isMember("DicomModalities"))
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1326 diff changeset	815 {
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	816 configuration_["DicomModalities"] = Json::objectValue;
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1326 diff changeset	817 }
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1326 diff changeset	818
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	819 Json::Value& modalities = configuration_["DicomModalities"];
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	820 if (modalities.type() != Json::objectValue)
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	821 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	822 LOG(ERROR) << "Bad file format for modality: " << symbolicName;
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	823 throw OrthancException(ErrorCode_BadFileFormat);
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	824 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	825
812 8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	826 modalities.removeMember(symbolicName);
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	827
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	828 Json::Value v;
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	829 modality.ToJson(v);
812 8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	830 modalities[symbolicName] = v;
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	831 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	832
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	833
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	834 void Configuration::RemoveModality(const std::string& symbolicName)
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	835 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	836 boost::recursive_mutex::scoped_lock lock(globalMutex_);
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	837
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	838 if (!configuration_.isMember("DicomModalities"))
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	839 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	840 LOG(ERROR) << "No modality with symbolic name: " << symbolicName;
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	841 throw OrthancException(ErrorCode_BadFileFormat);
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	842 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	843
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	844 Json::Value& modalities = configuration_["DicomModalities"];
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	845 if (modalities.type() != Json::objectValue)
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	846 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	847 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	848 throw OrthancException(ErrorCode_BadFileFormat);
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	849 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	850
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	851 modalities.removeMember(symbolicName.c_str());
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	852 }
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	853
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	854
812 8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	855 void Configuration::UpdatePeer(const std::string& symbolicName,
8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	856 const OrthancPeerParameters& peer)
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	857 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	858 boost::recursive_mutex::scoped_lock lock(globalMutex_);
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	859
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	860 if (!configuration_.isMember("OrthancPeers"))
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1326 diff changeset	861 {
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	862 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	863 configuration_["OrthancPeers"] = Json::objectValue;
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1326 diff changeset	864 }
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1326 diff changeset	865
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	866 Json::Value& peers = configuration_["OrthancPeers"];
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	867 if (peers.type() != Json::objectValue)
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	868 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	869 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	870 throw OrthancException(ErrorCode_BadFileFormat);
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	871 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	872
812 8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	873 peers.removeMember(symbolicName);
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	874
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	875 Json::Value v;
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	876 peer.ToJson(v);
812 8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	877 peers[symbolicName] = v;
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	878 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	879
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	880
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	881 void Configuration::RemovePeer(const std::string& symbolicName)
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	882 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	883 boost::recursive_mutex::scoped_lock lock(globalMutex_);
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	884
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	885 if (!configuration_.isMember("OrthancPeers"))
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	886 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	887 LOG(ERROR) << "No peer with symbolic name: " << symbolicName;
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	888 throw OrthancException(ErrorCode_BadFileFormat);
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	889 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	890
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	891 Json::Value& peers = configuration_["OrthancPeers"];
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	892 if (peers.type() != Json::objectValue)
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	893 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	894 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	895 throw OrthancException(ErrorCode_BadFileFormat);
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	896 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	897
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	898 peers.removeMember(symbolicName.c_str());
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	899 }
1145 0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	900
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	901
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	902
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	903 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	904 {
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	905 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	906 }
1274 b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	907
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	908
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	909 static IDatabaseWrapper* CreateSQLiteWrapper()
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	910 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	911 std::string storageDirectoryStr = Configuration::GetGlobalStringParameter("StorageDirectory", "OrthancStorage");
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	912
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	913 // Open the database
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	914 boost::filesystem::path indexDirectory = Configuration::InterpretStringParameterAsPath(
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	915 Configuration::GetGlobalStringParameter("IndexDirectory", storageDirectoryStr));
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	916
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	917 LOG(WARNING) << "SQLite index directory: " << indexDirectory;
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	918
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	919 try
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	920 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	921 boost::filesystem::create_directories(indexDirectory);
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	922 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	923 catch (boost::filesystem::filesystem_error)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	924 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	925 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	926
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	927 return new DatabaseWrapper(indexDirectory.string() + "/index");
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	928 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	929
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	930
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	931 namespace
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	932 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	933 // Anonymous namespace to avoid clashes between compilation modules
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	934
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	935 class FilesystemStorageWithoutDicom : public IStorageArea
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	936 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	937 private:
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	938 FilesystemStorage storage_;
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	939
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	940 public:
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	941 FilesystemStorageWithoutDicom(const std::string& path) : storage_(path)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	942 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	943 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	944
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	945 virtual void Create(const std::string& uuid,
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	946 const void* content,
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	947 size_t size,
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	948 FileContentType type)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	949 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	950 if (type != FileContentType_Dicom)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	951 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	952 storage_.Create(uuid, content, size, type);
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	953 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	954 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	955
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	956 virtual void Read(std::string& content,
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	957 const std::string& uuid,
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	958 FileContentType type)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	959 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	960 if (type != FileContentType_Dicom)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	961 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	962 storage_.Read(content, uuid, type);
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	963 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	964 else
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	965 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	966 throw OrthancException(ErrorCode_UnknownResource);
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	967 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	968 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	969
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	970 virtual void Remove(const std::string& uuid,
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	971 FileContentType type)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	972 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	973 if (type != FileContentType_Dicom)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	974 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	975 storage_.Remove(uuid, type);
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	976 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	977 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	978 };
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	979 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	980
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	981
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	982 static IStorageArea* CreateFilesystemStorage()
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	983 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	984 std::string storageDirectoryStr = Configuration::GetGlobalStringParameter("StorageDirectory", "OrthancStorage");
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	985
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	986 boost::filesystem::path storageDirectory = Configuration::InterpretStringParameterAsPath(storageDirectoryStr);
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	987 LOG(WARNING) << "Storage directory: " << storageDirectory;
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	988
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	989 if (Configuration::GetGlobalBoolParameter("StoreDicom", true))
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	990 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	991 return new FilesystemStorage(storageDirectory.string());
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	992 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	993 else
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 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	996 return new FilesystemStorageWithoutDicom(storageDirectory.string());
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 }
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
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1001 IDatabaseWrapper* Configuration::CreateDatabaseWrapper()
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1002 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1003 return CreateSQLiteWrapper();
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1004 }
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
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1007 IStorageArea* Configuration::CreateStorageArea()
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1008 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1009 return CreateFilesystemStorage();
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	1010 }
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	1011
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	1012
1587 d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	1013 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	1014 {
1892 0001f8cd7849 Warn about badly formatted modality/peer definitions in configuration file at startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	1015 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	1016 result = configuration_;
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	1017 }
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	1018
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	1019
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	1020 void Configuration::FormatConfiguration(std::string& result)
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	1021 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	1022 Json::Value config;
1587 d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	1023 GetConfiguration(config);
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	1024
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	1025 Json::StyledWriter w;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	1026 result = w.write(config);
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	1027 }
1610 2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	1028
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	1029
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	1030 const FontRegistry& Configuration::GetFontRegistry()
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	1031 {
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	1032 return fontRegistry_;
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	1033 }
1928 84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	1034
84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	1035
84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	1036 Encoding Configuration::GetDefaultEncoding()
84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	1037 {
84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	1038 std::string s = GetGlobalStringParameter("DefaultEncoding", "Latin1");
84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	1039
84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	1040 // By default, Latin1 encoding is assumed
84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	1041 return s.empty() ? Encoding_Latin1 : StringToEncoding(s.c_str());
84c7eaeb5244 Configuration::GetDefaultEncoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1927 diff changeset	1042 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1043 }

Mercurial > hg > orthanc

annotate OrthancServer/OrthancInitialization.cpp @ 2006:6301bbcbcaed