orthanc: OrthancServer/OrthancInitialization.cpp annotate

annotate OrthancServer/OrthancInitialization.cpp @ 1641:4e56b5a206b7

Support of binary tags encoded using data URI scheme

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 23 Sep 2015 12:43:05 +0200
parents	2dff2bdffdb8
children	d3ba98d6b6e9

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
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1275 diff changeset	3 * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics
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
685 b01cc78caba4 possibility to disable the DICOM/HTTP servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 660 diff changeset	42 #include "DicomProtocol/DicomServer.h"
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	43 #include "ServerEnumerations.h"
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1429 diff changeset	44 #include "DatabaseWrapper.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46 #include <boost/lexical_cast.hpp>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47 #include <boost/filesystem.hpp>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48 #include <curl/curl.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 #include <boost/thread.hpp>
1274 b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	50
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	51
1526 096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	52 #if ORTHANC_SSL_ENABLED == 1
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	53 // For OpenSSL initialization and finalization
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	54 #include <openssl/conf.h>
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	55 #include <openssl/engine.h>
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	56 #include <openssl/err.h>
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	57 #include <openssl/evp.h>
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	58 #include <openssl/ssl.h>
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	59 #endif
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	60
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	61
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	62 #if ORTHANC_JPEG_ENABLED == 1
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	63 #include <dcmtk/dcmjpeg/djdecode.h>
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	64 #endif
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	65
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 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	68 #include <dcmtk/dcmjpls/djdecode.h>
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	69 #endif
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	70
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	71
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	72 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74 static boost::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	75 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	76 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	77 static std::string configurationAbsolutePath_;
1610 2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	78 static FontRegistry fontRegistry_;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	79
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	80
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	81 static std::string GetGlobalStringParameterInternal(const std::string& parameter,
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	82 const std::string& defaultValue)
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	83 {
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	84 if (configuration_.isMember(parameter))
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	85 {
1592 d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	86 if (configuration_[parameter].type() != Json::stringValue)
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	87 {
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	88 LOG(ERROR) << "The configuration option \"" << parameter << "\" must be a string";
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	89 throw OrthancException(ErrorCode_BadParameterType);
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	90 }
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	91 else
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 return configuration_[parameter].asString();
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	94 }
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	95 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	96 else
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	97 {
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	98 return defaultValue;
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	99 }
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
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 static bool GetGlobalBoolParameterInternal(const std::string& parameter,
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	104 bool defaultValue)
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 if (configuration_.isMember(parameter))
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	107 {
1592 d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	108 if (configuration_[parameter].type() != Json::booleanValue)
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	109 {
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	110 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	111 throw OrthancException(ErrorCode_BadParameterType);
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	112 }
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	113 else
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 return configuration_[parameter].asBool();
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	116 }
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	117 }
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	118 else
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	119 {
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	120 return defaultValue;
0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	121 }
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
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
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	126 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	127 {
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	128 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	129
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	130 Json::Value config;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	131
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	132 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	133 std::string content;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	134 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	135
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	136 Json::Value tmp;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	137 Json::Reader reader;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	138 if (!reader.parse(content, tmp) \|\|
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	139 tmp.type() != Json::objectValue)
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	140 {
1596 f2e3d030ea59 BadJson error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	141 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	142 throw OrthancException(ErrorCode_BadJson);
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	143 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	144
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	145 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	146 }
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	147
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	148 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	149 {
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	150 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	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 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	153 {
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	154 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	155 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	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 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	158 {
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	159 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	160 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	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 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	163 {
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	164 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	165 }
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	166 }
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	167 }
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	168 }
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	169
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	170
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 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	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 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	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 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	176
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	177 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	178 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	179 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	180 ++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	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 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	183 {
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	184 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	185 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	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 (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	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 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	190 }
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 }
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
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
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	196 static void ReadGlobalConfiguration(const char* configurationFile)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	197 {
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	198 // 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	199 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	200 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	201 configurationAbsolutePath_ = "";
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	202
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	203 if (configurationFile)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	204 {
1423 7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	205 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	206 {
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	207 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	208 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	209 }
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
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 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	212 {
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	213 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	214 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	215 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	216 }
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 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	218 {
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 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	220 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	221 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	222 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	223 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	224 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	225 {
660 f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	226 #if ORTHANC_STANDALONE == 1
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	227 // No default path for the standalone configuration
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	228 LOG(WARNING) << "Using the default Orthanc configuration";
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	229 return;
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	230
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	231 #else
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	232 // In a non-standalone build, we use the
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	233 // "Resources/Configuration.json" from the Orthanc source code
f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	234
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	235 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	236 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	237 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	238 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	239
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 AddFileToConfiguration(p);
87 8517e2c44283 path to configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	241 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	242 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	243 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	246 static void RegisterUserMetadata()
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	247 {
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	248 if (configuration_.isMember("UserMetadata"))
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	249 {
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	250 const Json::Value& parameter = configuration_["UserMetadata"];
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	251
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	252 Json::Value::Members members = parameter.getMemberNames();
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	253 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	254 {
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	255 std::string info = "\"" + members[i] + "\" = " + parameter[members[i]].toStyledString();
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	256 LOG(INFO) << "Registering user-defined metadata: " << info;
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	257
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	258 if (!parameter[members[i]].asBool())
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	259 {
439 081a44d5110b notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 435 diff changeset	260 LOG(ERROR) << "Not a number in this user-defined metadata: " << info;
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	261 throw OrthancException(ErrorCode_BadParameterType);
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	262 }
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	263
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	264 int metadata = parameter[members[i]].asInt();
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	265
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	266 try
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	267 {
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	268 RegisterUserMetadata(metadata, members[i]);
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	269 }
657 5425bb6f1ea5 further cppcheck fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	270 catch (OrthancException&)
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	271 {
439 081a44d5110b notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 435 diff changeset	272 LOG(ERROR) << "Cannot register this user-defined metadata: " << info;
657 5425bb6f1ea5 further cppcheck fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	273 throw;
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	274 }
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	275 }
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 }
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	278
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	279
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	280 static void RegisterUserContentType()
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	281 {
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	282 if (configuration_.isMember("UserContentType"))
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	283 {
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	284 const Json::Value& parameter = configuration_["UserContentType"];
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	285
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	286 Json::Value::Members members = parameter.getMemberNames();
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	287 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	288 {
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	289 std::string info = "\"" + members[i] + "\" = " + parameter[members[i]].toStyledString();
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	290 LOG(INFO) << "Registering user-defined attachment type: " << info;
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	291
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	292 if (!parameter[members[i]].asBool())
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	293 {
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	294 LOG(ERROR) << "Not a number in this user-defined attachment type: " << info;
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	295 throw OrthancException(ErrorCode_BadParameterType);
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	296 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	297
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	298 int contentType = parameter[members[i]].asInt();
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	299
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	300 try
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	301 {
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	302 RegisterUserContentType(contentType, members[i]);
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	303 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	304 catch (OrthancException&)
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	305 {
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	306 LOG(ERROR) << "Cannot register this user-defined attachment type: " << info;
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	307 throw;
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	308 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	309 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	310 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	311 }
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
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	314 void OrthancInitialize(const char* configurationFile)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	315 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	316 boost::mutex::scoped_lock lock(globalMutex_);
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	317
1526 096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	318 #if ORTHANC_SSL_ENABLED == 1
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	319 // 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	320 SSL_library_init();
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	321 SSL_load_error_strings();
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	322 OpenSSL_add_all_algorithms();
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	323 ERR_load_crypto_strings();
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	324
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	325 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	326 #else
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	327 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	328 #endif
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	329
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	330 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	331
7b7d597a190c The configuration can be splitted into several files stored inside the same folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1422 diff changeset	332 // Read the user-provided configuration
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	333 ReadGlobalConfiguration(configurationFile);
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	334
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	335 HttpClient::GlobalInitialize(GetGlobalBoolParameterInternal("HttpsVerifyPeers", true),
1534 95b3b0260240 Options to validate peers against CA certificates in HTTPS requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1533 diff changeset	336 GetGlobalStringParameterInternal("HttpsCACertificates", ""));
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	337
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	338 RegisterUserMetadata();
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	339 RegisterUserContentType();
685 b01cc78caba4 possibility to disable the DICOM/HTTP servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 660 diff changeset	340
b01cc78caba4 possibility to disable the DICOM/HTTP servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 660 diff changeset	341 DicomServer::InitializeDictionary();
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	342
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	343 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	344 LOG(WARNING) << "Registering JPEG Lossless codecs";
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	345 DJLSDecoderRegistration::registerCodecs();
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	346 #endif
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	347
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	348 #if ORTHANC_JPEG_ENABLED == 1
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	349 LOG(WARNING) << "Registering JPEG codecs";
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	350 DJDecoderRegistration::registerCodecs();
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	351 #endif
1610 2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	352
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	353 fontRegistry_.AddFromResource(EmbeddedResources::FONT_UBUNTU_MONO_BOLD_16);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	356
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	358 void OrthancFinalize()
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360 boost::mutex::scoped_lock lock(globalMutex_);
457 997282a61ff8 cleaner names Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	361 HttpClient::GlobalFinalize();
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	362
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	363 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	364 // Unregister JPEG-LS codecs
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	365 DJLSDecoderRegistration::cleanup();
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	366 #endif
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	367
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	368 #if ORTHANC_JPEG_ENABLED == 1
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	369 // Unregister JPEG codecs
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	370 DJDecoderRegistration::cleanup();
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	371 #endif
1526 096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	372
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	373 curl_global_cleanup();
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	374
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	375 #if ORTHANC_SSL_ENABLED == 1
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	376 // Finalize OpenSSL
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	377 // 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	378 FIPS_mode_set(0);
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	379 ENGINE_cleanup();
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	380 CONF_modules_unload(1);
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	381 EVP_cleanup();
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	382 CRYPTO_cleanup_all_ex_data();
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	383 ERR_remove_state(0);
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	384 ERR_free_strings();
096a8af528c9 fix streams, initialization/finalization of libcurl and openssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 1485 diff changeset	385 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	386 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	387
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	388
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	389 std::string Configuration::GetGlobalStringParameter(const std::string& parameter,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	390 const std::string& defaultValue)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	391 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	392 boost::mutex::scoped_lock lock(globalMutex_);
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	393 return GetGlobalStringParameterInternal(parameter, defaultValue);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	394 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	395
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	396
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	397 int Configuration::GetGlobalIntegerParameter(const std::string& parameter,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	398 int defaultValue)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	399 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	400 boost::mutex::scoped_lock lock(globalMutex_);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	401
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	402 if (configuration_.isMember(parameter))
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	403 {
1592 d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	404 if (configuration_[parameter].type() != Json::intValue)
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	405 {
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	406 LOG(ERROR) << "The configuration option \"" << parameter << "\" must be an integer";
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	407 throw OrthancException(ErrorCode_BadParameterType);
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	408 }
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	409 else
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	410 {
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	411 return configuration_[parameter].asInt();
d73124f6b439 configuration option HttpDescribeErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	412 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	413 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	414 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	415 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	416 return defaultValue;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	417 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	418 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	419
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	420
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	421 bool Configuration::GetGlobalBoolParameter(const std::string& parameter,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	422 bool defaultValue)
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	423 {
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	424 boost::mutex::scoped_lock lock(globalMutex_);
1533 0011cc99443c improving HTTPS support Sebastien Jodogne <s.jodogne@gmail.com> parents: 1526 diff changeset	425 return GetGlobalBoolParameterInternal(parameter, defaultValue);
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	426 }
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	427
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	428
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	429 void Configuration::GetDicomModalityUsingSymbolicName(RemoteModalityParameters& modality,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	430 const std::string& name)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	431 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	432 boost::mutex::scoped_lock lock(globalMutex_);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	433
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	434 if (!configuration_.isMember("DicomModalities"))
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	435 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	436 LOG(ERROR) << "No modality with symbolic name: " << name;
52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	437 throw OrthancException(ErrorCode_InexistentItem);
0 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
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	440 const Json::Value& modalities = configuration_["DicomModalities"];
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	441 if (modalities.type() != Json::objectValue \|\|
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	442 !modalities.isMember(name))
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	443 {
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	444 LOG(ERROR) << "No modality with symbolic name: " << name;
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	445 throw OrthancException(ErrorCode_InexistentItem);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	446 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	447
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	448 try
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	449 {
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	450 modality.FromJson(modalities[name]);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	451 }
1545 33d34bc4ac15 fix msvc warnings jodogne parents: 1534 diff changeset	452 catch (OrthancException&)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	453 {
1429 7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	454 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	455 << "\". Please check your configuration file.";
942 b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 847 diff changeset	456 throw;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	457 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	458 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	459
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	460
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	461
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	462 void Configuration::GetOrthancPeer(OrthancPeerParameters& peer,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	463 const std::string& name)
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	464 {
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	465 boost::mutex::scoped_lock lock(globalMutex_);
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	466
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	467 if (!configuration_.isMember("OrthancPeers"))
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	468 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	469 LOG(ERROR) << "No peer with symbolic name: " << name;
52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	470 throw OrthancException(ErrorCode_InexistentItem);
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	471 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	472
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	473 try
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	474 {
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	475 const Json::Value& modalities = configuration_["OrthancPeers"];
752 45715eadc2e0 port number as a string Sebastien Jodogne <s.jodogne@gmail.com> parents: 725 diff changeset	476 if (modalities.type() != Json::objectValue \|\|
45715eadc2e0 port number as a string Sebastien Jodogne <s.jodogne@gmail.com> parents: 725 diff changeset	477 !modalities.isMember(name))
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	478 {
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	479 LOG(ERROR) << "No peer with symbolic name: " << name;
871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	480 throw OrthancException(ErrorCode_InexistentItem);
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	481 }
752 45715eadc2e0 port number as a string Sebastien Jodogne <s.jodogne@gmail.com> parents: 725 diff changeset	482
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	483 peer.FromJson(modalities[name]);
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	484 }
1545 33d34bc4ac15 fix msvc warnings jodogne parents: 1534 diff changeset	485 catch (OrthancException&)
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	486 {
752 45715eadc2e0 port number as a string Sebastien Jodogne <s.jodogne@gmail.com> parents: 725 diff changeset	487 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	488 << "\". Please check your configuration file.";
942 b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 847 diff changeset	489 throw;
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	490 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	491 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	492
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	493
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	494 static bool ReadKeys(std::set<std::string>& target,
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	495 const char* parameter,
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	496 bool onlyAlphanumeric)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	497 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	498 boost::mutex::scoped_lock lock(globalMutex_);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	499
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	500 target.clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	501
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	502 if (!configuration_.isMember(parameter))
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	503 {
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	504 return true;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	505 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	506
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	507 const Json::Value& modalities = configuration_[parameter];
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	508 if (modalities.type() != Json::objectValue)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	509 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	510 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	511 throw OrthancException(ErrorCode_BadFileFormat);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	512 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	513
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	514 Json::Value::Members members = modalities.getMemberNames();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	515 for (size_t i = 0; i < members.size(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	516 {
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	517 if (onlyAlphanumeric)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	518 {
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	519 for (size_t j = 0; j < members[i].size(); j++)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	520 {
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	521 if (!isalnum(members[i][j]) && members[i][j] != '-')
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	522 {
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	523 return false;
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	524 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	525 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	526 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	527
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	528 target.insert(members[i]);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	529 }
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	530
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	531 return true;
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	532 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	533
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	534
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	535 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	536 {
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	537 if (!ReadKeys(target, "DicomModalities", true))
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	538 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	539 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	540 throw OrthancException(ErrorCode_BadFileFormat);
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	541 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	542 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	543
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	544
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	545 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	546 {
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	547 if (!ReadKeys(target, "OrthancPeers", true))
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	548 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	549 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	550 throw OrthancException(ErrorCode_BadFileFormat);
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 476 diff changeset	551 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	552 }
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	553
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	554
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	555
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	556 void Configuration::SetupRegisteredUsers(MongooseServer& httpServer)
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	557 {
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	558 boost::mutex::scoped_lock lock(globalMutex_);
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	559
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	560 httpServer.ClearUsers();
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	561
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	562 if (!configuration_.isMember("RegisteredUsers"))
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	563 {
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	564 return;
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	565 }
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	566
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	567 const Json::Value& users = configuration_["RegisteredUsers"];
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	568 if (users.type() != Json::objectValue)
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	569 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	570 LOG(ERROR) << "Badly formatted list of users";
52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	571 throw OrthancException(ErrorCode_BadFileFormat);
25 dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	572 }
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	573
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	574 Json::Value::Members usernames = users.getMemberNames();
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	575 for (size_t i = 0; i < usernames.size(); i++)
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	576 {
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	577 const std::string& username = usernames[i];
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	578 std::string password = users[username].asString();
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	579 httpServer.RegisterUser(username.c_str(), password.c_str());
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	580 }
dd1489098265 basic http authentication Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	581 }
394 9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	582
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	583
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	584 std::string Configuration::InterpretRelativePath(const std::string& baseDirectory,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	585 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	586 {
429 09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	587 boost::filesystem::path base(baseDirectory);
09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	588 boost::filesystem::path relative(relativePath);
09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	589
428 6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	590 /**
6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	591 The following lines should be equivalent to this one:
6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	592
429 09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	593 return (base / relative).string();
428 6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	594
6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	595 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	596 make the proper path resolution when "baseDirectory" is an
428 6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	597 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	598 **/
428 6f00823be12a explanations Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	599
429 09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	600 if (relative.is_absolute())
427 9d2e1009076a fix for fedora 18 Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	601 {
429 09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	602 return relative.string();
427 9d2e1009076a fix for fedora 18 Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	603 }
9d2e1009076a fix for fedora 18 Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	604 else
9d2e1009076a fix for fedora 18 Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	605 {
429 09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	606 return (base / relative).string();
427 9d2e1009076a fix for fedora 18 Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	607 }
394 9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	608 }
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	609
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	610 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	611 {
09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	612 boost::mutex::scoped_lock lock(globalMutex_);
09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	613 return InterpretRelativePath(defaultDirectory_.string(), parameter);
09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	614 }
09b3c6265a94 unit test for fedora 18 problem Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	615
394 9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	616
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	617 void Configuration::GetGlobalListOfStringsParameter(std::list<std::string>& target,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	618 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	619 {
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	620 boost::mutex::scoped_lock lock(globalMutex_);
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	621
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	622 target.clear();
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	623
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	624 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	625 {
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	626 return;
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	627 }
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	628
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	629 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	630
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	631 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	632 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	633 LOG(ERROR) << "Badly formatted list of strings";
52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	634 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	635 }
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	636
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	637 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	638 {
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	639 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	640 }
9784f19f7e1b path relative to configuration path, list of lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	641 }
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	642
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	643
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	644 bool Configuration::IsSameAETitle(const std::string& aet1,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	645 const std::string& aet2)
690 2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	646 {
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	647 if (GetGlobalBoolParameter("StrictAetComparison", false))
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	648 {
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	649 // Case-sensitive matching
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	650 return aet1 == aet2;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	651 }
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	652 else
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	653 {
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	654 // Case-insensitive matching (default)
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	655 std::string tmp1, tmp2;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	656 Toolbox::ToLowerCase(tmp1, aet1);
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	657 Toolbox::ToLowerCase(tmp2, aet2);
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	658 return tmp1 == tmp2;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	659 }
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	660 }
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	661
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	662
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	663 bool Configuration::LookupDicomModalityUsingAETitle(RemoteModalityParameters& modality,
401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	664 const std::string& aet)
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	665 {
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	666 std::set<std::string> modalities;
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	667 GetListOfDicomModalities(modalities);
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	668
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	669 for (std::set<std::string>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 617 diff changeset	670 it = modalities.begin(); it != modalities.end(); ++it)
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	671 {
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	672 try
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	673 {
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	674 GetDicomModalityUsingSymbolicName(modality, *it);
725 ef4569ae7952 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 696 diff changeset	675
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	676 if (IsSameAETitle(aet, modality.GetApplicationEntityTitle()))
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	677 {
617 a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	678 return true;
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	679 }
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	680 }
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	681 catch (OrthancException&)
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	682 {
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	683 }
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	684 }
60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	685
617 a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	686 return false;
a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	687 }
a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	688
a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	689
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	690 bool Configuration::IsKnownAETitle(const std::string& aet)
617 a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	691 {
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	692 RemoteModalityParameters modality;
557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	693 return LookupDicomModalityUsingAETitle(modality, aet);
617 a24b0161b171 lookup using aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	694 }
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	695
31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	696
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	697 RemoteModalityParameters Configuration::GetModalityUsingSymbolicName(const std::string& name)
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	698 {
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	699 RemoteModalityParameters modality;
557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	700 GetDicomModalityUsingSymbolicName(modality, name);
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	701
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	702 return modality;
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	703 }
31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	704
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 772 diff changeset	705
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	706 RemoteModalityParameters Configuration::GetModalityUsingAet(const std::string& aet)
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	707 {
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	708 RemoteModalityParameters modality;
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	709
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	710 if (LookupDicomModalityUsingAETitle(modality, aet))
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	711 {
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 773 diff changeset	712 return modality;
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	713 }
31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	714 else
31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	715 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	716 LOG(ERROR) << "Unknown modality for AET: " << aet;
52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	717 throw OrthancException(ErrorCode_InexistentItem);
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	718 }
31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 771 diff changeset	719 }
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	720
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	721
812 8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	722 void Configuration::UpdateModality(const std::string& symbolicName,
8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	723 const RemoteModalityParameters& modality)
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	724 {
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	725 boost::mutex::scoped_lock lock(globalMutex_);
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	726
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	727 if (!configuration_.isMember("DicomModalities"))
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1326 diff changeset	728 {
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	729 configuration_["DicomModalities"] = Json::objectValue;
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1326 diff changeset	730 }
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1326 diff changeset	731
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	732 Json::Value& modalities = configuration_["DicomModalities"];
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	733 if (modalities.type() != Json::objectValue)
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	734 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	735 LOG(ERROR) << "Bad file format for modality: " << symbolicName;
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	736 throw OrthancException(ErrorCode_BadFileFormat);
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	737 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	738
812 8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	739 modalities.removeMember(symbolicName);
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	740
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	741 Json::Value v;
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	742 modality.ToJson(v);
812 8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	743 modalities[symbolicName] = v;
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	744 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	745
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	746
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	747 void Configuration::RemoveModality(const std::string& symbolicName)
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	748 {
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	749 boost::mutex::scoped_lock lock(globalMutex_);
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	750
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	751 if (!configuration_.isMember("DicomModalities"))
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	752 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	753 LOG(ERROR) << "No modality with symbolic name: " << symbolicName;
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	754 throw OrthancException(ErrorCode_BadFileFormat);
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	755 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	756
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	757 Json::Value& modalities = configuration_["DicomModalities"];
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	758 if (modalities.type() != Json::objectValue)
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	759 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	760 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	761 throw OrthancException(ErrorCode_BadFileFormat);
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	762 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	763
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	764 modalities.removeMember(symbolicName.c_str());
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	765 }
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	766
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	767
812 8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	768 void Configuration::UpdatePeer(const std::string& symbolicName,
8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	769 const OrthancPeerParameters& peer)
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	770 {
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	771 boost::mutex::scoped_lock lock(globalMutex_);
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	772
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	773 if (!configuration_.isMember("OrthancPeers"))
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1326 diff changeset	774 {
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	775 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	776 configuration_["OrthancPeers"] = Json::objectValue;
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1326 diff changeset	777 }
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1326 diff changeset	778
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	779 Json::Value& peers = configuration_["OrthancPeers"];
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	780 if (peers.type() != Json::objectValue)
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	781 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	782 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	783 throw OrthancException(ErrorCode_BadFileFormat);
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	784 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	785
812 8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	786 peers.removeMember(symbolicName);
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	787
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	788 Json::Value v;
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	789 peer.ToJson(v);
812 8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	790 peers[symbolicName] = v;
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	791 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	792
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	793
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	794 void Configuration::RemovePeer(const std::string& symbolicName)
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	795 {
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	796 boost::mutex::scoped_lock lock(globalMutex_);
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	797
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	798 if (!configuration_.isMember("OrthancPeers"))
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	799 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	800 LOG(ERROR) << "No peer with symbolic name: " << symbolicName;
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	801 throw OrthancException(ErrorCode_BadFileFormat);
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	802 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	803
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	804 Json::Value& peers = configuration_["OrthancPeers"];
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	805 if (peers.type() != Json::objectValue)
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	806 {
1422 52b2070fc8f1 improvements to the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	807 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	808 throw OrthancException(ErrorCode_BadFileFormat);
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	809 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	810
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	811 peers.removeMember(symbolicName.c_str());
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	812 }
1145 0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	813
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	814
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	815
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	816 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	817 {
0479d02c6778 Plugins can retrieve the path to Orthanc and to its configuration file Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	818 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	819 }
1274 b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	820
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	821
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	822 static IDatabaseWrapper* CreateSQLiteWrapper()
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	823 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	824 std::string storageDirectoryStr = Configuration::GetGlobalStringParameter("StorageDirectory", "OrthancStorage");
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	825
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	826 // Open the database
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	827 boost::filesystem::path indexDirectory = Configuration::InterpretStringParameterAsPath(
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	828 Configuration::GetGlobalStringParameter("IndexDirectory", storageDirectoryStr));
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	829
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	830 LOG(WARNING) << "SQLite index directory: " << indexDirectory;
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	831
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	832 try
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	833 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	834 boost::filesystem::create_directories(indexDirectory);
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	835 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	836 catch (boost::filesystem::filesystem_error)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	837 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	838 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	839
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	840 return new DatabaseWrapper(indexDirectory.string() + "/index");
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	841 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	842
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	843
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	844 namespace
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	845 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	846 // Anonymous namespace to avoid clashes between compilation modules
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	847
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	848 class FilesystemStorageWithoutDicom : public IStorageArea
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	849 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	850 private:
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	851 FilesystemStorage storage_;
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	852
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	853 public:
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	854 FilesystemStorageWithoutDicom(const std::string& path) : storage_(path)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	855 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	856 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	857
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	858 virtual void Create(const std::string& uuid,
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	859 const void* content,
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	860 size_t size,
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	861 FileContentType type)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	862 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	863 if (type != FileContentType_Dicom)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	864 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	865 storage_.Create(uuid, content, size, type);
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	866 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	867 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	868
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	869 virtual void Read(std::string& content,
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	870 const std::string& uuid,
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	871 FileContentType type)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	872 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	873 if (type != FileContentType_Dicom)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	874 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	875 storage_.Read(content, uuid, type);
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	876 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	877 else
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	878 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	879 throw OrthancException(ErrorCode_UnknownResource);
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	880 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	881 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	882
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	883 virtual void Remove(const std::string& uuid,
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	884 FileContentType type)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	885 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	886 if (type != FileContentType_Dicom)
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	887 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	888 storage_.Remove(uuid, type);
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	889 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	890 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	891 };
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	892 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	893
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	894
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	895 static IStorageArea* CreateFilesystemStorage()
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	896 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	897 std::string storageDirectoryStr = Configuration::GetGlobalStringParameter("StorageDirectory", "OrthancStorage");
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	898
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	899 boost::filesystem::path storageDirectory = Configuration::InterpretStringParameterAsPath(storageDirectoryStr);
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	900 LOG(WARNING) << "Storage directory: " << storageDirectory;
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	901
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	902 if (Configuration::GetGlobalBoolParameter("StoreDicom", true))
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	903 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	904 return new FilesystemStorage(storageDirectory.string());
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	905 }
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	906 else
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 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	909 return new FilesystemStorageWithoutDicom(storageDirectory.string());
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 }
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
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	914 IDatabaseWrapper* Configuration::CreateDatabaseWrapper()
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	915 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	916 return CreateSQLiteWrapper();
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	917 }
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
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	920 IStorageArea* Configuration::CreateStorageArea()
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	921 {
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	922 return CreateFilesystemStorage();
b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	923 }
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	924
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	925
1587 d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	926 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	927 {
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	928 boost::mutex::scoped_lock lock(globalMutex_);
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	929 result = configuration_;
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	930 }
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	931
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	932
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	933 void Configuration::FormatConfiguration(std::string& result)
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	934 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	935 Json::Value config;
1587 d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	936 GetConfiguration(config);
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	937
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	938 Json::StyledWriter w;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	939 result = w.write(config);
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1423 diff changeset	940 }
1610 2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	941
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	942
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	943 const FontRegistry& Configuration::GetFontRegistry()
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	944 {
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	945 return fontRegistry_;
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	946 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	947 }

Mercurial > hg > orthanc

annotate OrthancServer/OrthancInitialization.cpp @ 1641:4e56b5a206b7