orthanc: OrthancFramework/Sources/Toolbox.cpp annotate

annotate OrthancFramework/Sources/Toolbox.cpp @ 5804:25df40a274fd find-refactoring

/changes: allowing filtering on multiple changes

author	Alain Mazy <am@orthanc.team>
date	Mon, 23 Sep 2024 15:40:27 +0200
parents	e4d9a872998f
children	16df20505710

rev	line source
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1833 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	4 * Department, University Hospital of Liege, Belgium
5640 f7adfb22e20e updated copyright, as Orthanc Team now replaces Osimis Sebastien Jodogne <s.jodogne@gmail.com> parents: 5575 diff changeset	5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
f7adfb22e20e updated copyright, as Orthanc Team now replaces Osimis Sebastien Jodogne <s.jodogne@gmail.com> parents: 5575 diff changeset	6 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium
5485 48b8dae6dc77 upgrade to year 2024 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5430 diff changeset	7 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * This program is free software: you can redistribute it and/or
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	10 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	11 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	12 * the License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 110 diff changeset	13 *
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * 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	15 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	17 * Lesser General Public License for more details.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 *
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	19 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	20 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	21 * <http://www.gnu.org/licenses/>.
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
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24
824 a811bdf8b8eb precompiled headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	25 #include "PrecompiledHeaders.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 #include "Toolbox.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	28 #include "Compatibility.h"
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	29 #include "OrthancException.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1480 diff changeset	30 #include "Logging.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31
4393 e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	32 #include <json/reader.h>
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	33 #include <json/version.h>
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	34 #include <json/writer.h>
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	35
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	36 #if !defined(JSONCPP_VERSION_MAJOR) \|\| !defined(JSONCPP_VERSION_MINOR)
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	37 # error Cannot access the version of JsonCpp
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	38 #endif
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	39
5257 0b183bb77c83 Avoid the use of "externalproject_add()" to build the sample plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	40 #if !defined(ORTHANC_ENABLE_ICU)
0b183bb77c83 Avoid the use of "externalproject_add()" to build the sample plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	41 # define ORTHANC_ENABLE_ICU 1
0b183bb77c83 Avoid the use of "externalproject_add()" to build the sample plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	42 #endif
0b183bb77c83 Avoid the use of "externalproject_add()" to build the sample plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	43
4393 e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	44
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	45 /**
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	46 * We use deprecated "Json::Reader", "Json::StyledWriter" and
4396 d07a65100a95 fix comment Sebastien Jodogne <s.jodogne@gmail.com> parents: 4394 diff changeset	47 * "Json::FastWriter" if JsonCpp < 1.7.0. This choice is rather
4393 e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	48 * arbitrary, but if Json >= 1.9.0, gcc generates explicit deprecation
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	49 * warnings (clang was warning in earlier versions). For reference,
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	50 * these classes seem to have been deprecated since JsonCpp 1.4.0 (on
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	51 * February 2015) by the following changeset:
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	52 * https://github.com/open-source-parsers/jsoncpp/commit/8df98f6112890d6272734975dd6d70cf8999bb22
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	53 **/
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	54 #if (JSONCPP_VERSION_MAJOR >= 2 \|\| \
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	55 (JSONCPP_VERSION_MAJOR == 1 && JSONCPP_VERSION_MINOR >= 8))
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	56 # define JSONCPP_USE_DEPRECATED 0
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	57 #else
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	58 # define JSONCPP_USE_DEPRECATED 1
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	59 #endif
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	60
4392 3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	61
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	62 #include <boost/algorithm/string/case_conv.hpp>
2143 fd5875662670 creation of namespace SystemToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2141 diff changeset	63 #include <boost/algorithm/string/replace.hpp>
4938 f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	64 #include <boost/algorithm/string/join.hpp>
2143 fd5875662670 creation of namespace SystemToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2141 diff changeset	65 #include <boost/lexical_cast.hpp>
2931 89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	66 #include <boost/regex.hpp>
89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	67
89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	68 #if BOOST_VERSION >= 106600
89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	69 # include <boost/uuid/detail/sha1.hpp>
89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	70 #else
89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	71 # include <boost/uuid/sha1.hpp>
89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	72 #endif
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	73
1397 704de8c30ff5 modularization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	74 #include <string>
453 30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	75 #include <stdint.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	76 #include <string.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77 #include <algorithm>
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	78 #include <ctype.h>
1397 704de8c30ff5 modularization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	79
915 703bef350e89 Orthanc now relies entirely on boost::locale Sebastien Jodogne <s.jodogne@gmail.com> parents: 890 diff changeset	80
2137 595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	81 #if ORTHANC_ENABLE_MD5 == 1
2931 89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	82 // TODO - Could be replaced by <boost/uuid/detail/md5.hpp> starting
89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	83 // with Boost >= 1.66.0
2137 595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	84 # include "../Resources/ThirdParty/md5/md5.h"
1479 8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	85 #endif
8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	86
2137 595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	87 #if ORTHANC_ENABLE_BASE64 == 1
595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	88 # include "../Resources/ThirdParty/base64/base64.h"
1479 8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	89 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	90
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	91 #if ORTHANC_ENABLE_LOCALE == 1
2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	92 # include <boost/locale.hpp>
2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	93 #endif
2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	94
2677 0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	95 #if ORTHANC_ENABLE_SSL == 1
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	96 // For OpenSSL initialization and finalization
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	97 # include <openssl/conf.h>
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	98 # include <openssl/engine.h>
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	99 # include <openssl/err.h>
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	100 # include <openssl/evp.h>
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	101 # include <openssl/ssl.h>
4741 a6b7c29f5118 compiler warning about openssl license Sebastien Jodogne <s.jodogne@gmail.com> parents: 4706 diff changeset	102
a6b7c29f5118 compiler warning about openssl license Sebastien Jodogne <s.jodogne@gmail.com> parents: 4706 diff changeset	103 # if OPENSSL_VERSION_NUMBER < 0x30000000L
5073 859f3668c181 replaced macro "#warning" by "#pragma message" for Visual Studio Sebastien Jodogne <s.jodogne@gmail.com> parents: 4938 diff changeset	104 # if defined(_MSC_VER)
859f3668c181 replaced macro "#warning" by "#pragma message" for Visual Studio Sebastien Jodogne <s.jodogne@gmail.com> parents: 4938 diff changeset	105 # pragma message("You are linking Orthanc against OpenSSL 1.x, whose license is incompatible with the GPLv3+ used by Orthanc >= 1.10.0. Please update to OpenSSL 3.x, that uses the Apache 2 license.")
859f3668c181 replaced macro "#warning" by "#pragma message" for Visual Studio Sebastien Jodogne <s.jodogne@gmail.com> parents: 4938 diff changeset	106 # else
859f3668c181 replaced macro "#warning" by "#pragma message" for Visual Studio Sebastien Jodogne <s.jodogne@gmail.com> parents: 4938 diff changeset	107 # warning You are linking Orthanc against OpenSSL 1.x, whose license is incompatible with the GPLv3+ used by Orthanc >= 1.10.0. Please update to OpenSSL 3.x, that uses the Apache 2 license.
859f3668c181 replaced macro "#warning" by "#pragma message" for Visual Studio Sebastien Jodogne <s.jodogne@gmail.com> parents: 4938 diff changeset	108 # endif
4741 a6b7c29f5118 compiler warning about openssl license Sebastien Jodogne <s.jodogne@gmail.com> parents: 4706 diff changeset	109 # endif
a6b7c29f5118 compiler warning about openssl license Sebastien Jodogne <s.jodogne@gmail.com> parents: 4706 diff changeset	110
2677 0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	111 #endif
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	112
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	113
1111 929bf8c2123d Fixes for Visual Studio 2013 64bit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1103 diff changeset	114 #if defined(_MSC_VER) && (_MSC_VER < 1800)
929bf8c2123d Fixes for Visual Studio 2013 64bit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1103 diff changeset	115 // Patch for the missing "_strtoll" symbol when compiling with Visual Studio < 2013
570 86c5bb651bfa fix jodogne parents: 568 diff changeset	116 extern "C"
86c5bb651bfa fix jodogne parents: 568 diff changeset	117 {
915 703bef350e89 Orthanc now relies entirely on boost::locale Sebastien Jodogne <s.jodogne@gmail.com> parents: 890 diff changeset	118 int64_t _strtoi64(const char nptr, char *endptr, int base);
703bef350e89 Orthanc now relies entirely on boost::locale Sebastien Jodogne <s.jodogne@gmail.com> parents: 890 diff changeset	119 int64_t strtoll(const char nptr, char *endptr, int base)
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	120 {
915 703bef350e89 Orthanc now relies entirely on boost::locale Sebastien Jodogne <s.jodogne@gmail.com> parents: 890 diff changeset	121 return _strtoi64(nptr, endptr, base);
703bef350e89 Orthanc now relies entirely on boost::locale Sebastien Jodogne <s.jodogne@gmail.com> parents: 890 diff changeset	122 }
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	123 }
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	124 #endif
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	125
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	126
2173 1c42860097fc fix windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	127 #if defined(_WIN32)
1c42860097fc fix windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	128 # include <windows.h> // For ::Sleep
1c42860097fc fix windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	129 #endif
1c42860097fc fix windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	130
2141 a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	131
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2129 diff changeset	132 #if ORTHANC_ENABLE_PUGIXML == 1
2143 fd5875662670 creation of namespace SystemToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2141 diff changeset	133 # include "ChunkedBuffer.h"
1045 0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	134 #endif
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	135
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	136
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	137 // Inclusions for UUID
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	138 // http://stackoverflow.com/a/1626302
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	139
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	140 extern "C"
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	141 {
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	142 #if defined(_WIN32)
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	143 # include <rpc.h>
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	144 #else
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	145 # include <uuid/uuid.h>
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	146 #endif
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	147 }
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	148
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	149
5261 f66b8d70917e fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 5257 diff changeset	150 #if defined(ORTHANC_STATIC_ICU)
f66b8d70917e fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 5257 diff changeset	151
f66b8d70917e fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 5257 diff changeset	152 # if (ORTHANC_STATIC_ICU == 1) && (ORTHANC_ENABLE_ICU == 1)
5273 7cb1b851f5c8 Added a sample plugin bringing multitenant DICOM support through labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5261 diff changeset	153 # if !defined(ORTHANC_FRAMEWORK_INCLUDE_RESOURCES) \|\| (ORTHANC_FRAMEWORK_INCLUDE_RESOURCES == 1)
7cb1b851f5c8 Added a sample plugin bringing multitenant DICOM support through labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5261 diff changeset	154 # include <OrthancFrameworkResources.h>
7cb1b851f5c8 Added a sample plugin bringing multitenant DICOM support through labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5261 diff changeset	155 # endif
5261 f66b8d70917e fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 5257 diff changeset	156 # endif
f66b8d70917e fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 5257 diff changeset	157
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	158 # if (ORTHANC_STATIC_ICU == 1 && ORTHANC_ENABLE_LOCALE == 1)
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	159 # include <unicode/udata.h>
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	160 # include <unicode/uloc.h>
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	161 # include "Compression/GzipCompressor.h"
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	162
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	163 static std::string globalIcuData_;
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	164
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	165 extern "C"
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	166 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	167 // This is dummy content for the "icudt58_dat" (resp. "icudt63_dat")
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	168 // global variable from the autogenerated "icudt58l_dat.c"
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	169 // (resp. "icudt63l_dat.c") file that contains a huge C array. In
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	170 // Orthanc, this array is compressed using gzip and attached as a
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	171 // resource, then uncompressed during the launch of Orthanc by
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	172 // static function "InitializeIcu()".
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	173 struct
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	174 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	175 double bogus;
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	176 uint8_t *bytes;
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	177 } U_ICUDATA_ENTRY_POINT = { 0.0, NULL };
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	178 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	179
3462 7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	180 # if defined(__LSB_VERSION__)
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	181 extern "C"
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	182 {
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	183 /**
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	184 * The "tzname" global variable is declared as "extern" but is not
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	185 * defined in any compilation module, if using Linux Standard Base,
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	186 * as soon as OpenSSL or cURL is in use on Ubuntu >= 18.04 (glibc >=
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	187 * 2.27). The variable "__tzname" is always properly declared and
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	188 * defined. The reason is unclear, and is maybe a bug in the gcc 4.8
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	189 * linker that is used by LSB if facing a weak symbol (as "tzname").
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	190 * This makes Orthanc crash if the timezone is set to UTC.
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	191 * https://groups.google.com/d/msg/orthanc-users/0m8sxxwSm1E/2p8du_89CAAJ
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	192 **/
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	193 char tzname[2] = { (char ) "GMT", (char *) "GMT" };
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	194 }
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	195 # endif
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	196
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	197 # endif
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	198 #endif
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	199
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	200
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	201
3459 cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	202 #if defined(__unix__) && ORTHANC_SANDBOXED != 1
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	203 # include "SystemToolbox.h" // Check out "InitializeGlobalLocale()"
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	204 #endif
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	205
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	206
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	207
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	208 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	209 {
2513 97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	210 void Toolbox::LinesIterator::FindEndOfLine()
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	211 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	212 lineEnd_ = lineStart_;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	213
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	214 while (lineEnd_ < content_.size() &&
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	215 content_[lineEnd_] != '\n' &&
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	216 content_[lineEnd_] != '\r')
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	217 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	218 lineEnd_ += 1;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	219 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	220 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	221
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	222
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	223 Toolbox::LinesIterator::LinesIterator(const std::string& content) :
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	224 content_(content),
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	225 lineStart_(0)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	226 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	227 FindEndOfLine();
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	228 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	229
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	230
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	231 bool Toolbox::LinesIterator::GetLine(std::string& target) const
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	232 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	233 assert(lineStart_ <= content_.size() &&
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	234 lineEnd_ <= content_.size() &&
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	235 lineStart_ <= lineEnd_);
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	236
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	237 if (lineStart_ == content_.size())
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	238 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	239 return false;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	240 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	241 else
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	242 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	243 target = content_.substr(lineStart_, lineEnd_ - lineStart_);
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	244 return true;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	245 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	246 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	247
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	248
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	249 void Toolbox::LinesIterator::Next()
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	250 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	251 lineStart_ = lineEnd_;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	252
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	253 if (lineStart_ != content_.size())
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	254 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	255 assert(content_[lineStart_] == '\r' \|\|
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	256 content_[lineStart_] == '\n');
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	257
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	258 char second;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	259
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	260 if (content_[lineStart_] == '\r')
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	261 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	262 second = '\n';
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	263 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	264 else
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	265 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	266 second = '\r';
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	267 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	268
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	269 lineStart_ += 1;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	270
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	271 if (lineStart_ < content_.size() &&
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	272 content_[lineStart_] == second)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	273 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	274 lineStart_ += 1;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	275 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	276
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	277 FindEndOfLine();
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	278 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	279 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	280
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	281
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	282 void Toolbox::ToUpperCase(std::string& s)
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 std::transform(s.begin(), s.end(), s.begin(), toupper);
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
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	287
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	288 void Toolbox::ToLowerCase(std::string& s)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	289 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	290 std::transform(s.begin(), s.end(), s.begin(), tolower);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	291 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	292
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	293
690 2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	294 void Toolbox::ToUpperCase(std::string& result,
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	295 const std::string& source)
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	296 {
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	297 result = source;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	298 ToUpperCase(result);
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	299 }
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	300
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	301 void Toolbox::ToLowerCase(std::string& result,
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	302 const std::string& source)
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	303 {
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	304 result = source;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	305 ToLowerCase(result);
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	306 }
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	307
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	308
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	309 void Toolbox::SplitUriComponents(UriComponents& components,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	310 const std::string& uri)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	311 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	312 static const char URI_SEPARATOR = '/';
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 components.clear();
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 if (uri.size() == 0 \|\|
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	317 uri[0] != URI_SEPARATOR)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	318 {
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	319 throw OrthancException(ErrorCode_UriSyntax);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	320 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	321
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	322 // Count the number of slashes in the URI to make an assumption
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	323 // about the number of components in the URI
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	324 unsigned int estimatedSize = 0;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	325 for (unsigned int i = 0; i < uri.size(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	326 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	327 if (uri[i] == URI_SEPARATOR)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	328 estimatedSize++;
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
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	331 components.reserve(estimatedSize - 1);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	332
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	333 unsigned int start = 1;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	334 unsigned int end = 1;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	335 while (end < uri.size())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	336 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	337 // This is the loop invariant
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	338 assert(uri[start - 1] == '/' && (end >= start));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	339
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	340 if (uri[end] == '/')
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	341 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	342 components.push_back(std::string(&uri[start], end - start));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	343 end++;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	344 start = end;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	345 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	346 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	348 end++;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	349 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	350 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352 if (start < uri.size())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354 components.push_back(std::string(&uri[start], end - start));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355 }
207 7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	356
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	357 for (size_t i = 0; i < components.size(); i++)
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	358 {
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	359 if (components[i].size() == 0)
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	360 {
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	361 // Empty component, as in: "/coucou//e"
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	362 throw OrthancException(ErrorCode_UriSyntax);
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	363 }
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	364 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	366
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	367
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	368 void Toolbox::TruncateUri(UriComponents& target,
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	369 const UriComponents& source,
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	370 size_t fromLevel)
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	371 {
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	372 target.clear();
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	373
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	374 if (source.size() > fromLevel)
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	375 {
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	376 target.resize(source.size() - fromLevel);
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	377
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	378 size_t j = 0;
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	379 for (size_t i = fromLevel; i < source.size(); i++, j++)
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	380 {
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	381 target[j] = source[i];
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	382 }
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	383
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	384 assert(j == target.size());
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	385 }
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	386 }
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	387
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	388
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	389
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	390 bool Toolbox::IsChildUri(const UriComponents& baseUri,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	391 const UriComponents& testedUri)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	392 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	393 if (testedUri.size() < baseUri.size())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	394 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	395 return false;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	396 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	397
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	398 for (size_t i = 0; i < baseUri.size(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	399 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	400 if (baseUri[i] != testedUri[i])
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	401 return false;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	402 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	403
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	404 return true;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	405 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	406
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	407
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	408 std::string Toolbox::FlattenUri(const UriComponents& components,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	409 size_t fromLevel)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	410 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	411 if (components.size() <= fromLevel)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	412 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	413 return "/";
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	414 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	415 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	416 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	417 std::string r;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	418
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	419 for (size_t i = fromLevel; i < components.size(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	420 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	421 r += "/" + components[i];
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	422 }
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 return r;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	425 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	426 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	427
5143 95d8e0540219 avoid double '/' in HttpClient uri Alain Mazy <am@osimis.io> parents: 5073 diff changeset	428 std::string Toolbox::JoinUri(const std::string& base, const std::string& uri)
95d8e0540219 avoid double '/' in HttpClient uri Alain Mazy <am@osimis.io> parents: 5073 diff changeset	429 {
95d8e0540219 avoid double '/' in HttpClient uri Alain Mazy <am@osimis.io> parents: 5073 diff changeset	430 if (uri.size() > 0 && base.size() > 0)
95d8e0540219 avoid double '/' in HttpClient uri Alain Mazy <am@osimis.io> parents: 5073 diff changeset	431 {
95d8e0540219 avoid double '/' in HttpClient uri Alain Mazy <am@osimis.io> parents: 5073 diff changeset	432 if (base[base.size() - 1] == '/' && uri[0] == '/')
95d8e0540219 avoid double '/' in HttpClient uri Alain Mazy <am@osimis.io> parents: 5073 diff changeset	433 {
95d8e0540219 avoid double '/' in HttpClient uri Alain Mazy <am@osimis.io> parents: 5073 diff changeset	434 return base + uri.substr(1, uri.size() - 1);
95d8e0540219 avoid double '/' in HttpClient uri Alain Mazy <am@osimis.io> parents: 5073 diff changeset	435 }
95d8e0540219 avoid double '/' in HttpClient uri Alain Mazy <am@osimis.io> parents: 5073 diff changeset	436 else if (base[base.size() - 1] != '/' && uri[0] != '/')
95d8e0540219 avoid double '/' in HttpClient uri Alain Mazy <am@osimis.io> parents: 5073 diff changeset	437 {
95d8e0540219 avoid double '/' in HttpClient uri Alain Mazy <am@osimis.io> parents: 5073 diff changeset	438 return base + "/" + uri;
95d8e0540219 avoid double '/' in HttpClient uri Alain Mazy <am@osimis.io> parents: 5073 diff changeset	439 }
95d8e0540219 avoid double '/' in HttpClient uri Alain Mazy <am@osimis.io> parents: 5073 diff changeset	440 }
95d8e0540219 avoid double '/' in HttpClient uri Alain Mazy <am@osimis.io> parents: 5073 diff changeset	441
95d8e0540219 avoid double '/' in HttpClient uri Alain Mazy <am@osimis.io> parents: 5073 diff changeset	442 return base + uri;
95d8e0540219 avoid double '/' in HttpClient uri Alain Mazy <am@osimis.io> parents: 5073 diff changeset	443 }
95d8e0540219 avoid double '/' in HttpClient uri Alain Mazy <am@osimis.io> parents: 5073 diff changeset	444
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	445
2137 595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	446 #if ORTHANC_ENABLE_MD5 == 1
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	447 static char GetHexadecimalCharacter(uint8_t value)
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	448 {
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	449 assert(value < 16);
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	450
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	451 if (value < 10)
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	452 {
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	453 return value + '0';
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	454 }
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	455 else
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	456 {
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	457 return (value - 10) + 'a';
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	458 }
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	459 }
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	460
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 22 diff changeset	461
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	462 void Toolbox::ComputeMD5(std::string& result,
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	463 const std::string& data)
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	464 {
693 01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	465 if (data.size() > 0)
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	466 {
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	467 ComputeMD5(result, &data[0], data.size());
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	468 }
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	469 else
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	470 {
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	471 ComputeMD5(result, NULL, 0);
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	472 }
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	473 }
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	474
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	475
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	476 void Toolbox::ComputeMD5(std::string& result,
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	477 const void* data,
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	478 size_t size)
693 01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	479 {
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	480 md5_state_s state;
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	481 md5_init(&state);
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	482
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	483 if (size > 0)
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	484 {
693 01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	485 md5_append(&state,
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	486 reinterpret_cast<const md5_byte_t*>(data),
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	487 static_cast<int>(size));
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	488 }
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	489
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	490 md5_byte_t actualHash[16];
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	491 md5_finish(&state, actualHash);
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	492
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	493 result.resize(32);
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	494 for (unsigned int i = 0; i < 16; i++)
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	495 {
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	496 result[2 * i] = GetHexadecimalCharacter(static_cast<uint8_t>(actualHash[i] / 16));
3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	497 result[2 * i + 1] = GetHexadecimalCharacter(static_cast<uint8_t>(actualHash[i] % 16));
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	498 }
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	499 }
5377 daf4807631c5 ComputeMD5 for std::set Alain Mazy <am@osimis.io> parents: 5373 diff changeset	500
daf4807631c5 ComputeMD5 for std::set Alain Mazy <am@osimis.io> parents: 5373 diff changeset	501 void Toolbox::ComputeMD5(std::string& result,
daf4807631c5 ComputeMD5 for std::set Alain Mazy <am@osimis.io> parents: 5373 diff changeset	502 const std::set<std::string>& data)
daf4807631c5 ComputeMD5 for std::set Alain Mazy <am@osimis.io> parents: 5373 diff changeset	503 {
5381 be0b9c407985 simplifying new signature of Toolbox::ComputeMD5() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5377 diff changeset	504 std::string s;
be0b9c407985 simplifying new signature of Toolbox::ComputeMD5() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5377 diff changeset	505
be0b9c407985 simplifying new signature of Toolbox::ComputeMD5() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5377 diff changeset	506 for (std::set<std::string>::const_iterator it = data.begin(); it != data.end(); ++it)
5377 daf4807631c5 ComputeMD5 for std::set Alain Mazy <am@osimis.io> parents: 5373 diff changeset	507 {
5381 be0b9c407985 simplifying new signature of Toolbox::ComputeMD5() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5377 diff changeset	508 s += *it;
5377 daf4807631c5 ComputeMD5 for std::set Alain Mazy <am@osimis.io> parents: 5373 diff changeset	509 }
daf4807631c5 ComputeMD5 for std::set Alain Mazy <am@osimis.io> parents: 5373 diff changeset	510
5381 be0b9c407985 simplifying new signature of Toolbox::ComputeMD5() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5377 diff changeset	511 ComputeMD5(result, s);
5377 daf4807631c5 ComputeMD5 for std::set Alain Mazy <am@osimis.io> parents: 5373 diff changeset	512 }
daf4807631c5 ComputeMD5 for std::set Alain Mazy <am@osimis.io> parents: 5373 diff changeset	513
1479 8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	514 #endif
24 166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	515
166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	516
2137 595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	517 #if ORTHANC_ENABLE_BASE64 == 1
809 8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	518 void Toolbox::EncodeBase64(std::string& result,
8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	519 const std::string& data)
24 166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	520 {
3326 b21d4cc8e5d1 speed up base64 decoding + added tests Alain Mazy <alain@mazy.be> parents: 3325 diff changeset	521 result.clear();
3325 2e7c5c15ba25 reserve size for base64 decoding + avoid copy. In a test in WASM, encoding 3MB took 110ms instead of 1400ms previously Alain Mazy <alain@mazy.be> parents: 3322 diff changeset	522 base64_encode(result, data);
24 166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	523 }
166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	524
809 8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	525 void Toolbox::DecodeBase64(std::string& result,
8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	526 const std::string& data)
365 cda6938a8c6f decode base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 337 diff changeset	527 {
1988 e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	528 for (size_t i = 0; i < data.length(); i++)
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	529 {
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	530 if (!isalnum(data[i]) &&
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	531 data[i] != '+' &&
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	532 data[i] != '/' &&
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	533 data[i] != '=')
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	534 {
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	535 // This is not a valid character for a Base64 string
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	536 throw OrthancException(ErrorCode_BadFileFormat);
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	537 }
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	538 }
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	539
3326 b21d4cc8e5d1 speed up base64 decoding + added tests Alain Mazy <alain@mazy.be> parents: 3325 diff changeset	540 result.clear();
3325 2e7c5c15ba25 reserve size for base64 decoding + avoid copy. In a test in WASM, encoding 3MB took 110ms instead of 1400ms previously Alain Mazy <alain@mazy.be> parents: 3322 diff changeset	541 base64_decode(result, data);
365 cda6938a8c6f decode base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 337 diff changeset	542 }
1648 a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	543
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	544
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	545 bool Toolbox::DecodeDataUriScheme(std::string& mime,
1648 a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	546 std::string& content,
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	547 const std::string& source)
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	548 {
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	549 boost::regex pattern("data:([^;]+);base64,([a-zA-Z0-9=+/]*)",
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	550 boost::regex::icase /* case insensitive search */);
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	551
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	552 boost::cmatch what;
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	553 if (regex_match(source.c_str(), what, pattern))
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	554 {
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	555 mime = what[1];
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	556 DecodeBase64(content, what[2]);
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	557 return true;
1648 a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	558 }
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	559 else
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	560 {
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	561 return false;
1648 a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	562 }
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	563 }
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	564
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	565
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	566 void Toolbox::EncodeDataUriScheme(std::string& result,
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	567 const std::string& mime,
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	568 const std::string& content)
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	569 {
3325 2e7c5c15ba25 reserve size for base64 decoding + avoid copy. In a test in WASM, encoding 3MB took 110ms instead of 1400ms previously Alain Mazy <alain@mazy.be> parents: 3322 diff changeset	570 result = "data:" + mime + ";base64,";
2e7c5c15ba25 reserve size for base64 decoding + avoid copy. In a test in WASM, encoding 3MB took 110ms instead of 1400ms previously Alain Mazy <alain@mazy.be> parents: 3322 diff changeset	571 base64_encode(result, content);
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	572 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	573
1479 8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	574 #endif
8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	575
365 cda6938a8c6f decode base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 337 diff changeset	576
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2373 diff changeset	577 #if ORTHANC_ENABLE_LOCALE == 1
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	578 static const char* GetBoostLocaleEncoding(const Encoding sourceEncoding)
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	579 {
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	580 switch (sourceEncoding)
766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	581 {
766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	582 case Encoding_Utf8:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	583 return "UTF-8";
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	584
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 950 diff changeset	585 case Encoding_Ascii:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	586 return "ASCII";
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 950 diff changeset	587
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	588 case Encoding_Latin1:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	589 return "ISO-8859-1";
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	590
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	591 case Encoding_Latin2:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	592 return "ISO-8859-2";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	593
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	594 case Encoding_Latin3:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	595 return "ISO-8859-3";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	596
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	597 case Encoding_Latin4:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	598 return "ISO-8859-4";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	599
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	600 case Encoding_Latin5:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	601 return "ISO-8859-9";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	602
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	603 case Encoding_Cyrillic:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	604 return "ISO-8859-5";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	605
1347 60cc0ee61edb fix issue 32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1337 diff changeset	606 case Encoding_Windows1251:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	607 return "WINDOWS-1251";
1347 60cc0ee61edb fix issue 32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1337 diff changeset	608
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	609 case Encoding_Arabic:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	610 return "ISO-8859-6";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	611
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	612 case Encoding_Greek:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	613 return "ISO-8859-7";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	614
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	615 case Encoding_Hebrew:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	616 return "ISO-8859-8";
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	617
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	618 case Encoding_Japanese:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	619 return "SHIFT-JIS";
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	620
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	621 case Encoding_Chinese:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	622 return "GB18030";
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	623
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	624 case Encoding_Thai:
3230 4b042ec734c1 dynamic linking against libicu Sebastien Jodogne <s.jodogne@gmail.com> parents: 3226 diff changeset	625 #if BOOST_LOCALE_WITH_ICU == 1
4b042ec734c1 dynamic linking against libicu Sebastien Jodogne <s.jodogne@gmail.com> parents: 3226 diff changeset	626 return "tis620.2533";
4b042ec734c1 dynamic linking against libicu Sebastien Jodogne <s.jodogne@gmail.com> parents: 3226 diff changeset	627 #else
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	628 return "TIS620.2533-0";
3230 4b042ec734c1 dynamic linking against libicu Sebastien Jodogne <s.jodogne@gmail.com> parents: 3226 diff changeset	629 #endif
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	630
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	631 case Encoding_Korean:
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	632 return "ISO-IR-149";
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	633
3218 9a83d94b2a1e kanji encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	634 case Encoding_JapaneseKanji:
9a83d94b2a1e kanji encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	635 return "JIS";
9a83d94b2a1e kanji encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	636
3226 45e1631febbb support of simplified chinese Sebastien Jodogne <s.jodogne@gmail.com> parents: 3221 diff changeset	637 case Encoding_SimplifiedChinese:
45e1631febbb support of simplified chinese Sebastien Jodogne <s.jodogne@gmail.com> parents: 3221 diff changeset	638 return "GB2312";
45e1631febbb support of simplified chinese Sebastien Jodogne <s.jodogne@gmail.com> parents: 3221 diff changeset	639
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	640 default:
957 63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	641 throw OrthancException(ErrorCode_NotImplemented);
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	642 }
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	643 }
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2373 diff changeset	644 #endif
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	645
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	646
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	647 #if ORTHANC_ENABLE_LOCALE == 1
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	648 // http://dicom.nema.org/medical/dicom/current/output/chtml/part03/sect_C.12.html#sect_C.12.1.1.2
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	649 std::string Toolbox::ConvertToUtf8(const std::string& source,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	650 Encoding sourceEncoding,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	651 bool hasCodeExtensions)
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	652 {
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	653 #if ORTHANC_STATIC_ICU == 1
5257 0b183bb77c83 Avoid the use of "externalproject_add()" to build the sample plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	654 # if ORTHANC_ENABLE_ICU == 0
0b183bb77c83 Avoid the use of "externalproject_add()" to build the sample plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	655 throw OrthancException(ErrorCode_NotImplemented, "ICU is disabled for this target");
0b183bb77c83 Avoid the use of "externalproject_add()" to build the sample plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	656 # else
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	657 if (globalIcuData_.empty())
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	658 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	659 throw OrthancException(ErrorCode_BadSequenceOfCalls,
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	660 "Call Toolbox::InitializeGlobalLocale()");
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	661 }
5257 0b183bb77c83 Avoid the use of "externalproject_add()" to build the sample plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	662 # endif
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	663 #endif
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	664
2907 0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	665 // The "::skip" flag makes boost skip invalid UTF-8
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	666 // characters. This can occur in badly-encoded DICOM files.
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	667
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	668 try
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	669 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	670 if (sourceEncoding == Encoding_Ascii)
2907 0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	671 {
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	672 return ConvertToAscii(source);
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	673 }
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	674 else
2907 0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	675 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	676 std::string s;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	677
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	678 if (sourceEncoding == Encoding_Utf8)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	679 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	680 // Already in UTF-8: No conversion is required, but we ensure
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	681 // the output is correctly encoded
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	682 s = boost::locale::conv::utf_to_utf<char>(source, boost::locale::conv::skip);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	683 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	684 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	685 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	686 const char* encoding = GetBoostLocaleEncoding(sourceEncoding);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	687 s = boost::locale::conv::to_utf<char>(source, encoding, boost::locale::conv::skip);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	688 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	689
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	690 if (hasCodeExtensions)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	691 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	692 std::string t;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	693 RemoveIso2022EscapeSequences(t, s);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	694 return t;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	695 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	696 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	697 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	698 return s;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	699 }
2907 0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	700 }
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	701 }
3218 9a83d94b2a1e kanji encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	702 catch (std::runtime_error& e)
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	703 {
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	704 // Bad input string or bad encoding
3218 9a83d94b2a1e kanji encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	705 LOG(INFO) << e.what();
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	706 return ConvertToAscii(source);
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	707 }
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	708 }
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	709 #endif
2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	710
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	711
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	712 #if ORTHANC_ENABLE_LOCALE == 1
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	713 std::string Toolbox::ConvertFromUtf8(const std::string& source,
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	714 Encoding targetEncoding)
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	715 {
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	716 #if ORTHANC_STATIC_ICU == 1
5257 0b183bb77c83 Avoid the use of "externalproject_add()" to build the sample plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	717 # if ORTHANC_ENABLE_ICU == 0
0b183bb77c83 Avoid the use of "externalproject_add()" to build the sample plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	718 throw OrthancException(ErrorCode_NotImplemented, "ICU is disabled for this target");
0b183bb77c83 Avoid the use of "externalproject_add()" to build the sample plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	719 # else
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	720 if (globalIcuData_.empty())
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	721 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	722 throw OrthancException(ErrorCode_BadSequenceOfCalls,
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	723 "Call Toolbox::InitializeGlobalLocale()");
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	724 }
5257 0b183bb77c83 Avoid the use of "externalproject_add()" to build the sample plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	725 # endif
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	726 #endif
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	727
2907 0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	728 // The "::skip" flag makes boost skip invalid UTF-8
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	729 // characters. This can occur in badly-encoded DICOM files.
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	730
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	731 try
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	732 {
2907 0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	733 if (targetEncoding == Encoding_Utf8)
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	734 {
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	735 // Already in UTF-8: No conversion is required.
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	736 return boost::locale::conv::utf_to_utf<char>(source, boost::locale::conv::skip);
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	737 }
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	738 else if (targetEncoding == Encoding_Ascii)
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	739 {
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	740 return ConvertToAscii(source);
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	741 }
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	742 else
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	743 {
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	744 const char* encoding = GetBoostLocaleEncoding(targetEncoding);
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	745 return boost::locale::conv::from_utf<char>(source, encoding, boost::locale::conv::skip);
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	746 }
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	747 }
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	748 catch (std::runtime_error&)
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	749 {
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	750 // Bad input string or bad encoding
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	751 return ConvertToAscii(source);
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	752 }
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	753 }
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	754 #endif
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	755
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	756
2900 668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	757 static bool IsAsciiCharacter(uint8_t c)
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	758 {
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	759 return (c != 0 &&
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	760 c <= 127 &&
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	761 (c == '\n' \|\| !iscntrl(c)));
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	762 }
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	763
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	764
2129 0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	765 bool Toolbox::IsAsciiString(const void* data,
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	766 size_t size)
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	767 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	768 const uint8_t* p = reinterpret_cast<const uint8_t*>(data);
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	769
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	770 for (size_t i = 0; i < size; i++, p++)
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	771 {
2900 668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	772 if (!IsAsciiCharacter(*p))
2129 0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	773 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	774 return false;
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	775 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	776 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	777
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	778 return true;
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	779 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	780
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	781
2442 330349d712f9 fix Toolbox::IsAsciiString Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	782 bool Toolbox::IsAsciiString(const std::string& s)
330349d712f9 fix Toolbox::IsAsciiString Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	783 {
330349d712f9 fix Toolbox::IsAsciiString Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	784 return IsAsciiString(s.c_str(), s.size());
330349d712f9 fix Toolbox::IsAsciiString Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	785 }
330349d712f9 fix Toolbox::IsAsciiString Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	786
330349d712f9 fix Toolbox::IsAsciiString Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	787
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	788 std::string Toolbox::ConvertToAscii(const std::string& source)
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	789 {
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	790 std::string result;
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	791
942 b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 930 diff changeset	792 result.reserve(source.size() + 1);
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	793 for (size_t i = 0; i < source.size(); i++)
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	794 {
2900 668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	795 if (IsAsciiCharacter(source[i]))
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	796 {
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	797 result.push_back(source[i]);
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	798 }
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	799 }
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	800
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	801 return result;
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	802 }
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	803
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	804
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	805 void Toolbox::ComputeSHA1(std::string& result,
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	806 const void* data,
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	807 size_t size)
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	808 {
560 69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	809 boost::uuids::detail::sha1 sha1;
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	810
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	811 if (size > 0)
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	812 {
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	813 sha1.process_bytes(data, size);
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	814 }
81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	815
560 69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	816 unsigned int digest[5];
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	817
81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	818 // Sanity check for the memory layout: A SHA-1 digest is 160 bits wide
560 69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	819 assert(sizeof(unsigned int) == 4 && sizeof(digest) == (160 / 8));
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	820
560 69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	821 sha1.get_digest(digest);
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	822
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	823 result.resize(8 * 5 + 4);
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	824 sprintf(&result[0], "%08x-%08x-%08x-%08x-%08x",
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	825 digest[0],
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	826 digest[1],
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	827 digest[2],
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	828 digest[3],
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	829 digest[4]);
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	830 }
81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	831
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	832 void Toolbox::ComputeSHA1(std::string& result,
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	833 const std::string& data)
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	834 {
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	835 if (data.size() > 0)
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	836 {
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	837 ComputeSHA1(result, data.c_str(), data.size());
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	838 }
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	839 else
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	840 {
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	841 ComputeSHA1(result, NULL, 0);
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	842 }
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	843 }
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	844
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	845
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3382 diff changeset	846 bool Toolbox::IsSHA1(const void* str,
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	847 size_t size)
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	848 {
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	849 if (size == 0)
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	850 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	851 return false;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	852 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	853
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3382 diff changeset	854 const char* start = reinterpret_cast<const char*>(str);
962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3382 diff changeset	855 const char* end = start + size;
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	856
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	857 // Trim the beginning of the string
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	858 while (start < end)
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	859 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	860 if (*start == '\0' \|\|
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	861 isspace(*start))
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	862 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	863 start++;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	864 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	865 else
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	866 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	867 break;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	868 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	869 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	870
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	871 // Trim the trailing of the string
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	872 while (start < end)
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	873 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	874 if (*(end - 1) == '\0' \|\|
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	875 isspace(*(end - 1)))
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	876 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	877 end--;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	878 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	879 else
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	880 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	881 break;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	882 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	883 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	884
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	885 if (end - start != 44)
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	886 {
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	887 return false;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	888 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	889
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	890 for (unsigned int i = 0; i < 44; i++)
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	891 {
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	892 if (i == 8 \|\|
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	893 i == 17 \|\|
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	894 i == 26 \|\|
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	895 i == 35)
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	896 {
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	897 if (start[i] != '-')
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	898 return false;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	899 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	900 else
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	901 {
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	902 if (!isalnum(start[i]))
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	903 return false;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	904 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	905 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	906
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	907 return true;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	908 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	909
1397 704de8c30ff5 modularization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	910
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	911 bool Toolbox::IsSHA1(const std::string& s)
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	912 {
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	913 if (s.size() == 0)
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	914 {
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	915 return false;
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	916 }
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	917 else
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	918 {
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	919 return IsSHA1(s.c_str(), s.size());
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	920 }
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	921 }
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	922
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	923
247 c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	924 std::string Toolbox::StripSpaces(const std::string& source)
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	925 {
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	926 size_t first = 0;
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	927
247 c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	928 while (first < source.length() &&
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	929 isspace(source[first]))
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	930 {
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	931 first++;
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	932 }
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	933
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	934 if (first == source.length())
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	935 {
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	936 // String containing only spaces
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	937 return "";
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	938 }
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	939
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	940 size_t last = source.length();
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	941 while (last > first &&
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	942 isspace(source[last - 1]))
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	943 {
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	944 last--;
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	945 }
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	946
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	947 assert(first <= last);
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	948 return source.substr(first, last - first);
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	949 }
336 3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	950
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	951
337 26218c4de7e0 test added Sebastien Jodogne <s.jodogne@gmail.com> parents: 336 diff changeset	952 static char Hex2Dec(char c)
336 3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	953 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	954 return ((c >= '0' && c <= '9') ? c - '0' :
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	955 ((c >= 'a' && c <= 'f') ? c - 'a' + 10 : c - 'A' + 10));
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	956 }
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	957
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	958 void Toolbox::UrlDecode(std::string& s)
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	959 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	960 // http://en.wikipedia.org/wiki/Percent-encoding
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	961 // http://www.w3schools.com/tags/ref_urlencode.asp
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	962 // http://stackoverflow.com/questions/154536/encode-decode-urls-in-c
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	963
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	964 if (s.size() == 0)
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	965 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	966 return;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	967 }
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	968
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	969 size_t source = 0;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	970 size_t target = 0;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	971
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	972 while (source < s.size())
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	973 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	974 if (s[source] == '%' &&
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	975 source + 2 < s.size() &&
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	976 isalnum(s[source + 1]) &&
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	977 isalnum(s[source + 2]))
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	978 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	979 s[target] = (Hex2Dec(s[source + 1]) << 4) \| Hex2Dec(s[source + 2]);
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	980 source += 3;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	981 target += 1;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	982 }
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	983 else
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	984 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	985 if (s[source] == '+')
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	986 s[target] = ' ';
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	987 else
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	988 s[target] = s[source];
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	989
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	990 source++;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	991 target++;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	992 }
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	993 }
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	994
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	995 s.resize(target);
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	996 }
453 30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	997
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	998
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	999 Endianness Toolbox::DetectEndianness()
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	1000 {
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	1001 // http://sourceforge.net/p/predef/wiki/Endianness/
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	1002
4203 4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1003 uint32_t bufferView = 0;
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3462 diff changeset	1004
e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3462 diff changeset	1005 uint8_t* buffer = reinterpret_cast<uint8_t*>(&bufferView);
453 30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	1006
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	1007 buffer[0] = 0x00;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	1008 buffer[1] = 0x01;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	1009 buffer[2] = 0x02;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	1010 buffer[3] = 0x03;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	1011
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3462 diff changeset	1012 switch (bufferView)
453 30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	1013 {
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	1014 case 0x00010203:
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	1015 return Endianness_Big;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	1016
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	1017 case 0x03020100:
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	1018 return Endianness_Little;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	1019
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	1020 default:
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	1021 throw OrthancException(ErrorCode_NotImplemented);
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	1022 }
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	1023 }
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1024
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1025 std::string Toolbox::WildcardToRegularExpression(const std::string& source)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1026 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1027 // TODO - Speed up this with a regular expression
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1028
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1029 std::string result = source;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1030
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1031 // Escape all special characters
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1032 boost::replace_all(result, "\\", "\\\\");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1033 boost::replace_all(result, "^", "\\^");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1034 boost::replace_all(result, ".", "\\.");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1035 boost::replace_all(result, "$", "\\$");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1036 boost::replace_all(result, "\|", "\\\|");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1037 boost::replace_all(result, "(", "\\(");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1038 boost::replace_all(result, ")", "\\)");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1039 boost::replace_all(result, "[", "\\[");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1040 boost::replace_all(result, "]", "\\]");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1041 boost::replace_all(result, "+", "\\+");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1042 boost::replace_all(result, "/", "\\/");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1043 boost::replace_all(result, "{", "\\{");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1044 boost::replace_all(result, "}", "\\}");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1045
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1046 // Convert wildcards '*' and '?' to their regex equivalents
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1047 boost::replace_all(result, "?", ".");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1048 boost::replace_all(result, "", ".");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1049
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1050 return result;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1051 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1052
5373 123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1053 static void TokenizeStringInternal(std::vector<std::string>& result,
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1054 const std::string& value,
5373 123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1055 char separator,
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1056 bool includeEmptyStrings)
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1057 {
3382 a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1058 size_t countSeparators = 0;
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1059
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1060 for (size_t i = 0; i < value.size(); i++)
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1061 {
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1062 if (value[i] == separator)
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1063 {
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1064 countSeparators++;
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1065 }
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1066 }
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1067
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1068 result.clear();
3382 a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1069 result.reserve(countSeparators + 1);
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1070
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1071 std::string currentItem;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1072
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1073 for (size_t i = 0; i < value.size(); i++)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1074 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1075 if (value[i] == separator)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1076 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1077 result.push_back(currentItem);
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1078 currentItem.clear();
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1079 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1080 else
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1081 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1082 currentItem.push_back(value[i]);
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1083 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1084 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1085
5373 123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1086 if (includeEmptyStrings \|\| !currentItem.empty())
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1087 {
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1088 result.push_back(currentItem);
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1089 }
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1090 }
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1091
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1092
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1093 void Toolbox::TokenizeString(std::vector<std::string>& result,
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1094 const std::string& value,
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1095 char separator)
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1096 {
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1097 TokenizeStringInternal(result, value, separator, true);
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1098 }
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1099
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1100
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1101 void Toolbox::SplitString(std::set<std::string>& result,
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1102 const std::string& value,
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1103 char separator)
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1104 {
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1105 result.clear();
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1106
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1107 std::vector<std::string> temp;
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1108 TokenizeStringInternal(temp, value, separator, false);
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1109 for (size_t i = 0; i < temp.size(); ++i)
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1110 {
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1111 result.insert(temp[i]);
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1112 }
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1113 }
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1114
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1115
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1116 void Toolbox::SplitString(std::vector<std::string>& result,
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1117 const std::string& value,
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1118 char separator)
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1119 {
123a94dd57df Toolbox::SplitString Alain Mazy <am@osimis.io> parents: 5273 diff changeset	1120 TokenizeStringInternal(result, value, separator, false);
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1121 }
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	1122
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	1123
4938 f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1124 void Toolbox::JoinStrings(std::string& result,
5167 de7a639c5ad2 fix constness Alain Mazy <am@osimis.io> parents: 5143 diff changeset	1125 const std::set<std::string>& source,
4938 f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1126 const char* separator)
f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1127 {
f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1128 result = boost::algorithm::join(source, separator);
f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1129 }
f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1130
5167 de7a639c5ad2 fix constness Alain Mazy <am@osimis.io> parents: 5143 diff changeset	1131 void Toolbox::JoinStrings(std::string& result,
de7a639c5ad2 fix constness Alain Mazy <am@osimis.io> parents: 5143 diff changeset	1132 const std::vector<std::string>& source,
de7a639c5ad2 fix constness Alain Mazy <am@osimis.io> parents: 5143 diff changeset	1133 const char* separator)
4938 f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1134 {
f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1135 result = boost::algorithm::join(source, separator);
f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1136 }
f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1137
f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1138
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2129 diff changeset	1139 #if ORTHANC_ENABLE_PUGIXML == 1
1045 0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1140 class ChunkedBufferWriter : public pugi::xml_writer
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1141 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1142 private:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1143 ChunkedBuffer buffer_;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1144
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1145 public:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1146 virtual void write(const void *data, size_t size)
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1147 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1148 if (size > 0)
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1149 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1150 buffer_.AddChunk(reinterpret_cast<const char*>(data), size);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1151 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1152 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1153
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1154 void Flatten(std::string& s)
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1155 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1156 buffer_.Flatten(s);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1157 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1158 };
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1159
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1160
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1161 static void JsonToXmlInternal(pugi::xml_node& target,
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1162 const Json::Value& source,
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1163 const std::string& arrayElement)
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1164 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1165 // http://jsoncpp.sourceforge.net/value_8h_source.html#l00030
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1166
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1167 switch (source.type())
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1168 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1169 case Json::nullValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1170 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1171 target.append_child(pugi::node_pcdata).set_value("null");
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1172 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1173 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1174
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1175 case Json::intValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1176 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1177 std::string s = boost::lexical_cast<std::string>(source.asInt());
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1178 target.append_child(pugi::node_pcdata).set_value(s.c_str());
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1179 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1180 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1181
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1182 case Json::uintValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1183 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1184 std::string s = boost::lexical_cast<std::string>(source.asUInt());
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1185 target.append_child(pugi::node_pcdata).set_value(s.c_str());
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1186 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1187 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1188
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1189 case Json::realValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1190 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1191 std::string s = boost::lexical_cast<std::string>(source.asFloat());
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1192 target.append_child(pugi::node_pcdata).set_value(s.c_str());
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1193 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1194 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1195
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1196 case Json::stringValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1197 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1198 target.append_child(pugi::node_pcdata).set_value(source.asString().c_str());
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1199 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1200 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1201
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1202 case Json::booleanValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1203 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1204 target.append_child(pugi::node_pcdata).set_value(source.asBool() ? "true" : "false");
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1205 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1206 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1207
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1208 case Json::arrayValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1209 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1210 for (Json::Value::ArrayIndex i = 0; i < source.size(); i++)
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1211 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1212 pugi::xml_node node = target.append_child();
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1213 node.set_name(arrayElement.c_str());
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1214 JsonToXmlInternal(node, source[i], arrayElement);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1215 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1216 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1217 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1218
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1219 case Json::objectValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1220 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1221 Json::Value::Members members = source.getMemberNames();
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1222
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1223 for (size_t i = 0; i < members.size(); i++)
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1224 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1225 pugi::xml_node node = target.append_child();
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1226 node.set_name(members[i].c_str());
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1227 JsonToXmlInternal(node, source[members[i]], arrayElement);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1228 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1229
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1230 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1231 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1232
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1233 default:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1234 throw OrthancException(ErrorCode_NotImplemented);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1235 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1236 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1237
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1238
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1239 void Toolbox::JsonToXml(std::string& target,
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1240 const Json::Value& source,
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1241 const std::string& rootElement,
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1242 const std::string& arrayElement)
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1243 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1244 pugi::xml_document doc;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1245
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1246 pugi::xml_node n = doc.append_child(rootElement.c_str());
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1247 JsonToXmlInternal(n, source, arrayElement);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1248
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1249 pugi::xml_node decl = doc.prepend_child(pugi::node_declaration);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1250 decl.append_attribute("version").set_value("1.0");
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1251 decl.append_attribute("encoding").set_value("utf-8");
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1252
3203 810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1253 XmlToString(target, doc);
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1254 }
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1255
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1256 void Toolbox::XmlToString(std::string& target,
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1257 const pugi::xml_document& source)
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1258 {
1045 0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1259 ChunkedBufferWriter writer;
3203 810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1260 source.save(writer, " ", pugi::format_default, pugi::encoding_utf8);
1045 0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1261 writer.Flatten(target);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1262 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1263 #endif
1050 64f1842aae2e Toolbox::ExecuteSystemCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 1045 diff changeset	1264
64f1842aae2e Toolbox::ExecuteSystemCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 1045 diff changeset	1265
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1266
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1267 bool Toolbox::IsInteger(const std::string& str)
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1268 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1269 std::string s = StripSpaces(str);
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1270
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1271 if (s.size() == 0)
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1272 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1273 return false;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1274 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1275
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1276 size_t pos = 0;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1277 if (s[0] == '-')
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1278 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1279 if (s.size() == 1)
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1280 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1281 return false;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1282 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1283
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1284 pos = 1;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1285 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1286
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1287 while (pos < s.size())
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1288 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1289 if (!isdigit(s[pos]))
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1290 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1291 return false;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1292 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1293
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1294 pos++;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1295 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1296
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1297 return true;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1298 }
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1299
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1300
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1301 void Toolbox::CopyJsonWithoutComments(Json::Value& target,
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1302 const Json::Value& source)
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1303 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1304 switch (source.type())
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1305 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1306 case Json::nullValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1307 target = Json::nullValue;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1308 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1309
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1310 case Json::intValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1311 target = source.asInt64();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1312 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1313
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1314 case Json::uintValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1315 target = source.asUInt64();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1316 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1317
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1318 case Json::realValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1319 target = source.asDouble();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1320 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1321
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1322 case Json::stringValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1323 target = source.asString();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1324 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1325
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1326 case Json::booleanValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1327 target = source.asBool();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1328 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1329
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1330 case Json::arrayValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1331 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1332 target = Json::arrayValue;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1333 for (Json::Value::ArrayIndex i = 0; i < source.size(); i++)
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1334 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1335 Json::Value& item = target.append(Json::nullValue);
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1336 CopyJsonWithoutComments(item, source[i]);
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1337 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1338
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1339 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1340 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1341
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1342 case Json::objectValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1343 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1344 target = Json::objectValue;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1345 Json::Value::Members members = source.getMemberNames();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1346 for (Json::Value::ArrayIndex i = 0; i < members.size(); i++)
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1347 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1348 const std::string item = members[i];
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1349 CopyJsonWithoutComments(target[item], source[item]);
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1350 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1351
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1352 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1353 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1354
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1355 default:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1356 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1357 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1358 }
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1359
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1360
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1361 bool Toolbox::StartsWith(const std::string& str,
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1362 const std::string& prefix)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1363 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1364 if (str.size() < prefix.size())
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1365 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1366 return false;
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1367 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1368 else
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1369 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1370 return str.compare(0, prefix.size(), prefix) == 0;
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1371 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1372 }
2043 35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1373
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1374
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1375 static bool IsUnreservedCharacter(char c)
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1376 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1377 // This function checks whether "c" is an unserved character
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1378 // wrt. an URI percent-encoding
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1379 // https://en.wikipedia.org/wiki/Percent-encoding#Percent-encoding%5Fin%5Fa%5FURI
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1380
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1381 return ((c >= 'A' && c <= 'Z') \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1382 (c >= 'a' && c <= 'z') \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1383 (c >= '0' && c <= '9') \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1384 c == '-' \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1385 c == '_' \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1386 c == '.' \|\|
4234 a38376b80cd1 WebDAV: by-studies and by-patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 4203 diff changeset	1387 c == '~' \|\|
a38376b80cd1 WebDAV: by-studies and by-patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 4203 diff changeset	1388 c == '/');
2043 35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1389 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1390
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1391 void Toolbox::UriEncode(std::string& target,
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1392 const std::string& source)
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1393 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1394 // Estimate the length of the percent-encoded URI
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1395 size_t length = 0;
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1396
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1397 for (size_t i = 0; i < source.size(); i++)
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1398 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1399 if (IsUnreservedCharacter(source[i]))
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1400 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1401 length += 1;
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1402 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1403 else
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1404 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1405 // This character must be percent-encoded
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1406 length += 3;
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1407 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1408 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1409
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1410 target.clear();
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1411 target.reserve(length);
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1412
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1413 for (size_t i = 0; i < source.size(); i++)
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1414 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1415 if (IsUnreservedCharacter(source[i]))
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1416 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1417 target.push_back(source[i]);
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1418 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1419 else
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1420 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1421 // This character must be percent-encoded
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1422 uint8_t byte = static_cast<uint8_t>(source[i]);
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1423 uint8_t a = byte >> 4;
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1424 uint8_t b = byte & 0x0f;
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1425
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1426 target.push_back('%');
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1427 target.push_back(a < 10 ? a + '0' : a - 10 + 'A');
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1428 target.push_back(b < 10 ? b + '0' : b - 10 + 'A');
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1429 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1430 }
2071 27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1431 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1432
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1433
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1434 static bool HasField(const Json::Value& json,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1435 const std::string& key,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1436 Json::ValueType expectedType)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1437 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1438 if (json.type() != Json::objectValue \|\|
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1439 !json.isMember(key))
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1440 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1441 return false;
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1442 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1443 else if (json[key].type() == expectedType)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1444 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1445 return true;
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1446 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1447 else
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1448 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1449 throw OrthancException(ErrorCode_BadParameterType);
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1450 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1451 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1452
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1453
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1454 std::string Toolbox::GetJsonStringField(const Json::Value& json,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1455 const std::string& key,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1456 const std::string& defaultValue)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1457 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1458 if (HasField(json, key, Json::stringValue))
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1459 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1460 return json[key].asString();
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1461 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1462 else
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1463 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1464 return defaultValue;
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1465 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1466 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1467
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1468
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1469 bool Toolbox::GetJsonBooleanField(const ::Json::Value& json,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1470 const std::string& key,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1471 bool defaultValue)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1472 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1473 if (HasField(json, key, Json::booleanValue))
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1474 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1475 return json[key].asBool();
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1476 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1477 else
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1478 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1479 return defaultValue;
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1480 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1481 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1482
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1483
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1484 int Toolbox::GetJsonIntegerField(const ::Json::Value& json,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1485 const std::string& key,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1486 int defaultValue)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1487 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1488 if (HasField(json, key, Json::intValue))
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1489 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1490 return json[key].asInt();
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1491 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1492 else
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1493 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1494 return defaultValue;
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1495 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1496 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1497
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1498
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1499 unsigned int Toolbox::GetJsonUnsignedIntegerField(const ::Json::Value& json,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1500 const std::string& key,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1501 unsigned int defaultValue)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1502 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1503 int v = GetJsonIntegerField(json, key, defaultValue);
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1504
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1505 if (v < 0)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1506 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1507 throw OrthancException(ErrorCode_ParameterOutOfRange);
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1508 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1509 else
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1510 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1511 return static_cast<unsigned int>(v);
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1512 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1513 }
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2137 diff changeset	1514
aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2137 diff changeset	1515
2141 a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1516 bool Toolbox::IsUuid(const std::string& str)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1517 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1518 if (str.size() != 36)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1519 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1520 return false;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1521 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1522
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1523 for (size_t i = 0; i < str.length(); i++)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1524 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1525 if (i == 8 \|\| i == 13 \|\| i == 18 \|\| i == 23)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1526 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1527 if (str[i] != '-')
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1528 return false;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1529 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1530 else
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1531 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1532 if (!isalnum(str[i]))
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1533 return false;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1534 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1535 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1536
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1537 return true;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1538 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1539
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1540
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1541 bool Toolbox::StartsWithUuid(const std::string& str)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1542 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1543 if (str.size() < 36)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1544 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1545 return false;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1546 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1547
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1548 if (str.size() == 36)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1549 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1550 return IsUuid(str);
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1551 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1552
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1553 assert(str.size() > 36);
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1554 if (!isspace(str[36]))
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1555 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1556 return false;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1557 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1558
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1559 return IsUuid(str.substr(0, 36));
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1560 }
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1561
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1562
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	1563 #if ORTHANC_ENABLE_LOCALE == 1
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1564 static std::unique_ptr<std::locale> globalLocale_;
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1565
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1566 static bool SetGlobalLocale(const char* locale)
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1567 {
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1568 try
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1569 {
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1570 if (locale == NULL)
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1571 {
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1572 LOG(WARNING) << "Falling back to system-wide default locale";
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1573 globalLocale_.reset(new std::locale());
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1574 }
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1575 else
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1576 {
2351 56504f89d4ac log info Sebastien Jodogne <s.jodogne@gmail.com> parents: 2334 diff changeset	1577 LOG(INFO) << "Using locale: \"" << locale << "\" for case-insensitive comparison of strings";
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1578 globalLocale_.reset(new std::locale(locale));
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1579 }
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1580 }
3459 cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1581 catch (std::runtime_error& e)
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1582 {
3459 cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1583 LOG(ERROR) << "Cannot set globale locale to "
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1584 << (locale ? std::string(locale) : "(null)")
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1585 << ": " << e.what();
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1586 globalLocale_.reset(NULL);
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1587 }
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1588
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1589 return (globalLocale_.get() != NULL);
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1590 }
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1591
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1592
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1593 static void InitializeIcu()
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1594 {
5257 0b183bb77c83 Avoid the use of "externalproject_add()" to build the sample plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	1595 #if (ORTHANC_STATIC_ICU == 1) && (ORTHANC_ENABLE_ICU == 1)
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1596 if (globalIcuData_.empty())
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1597 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1598 LOG(INFO) << "Setting up the ICU common data";
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1599
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1600 GzipCompressor compressor;
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1601 compressor.Uncompress(globalIcuData_,
4032 058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	1602 FrameworkResources::GetFileResourceBuffer(FrameworkResources::LIBICU_DATA),
058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	1603 FrameworkResources::GetFileResourceSize(FrameworkResources::LIBICU_DATA));
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1604
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1605 std::string md5;
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1606 Toolbox::ComputeMD5(md5, globalIcuData_);
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1607
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1608 if (md5 != ORTHANC_ICU_DATA_MD5 \|\|
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1609 globalIcuData_.empty())
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1610 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1611 throw OrthancException(ErrorCode_InternalError,
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1612 "Cannot decode the ICU common data");
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1613 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1614
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1615 // "ICU data is designed to be 16-aligned"
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1616 // http://userguide.icu-project.org/icudata#TOC-Alignment
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1617
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1618 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1619 static const size_t ALIGN = 16;
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1620
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1621 UErrorCode status = U_ZERO_ERROR;
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1622
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1623 if (reinterpret_cast<intptr_t>(globalIcuData_.c_str()) % ALIGN == 0)
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1624 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1625 // Data is already properly aligned
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1626 udata_setCommonData(globalIcuData_.c_str(), &status);
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1627 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1628 else
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1629 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1630 std::string aligned;
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1631 aligned.resize(globalIcuData_.size() + ALIGN - 1);
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1632
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1633 intptr_t offset = reinterpret_cast<intptr_t>(aligned.c_str()) % ALIGN;
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1634 if (offset != 0)
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1635 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1636 offset = ALIGN - offset;
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1637 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1638
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1639 if (offset + globalIcuData_.size() > aligned.size())
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1640 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1641 throw OrthancException(ErrorCode_InternalError, "Cannot align on 16-bytes boundary");
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1642 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1643
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1644 // We don't use "memcpy()", as it expects its data to be aligned
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1645 const uint8_t* p = reinterpret_cast<uint8_t*>(&globalIcuData_[0]);
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1646 uint8_t* q = reinterpret_cast<uint8_t*>(&aligned[0]) + offset;
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1647 for (size_t i = 0; i < globalIcuData_.size(); i++, p++, q++)
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1648 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1649 q = p;
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1650 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1651
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1652 globalIcuData_.swap(aligned);
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1653
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1654 const uint8_t* data = reinterpret_cast<const uint8_t*>(globalIcuData_.c_str()) + offset;
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1655
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1656 if (reinterpret_cast<intptr_t>(data) % ALIGN != 0)
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1657 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1658 throw OrthancException(ErrorCode_InternalError, "Cannot align on 16-bytes boundary");
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1659 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1660 else
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1661 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1662 udata_setCommonData(data, &status);
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1663 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1664 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1665
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1666 if (status != U_ZERO_ERROR)
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1667 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1668 throw OrthancException(ErrorCode_InternalError, "Cannot initialize ICU");
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1669 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1670 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1671
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1672 if (Toolbox::DetectEndianness() != Endianness_Little)
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1673 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1674 // TODO - The data table must be swapped (uint16_t)
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1675 throw OrthancException(ErrorCode_NotImplemented);
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1676 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1677
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1678 // "First-use of ICU from a single thread before the
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1679 // multi-threaded use of ICU begins", to make sure everything is
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1680 // properly initialized (should not be mandatory in our
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1681 // case). We let boost handle calls to "u_init()" and "u_cleanup()".
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1682 // http://userguide.icu-project.org/design#TOC-ICU-Initialization-and-Termination
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1683 uloc_getDefault();
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1684 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1685 #endif
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1686 }
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1687
2330 9c7a80c87ae9 "Locale" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	1688 void Toolbox::InitializeGlobalLocale(const char* locale)
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1689 {
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1690 InitializeIcu();
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1691
3459 cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1692 #if defined(__unix__) && ORTHANC_SANDBOXED != 1
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1693 static const char* LOCALTIME = "/etc/localtime";
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1694
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1695 if (!SystemToolbox::IsExistingFile(LOCALTIME))
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1696 {
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1697 // Check out file
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1698 // "boost_1_69_0/libs/locale/src/icu/time_zone.cpp": Direct
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1699 // access is made to this file if ICU is not used. Crash arises
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1700 // in Boost if the file is a symbolic link to a non-existing
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1701 // file (such as in Ubuntu 16.04 base Docker image).
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1702 throw OrthancException(
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1703 ErrorCode_InternalError,
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1704 "On UNIX-like systems, the file " + std::string(LOCALTIME) +
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1705 " must be present on the filesystem (install \"tzdata\" package on Debian)");
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1706 }
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1707 #endif
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1708
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1709 bool ok;
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1710
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1711 if (locale == NULL)
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1712 {
4203 4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1713 // Make Orthanc use English, United States locale
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1714 // Linux: use "en_US.UTF-8"
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1715 // Windows: use ""
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1716 // Wine: use NULL
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1717
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1718 #if defined(__MINGW32__)
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1719 // Visibly, there is no support of locales in MinGW yet
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1720 // http://mingw.5.n7.nabble.com/How-to-use-std-locale-global-with-MinGW-correct-td33048.html
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1721 static const char* DEFAULT_LOCALE = NULL;
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1722 #elif defined(_WIN32)
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1723 // For Windows: use default locale (using "en_US" does not work)
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1724 static const char* DEFAULT_LOCALE = "";
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1725 #else
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1726 // For Linux & cie
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1727 static const char* DEFAULT_LOCALE = "en_US.UTF-8";
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1728 #endif
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1729
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1730 ok = SetGlobalLocale(DEFAULT_LOCALE);
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1731
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1732 #if defined(__MINGW32__)
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1733 LOG(WARNING) << "This is a MinGW build, case-insensitive comparison of "
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1734 << "strings with accents will not work outside of Wine";
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1735 #endif
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1736 }
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1737 else
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1738 {
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1739 ok = SetGlobalLocale(locale);
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1740 }
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1741
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1742 if (!ok &&
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1743 !SetGlobalLocale(NULL))
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1744 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2931 diff changeset	1745 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2931 diff changeset	1746 "Cannot initialize global locale");
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1747 }
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1748
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1749 }
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1750
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1751
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1752 void Toolbox::FinalizeGlobalLocale()
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1753 {
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1754 globalLocale_.reset();
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1755 }
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1756
2677 0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	1757
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1758 std::string Toolbox::ToUpperCaseWithAccents(const std::string& source)
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1759 {
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1760 bool error = (globalLocale_.get() == NULL);
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1761
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1762 #if ORTHANC_STATIC_ICU == 1
5257 0b183bb77c83 Avoid the use of "externalproject_add()" to build the sample plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	1763 # if ORTHANC_ENABLE_ICU == 0
0b183bb77c83 Avoid the use of "externalproject_add()" to build the sample plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	1764 throw OrthancException(ErrorCode_NotImplemented, "ICU is disabled for this target");
0b183bb77c83 Avoid the use of "externalproject_add()" to build the sample plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	1765 # else
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1766 if (globalIcuData_.empty())
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1767 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1768 error = true;
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1769 }
5257 0b183bb77c83 Avoid the use of "externalproject_add()" to build the sample plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	1770 # endif
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1771 #endif
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1772
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1773 if (error)
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1774 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2931 diff changeset	1775 throw OrthancException(ErrorCode_BadSequenceOfCalls,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2931 diff changeset	1776 "No global locale was set, call Toolbox::InitializeGlobalLocale()");
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1777 }
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1778
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1779 /**
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1780 * A few notes about locales:
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1781 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1782 * (1) We don't use "case folding":
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1783 * http://www.boost.org/doc/libs/1_64_0/libs/locale/doc/html/conversions.html
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1784 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1785 * Characters are made uppercase one by one. This is because, in
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1786 * static builds, we are using iconv, which is visibly not
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1787 * supported correctly (TODO: Understand why). Case folding seems
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1788 * to be working correctly if using the default backend under
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1789 * Linux (ICU or POSIX?). If one wishes to use case folding, one
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1790 * would use:
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1791 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1792 * boost::locale::generator gen;
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1793 * std::locale::global(gen(DEFAULT_LOCALE));
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1794 * return boost::locale::to_upper(source);
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1795 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1796 * (2) The function "boost::algorithm::to_upper_copy" does not
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1797 * make use of the "std::locale::global()". We therefore create a
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1798 * global variable "globalLocale_".
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1799 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1800 * (3) The variant of "boost::algorithm::to_upper_copy()" that
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1801 * uses std::string does not work properly. We need to apply it
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1802 * one wide strings (std::wstring). This explains the two calls to
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1803 * "utf_to_utf" in order to convert to/from std::wstring.
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1804 **/
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1805
2907 0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	1806 std::wstring w = boost::locale::conv::utf_to_utf<wchar_t>(source, boost::locale::conv::skip);
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1807 w = boost::algorithm::to_upper_copy<std::wstring>(w, *globalLocale_);
2907 0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	1808 return boost::locale::conv::utf_to_utf<char>(w, boost::locale::conv::skip);
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1809 }
2373 68380777f9a6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2367 diff changeset	1810 #endif
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1811
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1812
3802 6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1813
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1814 #if ORTHANC_ENABLE_SSL == 0
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1815 /**
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1816 * OpenSSL is disabled
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1817 **/
2678 e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1818 void Toolbox::InitializeOpenSsl()
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1819 {
4706 dbee8bd8ee1f display OpenSSL version in the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 4622 diff changeset	1820 LOG(INFO) << "OpenSSL is disabled";
3802 6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1821 }
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1822
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1823 void Toolbox::FinalizeOpenSsl()
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1824 {
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1825 }
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1826
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1827
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1828 #elif (ORTHANC_ENABLE_SSL == 1 && \
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1829 OPENSSL_VERSION_NUMBER < 0x10100000L)
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1830 /**
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1831 * OpenSSL < 1.1.0
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1832 **/
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1833 void Toolbox::InitializeOpenSsl()
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1834 {
4706 dbee8bd8ee1f display OpenSSL version in the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 4622 diff changeset	1835 LOG(INFO) << "OpenSSL version: " << OPENSSL_VERSION_TEXT;
dbee8bd8ee1f display OpenSSL version in the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 4622 diff changeset	1836
2678 e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1837 // https://wiki.openssl.org/index.php/Library_Initialization
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1838 SSL_library_init();
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1839 SSL_load_error_strings();
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1840 OpenSSL_add_all_algorithms();
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1841 ERR_load_crypto_strings();
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1842 }
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1843
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1844 void Toolbox::FinalizeOpenSsl()
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1845 {
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1846 // Finalize OpenSSL
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1847 // https://wiki.openssl.org/index.php/Library_Initialization#Cleanup
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1848 #ifdef FIPS_mode_set
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1849 FIPS_mode_set(0);
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1850 #endif
3720 faa695f433d5 upgraded OpenSSL to 1.1.1d Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1851
faa695f433d5 upgraded OpenSSL to 1.1.1d Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1852 #if !defined(OPENSSL_NO_ENGINE)
2678 e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1853 ENGINE_cleanup();
3720 faa695f433d5 upgraded OpenSSL to 1.1.1d Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1854 #endif
faa695f433d5 upgraded OpenSSL to 1.1.1d Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1855
2678 e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1856 CONF_modules_unload(1);
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1857 EVP_cleanup();
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1858 CRYPTO_cleanup_all_ex_data();
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1859 ERR_remove_state(0);
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1860 ERR_free_strings();
3802 6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1861 }
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1862
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1863
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1864 #elif (ORTHANC_ENABLE_SSL == 1 && \
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1865 OPENSSL_VERSION_NUMBER >= 0x10100000L)
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1866 /**
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1867 * OpenSSL >= 1.1.0. In this case, the initialization is
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1868 * automatically done by the functions of OpenSSL.
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1869 * https://wiki.openssl.org/index.php/Library_Initialization
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1870 **/
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1871 void Toolbox::InitializeOpenSsl()
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1872 {
4706 dbee8bd8ee1f display OpenSSL version in the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 4622 diff changeset	1873 LOG(INFO) << "OpenSSL version: " << OPENSSL_VERSION_TEXT;
3802 6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1874 }
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1875
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1876 void Toolbox::FinalizeOpenSsl()
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1877 {
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1878 }
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1879
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1880 #else
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1881 # error "Support your platform here"
2678 e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1882 #endif
3802 6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1883
2678 e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1884
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1885
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1886 std::string Toolbox::GenerateUuid()
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1887 {
5660 e4d9a872998f replaced incorrect macro WIN32 by _WIN32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5640 diff changeset	1888 #ifdef _WIN32
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1889 UUID uuid;
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1890 UuidCreate ( &uuid );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1891
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1892 unsigned char * str;
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1893 UuidToStringA ( &uuid, &str );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1894
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1895 std::string s( ( char* ) str );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1896
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1897 RpcStringFreeA ( &str );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1898 #else
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1899 uuid_t uuid;
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1900 uuid_generate_random ( uuid );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1901 char s[37];
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1902 uuid_unparse ( uuid, s );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1903 #endif
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1904 return s;
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1905 }
2920 ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1906
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1907
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1908 namespace
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1909 {
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1910 // Anonymous namespace to avoid clashes between compilation modules
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1911
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1912 class VariableFormatter
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1913 {
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1914 public:
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1915 typedef std::map<std::string, std::string> Dictionary;
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1916
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1917 private:
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1918 const Dictionary& dictionary_;
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1919
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1920 public:
4203 4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1921 explicit VariableFormatter(const Dictionary& dictionary) :
2920 ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1922 dictionary_(dictionary)
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1923 {
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1924 }
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1925
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1926 template<typename Out>
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1927 Out operator()(const boost::smatch& what,
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1928 Out out) const
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1929 {
2921 0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1930 if (!what[1].str().empty())
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1931 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1932 // Variable without a default value
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1933 Dictionary::const_iterator found = dictionary_.find(what[1]);
2920 ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1934
2921 0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1935 if (found != dictionary_.end())
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1936 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1937 const std::string& value = found->second;
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1938 out = std::copy(value.begin(), value.end(), out);
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1939 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1940 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1941 else
2920 ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1942 {
2921 0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1943 // Variable with a default value
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1944 std::string key;
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1945 std::string defaultValue;
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1946
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1947 if (!what[2].str().empty())
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1948 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1949 key = what[2].str();
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1950 defaultValue = what[3].str();
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1951 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1952 else if (!what[4].str().empty())
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1953 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1954 key = what[4].str();
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1955 defaultValue = what[5].str();
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1956 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1957 else if (!what[6].str().empty())
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1958 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1959 key = what[6].str();
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1960 defaultValue = what[7].str();
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1961 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1962 else
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1963 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1964 throw OrthancException(ErrorCode_InternalError);
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1965 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1966
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1967 Dictionary::const_iterator found = dictionary_.find(key);
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1968
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1969 if (found == dictionary_.end())
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1970 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1971 out = std::copy(defaultValue.begin(), defaultValue.end(), out);
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1972 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1973 else
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1974 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1975 const std::string& value = found->second;
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1976 out = std::copy(value.begin(), value.end(), out);
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1977 }
2920 ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1978 }
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1979
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1980 return out;
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1981 }
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1982 };
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1983 }
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1984
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1985
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1986 std::string Toolbox::SubstituteVariables(const std::string& source,
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1987 const std::map<std::string, std::string>& dictionary)
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1988 {
2926 0bcf46cea4e4 fix for older versions of boost::regex Sebastien Jodogne <s.jodogne@gmail.com> parents: 2921 diff changeset	1989 const boost::regex pattern("\\$\\{([^:]*?)\\}\|" // ${what[1]}
0bcf46cea4e4 fix for older versions of boost::regex Sebastien Jodogne <s.jodogne@gmail.com> parents: 2921 diff changeset	1990 "\\$\\{([^:]?):-([^'\"]?)\\}\|" // ${what[2]:-what[3]}
0bcf46cea4e4 fix for older versions of boost::regex Sebastien Jodogne <s.jodogne@gmail.com> parents: 2921 diff changeset	1991 "\\$\\{([^:]?):-\"([^\"]?)\"\\}\|" // ${what[4]:-"what[5]"}
0bcf46cea4e4 fix for older versions of boost::regex Sebastien Jodogne <s.jodogne@gmail.com> parents: 2921 diff changeset	1992 "\\$\\{([^:]?):-'([^']?)'\\}"); // ${what[6]:-'what[7]'}
2920 ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1993
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1994 VariableFormatter formatter(dictionary);
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1995
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1996 return boost::regex_replace(source, pattern, formatter);
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1997 }
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1998
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1999
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2000 namespace Iso2022
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2001 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2002 /**
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2003 Returns whether the string s contains a single-byte control message
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2004 at index i
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2005 **/
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2006 static inline bool IsControlMessage1(const std::string& s, size_t i)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2007 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2008 if (i < s.size())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2009 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2010 char c = s[i];
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2011 return
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2012 (c == '\x0f') \|\| // Locking shift zero
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2013 (c == '\x0e'); // Locking shift one
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2014 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2015 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2016 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2017 return false;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2018 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2019 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2020
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2021 /**
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2022 Returns whether the string s contains a double-byte control message
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2023 at index i
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2024 **/
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2025 static inline size_t IsControlMessage2(const std::string& s, size_t i)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2026 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2027 if (i + 1 < s.size())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2028 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2029 char c1 = s[i];
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2030 char c2 = s[i + 1];
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2031 return (c1 == 0x1b) && (
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2032 (c2 == '\x6e') \|\| // Locking shift two
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2033 (c2 == '\x6f') \|\| // Locking shift three
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2034 (c2 == '\x4e') \|\| // Single shift two (alt)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2035 (c2 == '\x4f') \|\| // Single shift three (alt)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2036 (c2 == '\x7c') \|\| // Locking shift three right
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2037 (c2 == '\x7d') \|\| // Locking shift two right
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2038 (c2 == '\x7e') // Locking shift one right
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2039 );
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2040 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2041 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2042 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2043 return false;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2044 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2045 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2046
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2047 /**
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2048 Returns whether the string s contains a triple-byte control message
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2049 at index i
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2050 **/
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2051 static inline size_t IsControlMessage3(const std::string& s, size_t i)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2052 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2053 if (i + 2 < s.size())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2054 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2055 char c1 = s[i];
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2056 char c2 = s[i + 1];
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2057 char c3 = s[i + 2];
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2058 return ((c1 == '\x8e' && c2 == 0x1b && c3 == '\x4e') \|\|
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2059 (c1 == '\x8f' && c2 == 0x1b && c3 == '\x4f'));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2060 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2061 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2062 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2063 return false;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2064 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2065 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2066
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2067 /**
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2068 This function returns true if the index i in the supplied string s:
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2069 - is valid
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2070 - contains the c character
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2071 This function returns false otherwise.
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2072 **/
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2073 static inline bool TestCharValue(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2074 const std::string& s, size_t i, char c)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2075 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2076 if (i < s.size())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2077 return s[i] == c;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2078 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2079 return false;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2080 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2081
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2082 /**
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2083 This function returns true if the index i in the supplied string s:
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2084 - is valid
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2085 - has a c character that is >= cMin and <= cMax (included)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2086 This function returns false otherwise.
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2087 **/
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2088 static inline bool TestCharRange(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2089 const std::string& s, size_t i, char cMin, char cMax)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2090 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2091 if (i < s.size())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2092 return (s[i] >= cMin) && (s[i] <= cMax);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2093 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2094 return false;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2095 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2096
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2097 /**
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2098 This function returns the total length in bytes of the escape sequence
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2099 located in string s at index i, if there is one, or 0 otherwise.
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2100 **/
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2101 static inline size_t GetEscapeSequenceLength(const std::string& s, size_t i)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2102 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2103 if (TestCharValue(s, i, 0x1b))
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2104 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2105 size_t j = i+1;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2106
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2107 // advance reading cursor while we are in a sequence
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2108 while (TestCharRange(s, j, '\x20', '\x2f'))
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2109 ++j;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2110
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2111 // check there is a valid termination byte AND we're long enough (there
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2112 // must be at least one byte between 0x20 and 0x2f
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2113 if (TestCharRange(s, j, '\x30', '\x7f') && (j - i) >= 2)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2114 return j - i + 1;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2115 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2116 return 0;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2117 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2118 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2119 return 0;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2120 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2121 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2122
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2123
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2124
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2125 /**
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2126 This function will strip all ISO/IEC 2022 control codes and escape
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2127 sequences.
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2128 Please see https://en.wikipedia.org/wiki/ISO/IEC_2022 (as of 2019-02)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2129 for a list of those.
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2130
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2131 Please note that this operation is potentially destructive, because
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2132 it removes the character set information from the byte stream.
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2133
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2134 However, in the case where the encoding is unique, then suppressing
3973 d86bddb50972 fix spelling errors according to debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 3802 diff changeset	2135 the escape sequences allows one to provide us with a clean string after
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2136 conversion to utf-8 with boost.
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2137 **/
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2138 void Toolbox::RemoveIso2022EscapeSequences(std::string& dest, const std::string& src)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2139 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2140 // we need AT MOST the same size as the source string in the output
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2141 dest.clear();
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2142 if (dest.capacity() < src.size())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2143 dest.reserve(src.size());
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2144
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2145 size_t i = 0;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2146
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2147 // uint8_t view to the string
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2148 while (i < src.size())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2149 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2150 size_t j = i;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2151
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2152 // The i index will only be incremented if a message is detected
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2153 // in that case, the message is skipped and the index is set to the
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2154 // next position to read
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2155 if (Iso2022::IsControlMessage1(src, i))
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2156 i += 1;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2157 else if (Iso2022::IsControlMessage2(src, i))
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2158 i += 2;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2159 else if (Iso2022::IsControlMessage3(src, i))
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2160 i += 3;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2161 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2162 i += Iso2022::GetEscapeSequenceLength(src, i);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2163
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2164 // if the index was NOT incremented, this means there was no message at
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2165 // this location: we then may copy the character at this index and
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2166 // increment the index to point to the next read position
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2167 if (j == i)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2168 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2169 dest.push_back(src[i]);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2170 i++;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2171 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2172 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2173 }
3322 b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2174
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2175
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2176 void Toolbox::Utf8ToUnicodeCharacter(uint32_t& unicode,
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2177 size_t& length,
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2178 const std::string& utf8,
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2179 size_t position)
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2180 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2181 // https://en.wikipedia.org/wiki/UTF-8
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2182
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2183 static const uint8_t MASK_IS_1_BYTE = 0x80; // printf '0x%x\n' "$((2#10000000))"
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2184 static const uint8_t TEST_IS_1_BYTE = 0x00;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2185
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2186 static const uint8_t MASK_IS_2_BYTES = 0xe0; // printf '0x%x\n' "$((2#11100000))"
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2187 static const uint8_t TEST_IS_2_BYTES = 0xc0; // printf '0x%x\n' "$((2#11000000))"
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2188
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2189 static const uint8_t MASK_IS_3_BYTES = 0xf0; // printf '0x%x\n' "$((2#11110000))"
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2190 static const uint8_t TEST_IS_3_BYTES = 0xe0; // printf '0x%x\n' "$((2#11100000))"
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2191
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2192 static const uint8_t MASK_IS_4_BYTES = 0xf8; // printf '0x%x\n' "$((2#11111000))"
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2193 static const uint8_t TEST_IS_4_BYTES = 0xf0; // printf '0x%x\n' "$((2#11110000))"
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2194
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2195 static const uint8_t MASK_CONTINUATION = 0xc0; // printf '0x%x\n' "$((2#11000000))"
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2196 static const uint8_t TEST_CONTINUATION = 0x80; // printf '0x%x\n' "$((2#10000000))"
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2197
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2198 if (position >= utf8.size())
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2199 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2200 throw OrthancException(ErrorCode_ParameterOutOfRange);
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2201 }
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2202
3324 87396c571109 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 3322 diff changeset	2203 assert(sizeof(uint8_t) == sizeof(char));
87396c571109 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 3322 diff changeset	2204 const uint8_t* buffer = reinterpret_cast<const uint8_t*>(utf8.c_str()) + position;
3322 b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2205
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2206 if ((buffer[0] & MASK_IS_1_BYTE) == TEST_IS_1_BYTE)
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2207 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2208 length = 1;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2209 unicode = buffer[0] & ~MASK_IS_1_BYTE;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2210 }
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2211 else if ((buffer[0] & MASK_IS_2_BYTES) == TEST_IS_2_BYTES &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2212 position + 1 < utf8.size() &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2213 (buffer[1] & MASK_CONTINUATION) == TEST_CONTINUATION)
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2214 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2215 length = 2;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2216 uint32_t a = buffer[0] & ~MASK_IS_2_BYTES;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2217 uint32_t b = buffer[1] & ~MASK_CONTINUATION;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2218 unicode = (a << 6) \| b;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2219 }
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2220 else if ((buffer[0] & MASK_IS_3_BYTES) == TEST_IS_3_BYTES &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2221 position + 2 < utf8.size() &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2222 (buffer[1] & MASK_CONTINUATION) == TEST_CONTINUATION &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2223 (buffer[2] & MASK_CONTINUATION) == TEST_CONTINUATION)
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2224 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2225 length = 3;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2226 uint32_t a = buffer[0] & ~MASK_IS_3_BYTES;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2227 uint32_t b = buffer[1] & ~MASK_CONTINUATION;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2228 uint32_t c = buffer[2] & ~MASK_CONTINUATION;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2229 unicode = (a << 12) \| (b << 6) \| c;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2230 }
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2231 else if ((buffer[0] & MASK_IS_4_BYTES) == TEST_IS_4_BYTES &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2232 position + 3 < utf8.size() &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2233 (buffer[1] & MASK_CONTINUATION) == TEST_CONTINUATION &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2234 (buffer[2] & MASK_CONTINUATION) == TEST_CONTINUATION &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2235 (buffer[3] & MASK_CONTINUATION) == TEST_CONTINUATION)
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2236 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2237 length = 4;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2238 uint32_t a = buffer[0] & ~MASK_IS_4_BYTES;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2239 uint32_t b = buffer[1] & ~MASK_CONTINUATION;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2240 uint32_t c = buffer[2] & ~MASK_CONTINUATION;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2241 uint32_t d = buffer[3] & ~MASK_CONTINUATION;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2242 unicode = (a << 18) \| (b << 12) \| (c << 6) \| d;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2243 }
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2244 else
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2245 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2246 // This is not a valid UTF-8 encoding
3324 87396c571109 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 3322 diff changeset	2247 throw OrthancException(ErrorCode_BadFileFormat, "Invalid UTF-8 string");
3322 b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2248 }
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2249 }
3608 7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2250
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2251
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2252 std::string Toolbox::LargeHexadecimalToDecimal(const std::string& hex)
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2253 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2254 /**
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2255 * NB: Focus of the code below is not efficiency, but
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2256 * readability!
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2257 **/
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2258
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2259 for (size_t i = 0; i < hex.size(); i++)
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2260 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2261 const char c = hex[i];
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2262 if (!((c >= 'A' && c <= 'F') \|\|
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2263 (c >= 'a' && c <= 'f') \|\|
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2264 (c >= '0' && c <= '9')))
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2265 {
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4234 diff changeset	2266 throw OrthancException(ErrorCode_ParameterOutOfRange,
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4234 diff changeset	2267 "Not an hexadecimal number");
3608 7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2268 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2269 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2270
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2271 std::vector<uint8_t> decimal;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2272 decimal.push_back(0);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2273
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2274 for (size_t i = 0; i < hex.size(); i++)
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2275 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2276 uint8_t hexDigit = static_cast<uint8_t>(Hex2Dec(hex[i]));
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2277 assert(hexDigit <= 15);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2278
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2279 for (size_t j = 0; j < decimal.size(); j++)
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2280 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2281 uint8_t val = static_cast<uint8_t>(decimal[j]) * 16 + hexDigit; // Maximum: 9 * 16 + 15
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2282 assert(val <= 159 /* == 9 * 16 + 15 */);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2283
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2284 decimal[j] = val % 10;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2285 hexDigit = val / 10;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2286 assert(hexDigit <= 15 /* == 159 / 10 */);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2287 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2288
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2289 while (hexDigit > 0)
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2290 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2291 decimal.push_back(hexDigit % 10);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2292 hexDigit /= 10;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2293 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2294 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2295
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2296 size_t start = 0;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2297 while (start < decimal.size() &&
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2298 decimal[start] == '0')
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2299 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2300 start++;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2301 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2302
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2303 std::string s;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2304 s.reserve(decimal.size() - start);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2305
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2306 for (size_t i = decimal.size(); i > start; i--)
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2307 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2308 s.push_back(decimal[i - 1] + '0');
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2309 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2310
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2311 return s;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2312 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2313
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2314
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2315 std::string Toolbox::GenerateDicomPrivateUniqueIdentifier()
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2316 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2317 /**
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2318 * REFERENCE: "Creating a Privately Defined Unique Identifier
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2319 * (Informative)" / "UUID Derived UID"
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2320 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part05/sect_B.2.html
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2321 * https://stackoverflow.com/a/46316162/881731
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2322 **/
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2323
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2324 std::string uuid = GenerateUuid();
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2325 assert(IsUuid(uuid) && uuid.size() == 36);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2326
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2327 /**
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2328 * After removing the four dashes ("-") out of the 36-character
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2329 * UUID, we get a large hexadecimal number with 32 characters,
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2330 * each of those characters lying in the range [0,16[. The large
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2331 * number is thus in the [0,16^32[ = [0,256^16[ range. This number
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2332 * has a maximum of 39 decimal digits, as can be seen in Python:
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2333 *
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2334 * # python -c 'import math; print(math.log(16**32))/math.log(10))'
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2335 * 38.531839445
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2336 *
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2337 * We now to convert the large hexadecimal number to a decimal
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2338 * number with up to 39 digits, remove the leading zeros, then
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2339 * prefix it with "2.25."
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2340 **/
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2341
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2342 // Remove the dashes
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2343 std::string hex = (uuid.substr(0, 8) +
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2344 uuid.substr(9, 4) +
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2345 uuid.substr(14, 4) +
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2346 uuid.substr(19, 4) +
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2347 uuid.substr(24, 12));
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2348 assert(hex.size() == 32);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2349
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2350 return "2.25." + LargeHexadecimalToDecimal(hex);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2351 }
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2352
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2353
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2354 void Toolbox::SimplifyDicomAsJson(Json::Value& target,
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2355 const Json::Value& source,
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2356 DicomToJsonFormat format)
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2357 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2358 if (!source.isObject())
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2359 {
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4234 diff changeset	2360 throw OrthancException(ErrorCode_BadFileFormat);
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2361 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2362
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2363 target = Json::objectValue;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2364 Json::Value::Members members = source.getMemberNames();
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2365
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2366 for (size_t i = 0; i < members.size(); i++)
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2367 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2368 const Json::Value& v = source[members[i]];
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2369 const std::string& type = v["Type"].asString();
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2370
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2371 std::string name;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2372 switch (format)
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2373 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2374 case DicomToJsonFormat_Human:
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2375 name = v["Name"].asString();
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2376 break;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2377
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2378 case DicomToJsonFormat_Short:
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2379 name = members[i];
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2380 break;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2381
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2382 default:
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2383 throw OrthancException(ErrorCode_ParameterOutOfRange);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2384 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2385
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2386 if (type == "String")
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2387 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2388 target[name] = v["Value"].asString();
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2389 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2390 else if (type == "TooLong" \|\|
4527 31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	2391 type == "Null" \|\|
31f940334496 Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	2392 type == "Binary")
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2393 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2394 target[name] = Json::nullValue;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2395 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2396 else if (type == "Sequence")
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2397 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2398 const Json::Value& array = v["Value"];
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2399 assert(array.isArray());
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2400
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2401 Json::Value children = Json::arrayValue;
4203 4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	2402 for (Json::Value::ArrayIndex j = 0; j < array.size(); j++)
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2403 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2404 Json::Value c;
4203 4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	2405 SimplifyDicomAsJson(c, array[j], format);
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2406 children.append(c);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2407 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2408
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2409 target[name] = children;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2410 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2411 else
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2412 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2413 assert(0);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2414 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2415 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2416 }
4392 3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	2417
3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	2418
4397 3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2419 static bool ReadJsonInternal(Json::Value& target,
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2420 const void* buffer,
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2421 size_t size,
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2422 bool collectComments)
4392 3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	2423 {
4393 e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2424 #if JSONCPP_USE_DEPRECATED == 1
4392 3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	2425 Json::Reader reader;
3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	2426 return reader.parse(reinterpret_cast<const char*>(buffer),
4397 3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2427 reinterpret_cast<const char*>(buffer) + size, target, collectComments);
4393 e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2428 #else
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2429 Json::CharReaderBuilder builder;
4397 3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2430 builder.settings_["collectComments"] = collectComments;
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2431
4393 e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2432 const std::unique_ptr<Json::CharReader> reader(builder.newCharReader());
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2433 assert(reader.get() != NULL);
4397 3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2434
4393 e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2435 JSONCPP_STRING err;
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2436 if (reader->parse(reinterpret_cast<const char*>(buffer),
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2437 reinterpret_cast<const char*>(buffer) + size, &target, &err))
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2438 {
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2439 return true;
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2440 }
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2441 else
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2442 {
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2443 LOG(ERROR) << "Cannot parse JSON: " << err;
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2444 return false;
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2445 }
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2446 #endif
4392 3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	2447 }
4397 3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2448
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2449
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2450 bool Toolbox::ReadJson(Json::Value& target,
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2451 const std::string& source)
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2452 {
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2453 return ReadJson(target, source.empty() ? NULL : source.c_str(), source.size());
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2454 }
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2455
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2456
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2457 bool Toolbox::ReadJson(Json::Value& target,
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2458 const void* buffer,
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2459 size_t size)
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2460 {
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2461 return ReadJsonInternal(target, buffer, size, true);
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2462 }
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2463
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2464
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2465 bool Toolbox::ReadJsonWithoutComments(Json::Value& target,
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2466 const std::string& source)
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2467 {
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2468 return ReadJsonWithoutComments(target, source.empty() ? NULL : source.c_str(), source.size());
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2469 }
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2470
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2471
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2472 bool Toolbox::ReadJsonWithoutComments(Json::Value& target,
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2473 const void* buffer,
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2474 size_t size)
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2475 {
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2476 return ReadJsonInternal(target, buffer, size, false);
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2477 }
4392 3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	2478
3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	2479
4394 f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2480 void Toolbox::WriteFastJson(std::string& target,
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2481 const Json::Value& source)
4392 3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	2482 {
4393 e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2483 #if JSONCPP_USE_DEPRECATED == 1
4394 f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2484 Json::FastWriter writer;
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2485 target = writer.write(source);
4393 e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2486 #else
4394 f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2487 Json::StreamWriterBuilder builder;
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2488 builder.settings_["indentation"] = "";
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2489 target = Json::writeString(builder, source);
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2490 #endif
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2491 }
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2492
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2493
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2494 void Toolbox::WriteStyledJson(std::string& target,
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2495 const Json::Value& source)
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2496 {
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2497 #if JSONCPP_USE_DEPRECATED == 1
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2498 Json::StyledWriter writer;
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2499 target = writer.write(source);
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2500 #else
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2501 Json::StreamWriterBuilder builder;
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2502 builder.settings_["indentation"] = " ";
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2503 target = Json::writeString(builder, source);
4393 e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2504 #endif
4392 3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	2505 }
4622 9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2506
9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2507
9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2508 void Toolbox::RemoveSurroundingQuotes(std::string& value)
9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2509 {
9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2510 if (!value.empty() &&
9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2511 value[0] == '\"' &&
9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2512 value[value.size() - 1] == '\"')
9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2513 {
9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2514 value = value.substr(1, value.size() - 2);
9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2515 }
9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2516 }
5390 1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2517
5430 b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2518 Toolbox::ElapsedTimer::ElapsedTimer()
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2519 {
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2520 Restart();
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2521 }
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2522
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2523 void Toolbox::ElapsedTimer::Restart()
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2524 {
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2525 start_ = boost::posix_time::microsec_clock::universal_time();
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2526 }
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2527
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2528 uint64_t Toolbox::ElapsedTimer::GetElapsedMilliseconds()
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2529 {
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2530 return GetElapsedNanoseconds() / 1000000;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2531 }
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2532
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2533 uint64_t Toolbox::ElapsedTimer::GetElapsedMicroseconds()
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2534 {
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2535 return GetElapsedNanoseconds() / 1000;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2536 }
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2537
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2538 uint64_t Toolbox::ElapsedTimer::GetElapsedNanoseconds()
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2539 {
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2540 boost::posix_time::ptime now = boost::posix_time::microsec_clock::universal_time();
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2541 boost::posix_time::time_duration diff = now - start_;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2542 return static_cast<uint64_t>(diff.total_nanoseconds());
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2543 }
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2544
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2545 std::string Toolbox::ElapsedTimer::GetHumanElapsedDuration()
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2546 {
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2547 return Toolbox::GetHumanDuration(GetElapsedNanoseconds());
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2548 }
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2549
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2550 // in "full" mode, returns " 26.45MB in 2.25s = 94.04Mbps"
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2551 // else, returns "94.04Mbps"
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2552 std::string Toolbox::ElapsedTimer::GetHumanTransferSpeed(bool full, uint64_t sizeInBytes)
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2553 {
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2554 return Toolbox::GetHumanTransferSpeed(full, sizeInBytes, GetElapsedNanoseconds());
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2555 }
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2556
5390 1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2557 Toolbox::ElapsedTimeLogger::ElapsedTimeLogger(const std::string& message)
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2558 : message_(message),
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2559 logged_(false)
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2560 {
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2561 Restart();
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2562 }
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2563
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2564 Toolbox::ElapsedTimeLogger::~ElapsedTimeLogger()
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2565 {
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2566 if (!logged_)
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2567 {
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2568 StopAndLog();
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2569 }
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2570 }
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2571
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2572 void Toolbox::ElapsedTimeLogger::Restart()
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2573 {
5430 b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2574 timer_.Restart();
5390 1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2575 }
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2576
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2577 void Toolbox::ElapsedTimeLogger::StopAndLog()
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2578 {
5430 b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2579 LOG(WARNING) << "ELAPSED TIMER: " << message_ << " (" << timer_.GetElapsedMicroseconds() << " us)";
5390 1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2580 logged_ = true;
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2581 }
1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2582
5430 b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2583 std::string Toolbox::GetHumanFileSize(uint64_t sizeInBytes)
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2584 {
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2585 if (sizeInBytes < 1024)
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2586 {
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2587 std::ostringstream oss;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2588 oss << sizeInBytes << "bytes";
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2589 return oss.str();
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2590 }
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2591 else
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2592 {
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2593 static const char* suffixes[] = {"KB", "MB", "GB", "TB"};
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2594 static const int suffixesCount = sizeof(suffixes) / sizeof(suffixes[0]);
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2595
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2596 int i = 0;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2597 double size = static_cast<double>(sizeInBytes)/1024.0;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2598
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2599 while (size >= 1024.0 && i < suffixesCount - 1)
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2600 {
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2601 size /= 1024.0;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2602 i++;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2603 }
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2604
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2605 std::ostringstream oss;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2606 oss << std::fixed << std::setprecision(2) << size << suffixes[i];
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2607 return oss.str();
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2608 }
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2609 }
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2610
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2611 std::string Toolbox::GetHumanDuration(uint64_t durationInNanoseconds)
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2612 {
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2613 if (durationInNanoseconds < 1024)
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2614 {
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2615 std::ostringstream oss;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2616 oss << durationInNanoseconds << "ns";
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2617 return oss.str();
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2618 }
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2619 else
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2620 {
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2621 static const char* suffixes[] = {"ns", "us", "ms", "s"};
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2622 static const int suffixesCount = sizeof(suffixes) / sizeof(suffixes[0]);
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2623
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2624 int i = 0;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2625 double duration = static_cast<double>(durationInNanoseconds);
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2626
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2627 while (duration >= 1000.0 && i < suffixesCount - 1)
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2628 {
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2629 duration /= 1000.0;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2630 i++;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2631 }
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2632
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2633 std::ostringstream oss;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2634 oss << std::fixed << std::setprecision(2) << duration << suffixes[i];
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2635 return oss.str();
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2636 }
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2637 }
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2638
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2639 std::string Toolbox::GetHumanTransferSpeed(bool full, uint64_t sizeInBytes, uint64_t durationInNanoseconds)
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2640 {
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2641 // in "full" mode, returns " 26.45MB in 2.25s = 94.04Mbps"
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2642 // else, return "94.04Mbps"
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2643
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2644 if (full)
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2645 {
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2646 std::ostringstream oss;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2647 oss << Toolbox::GetHumanFileSize(sizeInBytes) << " in " << Toolbox::GetHumanDuration(durationInNanoseconds) << " = " << GetHumanTransferSpeed(false, sizeInBytes, durationInNanoseconds);
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2648 return oss.str();
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2649 }
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2650
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2651 double throughputInBps = 8.0 * 1000000000.0 * static_cast<double>(sizeInBytes) / static_cast<double>(durationInNanoseconds);
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2652
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2653 if (throughputInBps < 1000.0)
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2654 {
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2655 std::ostringstream oss;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2656 oss << throughputInBps << "bps";
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2657 return oss.str();
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2658 }
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2659 else
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2660 {
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2661 throughputInBps /= 1000.0;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2662 static const char* suffixes[] = {"kbps", "Mbps", "Gbps"};
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2663 static const int suffixesCount = sizeof(suffixes) / sizeof(suffixes[0]);
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2664
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2665 int i = 0;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2666
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2667 while (throughputInBps >= 1000.0 && i < suffixesCount - 1)
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2668 {
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2669 throughputInBps /= 1000.0;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2670 i++;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2671 }
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2672
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2673 std::ostringstream oss;
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2674 oss << std::fixed << std::setprecision(2) << throughputInBps << suffixes[i];
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2675 return oss.str();
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2676 }
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2677 }
b83192e7ad10 Now displaying timings when reading from/writing to disk in the verbose logs Alain Mazy <am@osimis.io> parents: 5390 diff changeset	2678
5390 1c3b0cf341f0 Toolbox: added ElapsedTimeLogger debug tool Alain Mazy <am@osimis.io> parents: 5381 diff changeset	2679
5575 d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2680 bool Toolbox::ParseVersion(unsigned int& major,
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2681 unsigned int& minor,
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2682 unsigned int& revision,
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2683 const char* version)
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2684 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2685 if (version == NULL)
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2686 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2687 throw OrthancException(ErrorCode_NullPointer);
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2688 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2689
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2690 #ifdef _MSC_VER
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2691 #define ORTHANC_SCANF sscanf_s
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2692 #else
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2693 #define ORTHANC_SCANF sscanf
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2694 #endif
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2695
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2696 int a, b, c;
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2697 if (ORTHANC_SCANF(version, "%4d.%4d.%4d", &a, &b, &c) == 3)
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2698 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2699 if (a >= 0 &&
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2700 b >= 0 &&
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2701 c >= 0)
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2702 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2703 major = static_cast<unsigned int>(a);
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2704 minor = static_cast<unsigned int>(b);
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2705 revision = static_cast<unsigned int>(c);
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2706 return true;
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2707 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2708 else
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2709 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2710 return false;
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2711 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2712 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2713 else if (ORTHANC_SCANF(version, "%4d.%4d", &a, &b) == 2)
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2714 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2715 if (a >= 0 &&
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2716 b >= 0)
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2717 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2718 major = static_cast<unsigned int>(a);
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2719 minor = static_cast<unsigned int>(b);
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2720 revision = 0;
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2721 return true;
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2722 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2723 else
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2724 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2725 return false;
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2726 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2727 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2728 else if (ORTHANC_SCANF(version, "%4d", &a) == 1 &&
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2729 a >= 0)
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2730 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2731 if (a >= 0)
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2732 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2733 major = static_cast<unsigned int>(a);
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2734 minor = 0;
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2735 revision = 0;
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2736 return true;
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2737 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2738 else
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2739 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2740 return false;
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2741 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2742 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2743 else
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2744 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2745 return false;
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2746 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2747 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2748
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2749
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2750 bool Toolbox::IsVersionAbove(const char* version,
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2751 unsigned int major,
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2752 unsigned int minor,
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2753 unsigned int revision)
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2754 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2755 /**
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2756 * Note: Similar standalone functions are implemented in
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2757 * "OrthancCPlugin.h" and "OrthancPluginCppWrapper.cpp".
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2758 **/
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2759
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2760 unsigned int actualMajor, actualMinor, actualRevision;
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2761
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2762 if (version == NULL)
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2763 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2764 throw OrthancException(ErrorCode_NullPointer);
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2765 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2766 else if (!strcmp(version, "mainline"))
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2767 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2768 // Assume compatibility with the mainline
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2769 return true;
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2770 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2771 else if (ParseVersion(actualMajor, actualMinor, actualRevision, version))
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2772 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2773 if (actualMajor > major)
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2774 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2775 return true;
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2776 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2777
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2778 if (actualMajor < major)
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2779 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2780 return false;
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2781 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2782
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2783 // Check the minor version number
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2784 assert(actualMajor == major);
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2785
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2786 if (actualMinor > minor)
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2787 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2788 return true;
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2789 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2790
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2791 if (actualMinor < minor)
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2792 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2793 return false;
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2794 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2795
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2796 // Check the patch level version number
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2797 assert(actualMajor == major);
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2798
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2799 if (actualRevision >= revision)
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2800 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2801 return true;
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2802 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2803 else
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2804 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2805 return false;
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2806 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2807 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2808 else
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2809 {
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2810 throw OrthancException(ErrorCode_ParameterOutOfRange, "Not a valid version: " + std::string(version));
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2811 }
d7eaa568da15 Orthanc::Logging automatically detects whether the Orthanc core supports OrthancPluginLogMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	2812 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2813 }
2513 97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2814
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2815
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2816
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2817 OrthancLinesIterator* OrthancLinesIterator_Create(const std::string& content)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2818 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2819 return reinterpret_cast<OrthancLinesIterator*>(new Orthanc::Toolbox::LinesIterator(content));
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2820 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2821
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2822
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2823 bool OrthancLinesIterator_GetLine(std::string& target,
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3973 diff changeset	2824 const OrthancLinesIterator* iterator)
2513 97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2825 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2826 if (iterator != NULL)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2827 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2828 return reinterpret_cast<const Orthanc::Toolbox::LinesIterator*>(iterator)->GetLine(target);
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2829 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2830 else
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2831 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2832 return false;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2833 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2834 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2835
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2836
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2837 void OrthancLinesIterator_Next(OrthancLinesIterator* iterator)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2838 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2839 if (iterator != NULL)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2840 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2841 reinterpret_cast<Orthanc::Toolbox::LinesIterator*>(iterator)->Next();
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2842 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2843 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2844
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2845
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2846 void OrthancLinesIterator_Free(OrthancLinesIterator* iterator)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2847 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2848 if (iterator != NULL)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2849 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2850 delete reinterpret_cast<const Orthanc::Toolbox::LinesIterator*>(iterator);
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2851 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2852 }

Mercurial > hg > orthanc

annotate OrthancFramework/Sources/Toolbox.cpp @ 5804:25df40a274fd find-refactoring