orthanc: OrthancServer/OrthancInitialization.cpp annotate

annotate OrthancServer/OrthancInitialization.cpp @ 1484:b64f48e19ab9

fix mainline version

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Sun, 02 Aug 2015 15:57:45 +0200
parents	7366a0bdda6a
children	27661b33f624

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

Mercurial > hg > orthanc

annotate OrthancServer/OrthancInitialization.cpp @ 1484:b64f48e19ab9