orthanc: OrthancFramework/Sources/Toolbox.cpp annotate

annotate OrthancFramework/Sources/Toolbox.cpp @ 5141:023569e7155b

moved DicomModification thread safety into ResourceModificationJob (trying to avoid mutex in OrthancFramework as much as possible)

author	Alain Mazy <am@osimis.io>
date	Fri, 20 Jan 2023 18:10:42 +0100
parents	859f3668c181
children	95d8e0540219

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
4870 43e613a7756b upgrade to year 2022 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	5 * Copyright (C) 2017-2022 Osimis S.A., Belgium
43e613a7756b upgrade to year 2022 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	6 * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * 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	9 * 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	10 * 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	11 * the License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 110 diff changeset	12 *
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * 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	14 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * 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	16 * Lesser General Public License for more details.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 *
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	18 * 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	19 * 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	20 * <http://www.gnu.org/licenses/>.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 **/
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
824 a811bdf8b8eb precompiled headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	24 #include "PrecompiledHeaders.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 #include "Toolbox.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	27 #include "Compatibility.h"
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	28 #include "OrthancException.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1480 diff changeset	29 #include "Logging.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30
4393 e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	31 #include <json/reader.h>
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	32 #include <json/version.h>
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	33 #include <json/writer.h>
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	34
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	35 #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	36 # error Cannot access the version of JsonCpp
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	37 #endif
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	38
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	39
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	40 /**
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	41 * We use deprecated "Json::Reader", "Json::StyledWriter" and
4396 d07a65100a95 fix comment Sebastien Jodogne <s.jodogne@gmail.com> parents: 4394 diff changeset	42 * "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	43 * 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	44 * 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	45 * 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	46 * February 2015) by the following changeset:
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	47 * 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	48 **/
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	49 #if (JSONCPP_VERSION_MAJOR >= 2 \|\| \
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	50 (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	51 # define JSONCPP_USE_DEPRECATED 0
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	52 #else
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	53 # define JSONCPP_USE_DEPRECATED 1
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	54 #endif
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	55
4392 3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	56
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	57 #include <boost/algorithm/string/case_conv.hpp>
2143 fd5875662670 creation of namespace SystemToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2141 diff changeset	58 #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	59 #include <boost/algorithm/string/join.hpp>
2143 fd5875662670 creation of namespace SystemToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2141 diff changeset	60 #include <boost/lexical_cast.hpp>
2931 89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	61 #include <boost/regex.hpp>
89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	62
89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	63 #if BOOST_VERSION >= 106600
89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	64 # include <boost/uuid/detail/sha1.hpp>
89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	65 #else
89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	66 # include <boost/uuid/sha1.hpp>
89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	67 #endif
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	68
1397 704de8c30ff5 modularization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	69 #include <string>
453 30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	70 #include <stdint.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71 #include <string.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	72 #include <algorithm>
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	73 #include <ctype.h>
1397 704de8c30ff5 modularization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	74
915 703bef350e89 Orthanc now relies entirely on boost::locale Sebastien Jodogne <s.jodogne@gmail.com> parents: 890 diff changeset	75
2137 595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	76 #if ORTHANC_ENABLE_MD5 == 1
2931 89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	77 // 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	78 // with Boost >= 1.66.0
2137 595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	79 # 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	80 #endif
8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	81
2137 595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	82 #if ORTHANC_ENABLE_BASE64 == 1
595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	83 # 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	84 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	86 #if ORTHANC_ENABLE_LOCALE == 1
2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	87 # include <boost/locale.hpp>
2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	88 #endif
2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	89
2677 0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	90 #if ORTHANC_ENABLE_SSL == 1
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	91 // For OpenSSL initialization and finalization
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	92 # include <openssl/conf.h>
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	93 # include <openssl/engine.h>
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	94 # include <openssl/err.h>
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	95 # include <openssl/evp.h>
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	96 # include <openssl/ssl.h>
4741 a6b7c29f5118 compiler warning about openssl license Sebastien Jodogne <s.jodogne@gmail.com> parents: 4706 diff changeset	97
a6b7c29f5118 compiler warning about openssl license Sebastien Jodogne <s.jodogne@gmail.com> parents: 4706 diff changeset	98 # 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	99 # if defined(_MSC_VER)
859f3668c181 replaced macro "#warning" by "#pragma message" for Visual Studio Sebastien Jodogne <s.jodogne@gmail.com> parents: 4938 diff changeset	100 # 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	101 # else
859f3668c181 replaced macro "#warning" by "#pragma message" for Visual Studio Sebastien Jodogne <s.jodogne@gmail.com> parents: 4938 diff changeset	102 # 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	103 # endif
4741 a6b7c29f5118 compiler warning about openssl license Sebastien Jodogne <s.jodogne@gmail.com> parents: 4706 diff changeset	104 # endif
a6b7c29f5118 compiler warning about openssl license Sebastien Jodogne <s.jodogne@gmail.com> parents: 4706 diff changeset	105
2677 0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	106 #endif
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	107
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	108
1111 929bf8c2123d Fixes for Visual Studio 2013 64bit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1103 diff changeset	109 #if defined(_MSC_VER) && (_MSC_VER < 1800)
929bf8c2123d Fixes for Visual Studio 2013 64bit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1103 diff changeset	110 // Patch for the missing "_strtoll" symbol when compiling with Visual Studio < 2013
570 86c5bb651bfa fix jodogne parents: 568 diff changeset	111 extern "C"
86c5bb651bfa fix jodogne parents: 568 diff changeset	112 {
915 703bef350e89 Orthanc now relies entirely on boost::locale Sebastien Jodogne <s.jodogne@gmail.com> parents: 890 diff changeset	113 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	114 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	115 {
915 703bef350e89 Orthanc now relies entirely on boost::locale Sebastien Jodogne <s.jodogne@gmail.com> parents: 890 diff changeset	116 return _strtoi64(nptr, endptr, base);
703bef350e89 Orthanc now relies entirely on boost::locale Sebastien Jodogne <s.jodogne@gmail.com> parents: 890 diff changeset	117 }
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	118 }
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	119 #endif
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	120
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	121
2173 1c42860097fc fix windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	122 #if defined(_WIN32)
1c42860097fc fix windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	123 # include <windows.h> // For ::Sleep
1c42860097fc fix windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	124 #endif
1c42860097fc fix windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	125
2141 a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	126
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2129 diff changeset	127 #if ORTHANC_ENABLE_PUGIXML == 1
2143 fd5875662670 creation of namespace SystemToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2141 diff changeset	128 # include "ChunkedBuffer.h"
1045 0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	129 #endif
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	130
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	131
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	132 // Inclusions for UUID
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	133 // http://stackoverflow.com/a/1626302
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	134
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	135 extern "C"
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	136 {
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	137 #if defined(_WIN32)
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	138 # include <rpc.h>
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	139 #else
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	140 # include <uuid/uuid.h>
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	141 #endif
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	142 }
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	143
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	144
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	145 #if defined(ORTHANC_STATIC_ICU)
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	146 # if (ORTHANC_STATIC_ICU == 1 && ORTHANC_ENABLE_LOCALE == 1)
4032 058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	147 # include <OrthancFrameworkResources.h>
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	148 # 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	149 # 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	150 # 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	151
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	152 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	153
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	154 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	155 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	156 // 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	157 // 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	158 // (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	159 // 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	160 // 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	161 // 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	162 struct
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	163 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	164 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	165 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	166 } 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	167 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	168
3462 7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	169 # if defined(__LSB_VERSION__)
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	170 extern "C"
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	171 {
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	172 /**
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	173 * 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	174 * 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	175 * 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	176 * 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	177 * 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	178 * 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	179 * 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	180 * 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	181 **/
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	182 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	183 }
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	184 # endif
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	185
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	186 # endif
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	187 #endif
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	188
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	189
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	190
3459 cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	191 #if defined(__unix__) && ORTHANC_SANDBOXED != 1
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	192 # include "SystemToolbox.h" // Check out "InitializeGlobalLocale()"
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	193 #endif
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	194
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	195
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	196
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	197 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	198 {
2513 97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	199 void Toolbox::LinesIterator::FindEndOfLine()
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	200 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	201 lineEnd_ = lineStart_;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	202
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	203 while (lineEnd_ < content_.size() &&
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	204 content_[lineEnd_] != '\n' &&
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	205 content_[lineEnd_] != '\r')
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	206 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	207 lineEnd_ += 1;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	208 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	209 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	210
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 Toolbox::LinesIterator::LinesIterator(const std::string& content) :
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	213 content_(content),
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	214 lineStart_(0)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	215 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	216 FindEndOfLine();
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
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 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	221 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	222 assert(lineStart_ <= content_.size() &&
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	223 lineEnd_ <= content_.size() &&
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	224 lineStart_ <= lineEnd_);
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	225
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	226 if (lineStart_ == content_.size())
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	227 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	228 return false;
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 else
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	231 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	232 target = content_.substr(lineStart_, lineEnd_ - lineStart_);
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	233 return true;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	234 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	235 }
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
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	238 void Toolbox::LinesIterator::Next()
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	239 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	240 lineStart_ = lineEnd_;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	241
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	242 if (lineStart_ != content_.size())
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	243 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	244 assert(content_[lineStart_] == '\r' \|\|
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	245 content_[lineStart_] == '\n');
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 char second;
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 if (content_[lineStart_] == '\r')
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 second = '\n';
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 else
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 second = '\r';
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	256 }
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 lineStart_ += 1;
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 (lineStart_ < content_.size() &&
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	261 content_[lineStart_] == second)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	262 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	263 lineStart_ += 1;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	264 }
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 FindEndOfLine();
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
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	270
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	271 void Toolbox::ToUpperCase(std::string& s)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	272 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	273 std::transform(s.begin(), s.end(), s.begin(), toupper);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	274 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	275
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	276
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	277 void Toolbox::ToLowerCase(std::string& s)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	278 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	279 std::transform(s.begin(), s.end(), s.begin(), tolower);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	280 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	281
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	282
690 2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	283 void Toolbox::ToUpperCase(std::string& result,
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	284 const std::string& source)
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	285 {
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	286 result = source;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	287 ToUpperCase(result);
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	288 }
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	289
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	290 void Toolbox::ToLowerCase(std::string& result,
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	291 const std::string& source)
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	292 {
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	293 result = source;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	294 ToLowerCase(result);
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	295 }
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	296
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	297
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	298 void Toolbox::SplitUriComponents(UriComponents& components,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	299 const std::string& uri)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	300 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	301 static const char URI_SEPARATOR = '/';
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	302
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	303 components.clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	304
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	305 if (uri.size() == 0 \|\|
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	306 uri[0] != URI_SEPARATOR)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	307 {
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	308 throw OrthancException(ErrorCode_UriSyntax);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	309 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	310
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	311 // Count the number of slashes in the URI to make an assumption
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	312 // about the number of components in the URI
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	313 unsigned int estimatedSize = 0;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	314 for (unsigned int i = 0; i < uri.size(); i++)
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[i] == URI_SEPARATOR)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	317 estimatedSize++;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	318 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	319
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	320 components.reserve(estimatedSize - 1);
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 unsigned int start = 1;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	323 unsigned int end = 1;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	324 while (end < uri.size())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	325 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	326 // This is the loop invariant
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	327 assert(uri[start - 1] == '/' && (end >= start));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	328
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	329 if (uri[end] == '/')
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.push_back(std::string(&uri[start], end - start));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	332 end++;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	333 start = end;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	334 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	335 else
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 end++;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	338 }
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
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	341 if (start < uri.size())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	342 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	343 components.push_back(std::string(&uri[start], end - start));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	344 }
207 7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	345
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	346 for (size_t i = 0; i < components.size(); i++)
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	347 {
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	348 if (components[i].size() == 0)
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	349 {
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	350 // Empty component, as in: "/coucou//e"
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	351 throw OrthancException(ErrorCode_UriSyntax);
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	352 }
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	353 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	356
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	357 void Toolbox::TruncateUri(UriComponents& target,
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	358 const UriComponents& source,
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	359 size_t fromLevel)
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	360 {
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	361 target.clear();
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	362
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	363 if (source.size() > fromLevel)
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	364 {
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	365 target.resize(source.size() - fromLevel);
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	366
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	367 size_t j = 0;
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	368 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	369 {
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	370 target[j] = source[i];
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
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	373 assert(j == target.size());
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	374 }
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
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
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	379 bool Toolbox::IsChildUri(const UriComponents& baseUri,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	380 const UriComponents& testedUri)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	381 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	382 if (testedUri.size() < baseUri.size())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	383 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	384 return false;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	385 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	386
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	387 for (size_t i = 0; i < baseUri.size(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	388 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	389 if (baseUri[i] != testedUri[i])
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	390 return false;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	391 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	392
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	393 return true;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	394 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	395
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	396
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	397 std::string Toolbox::FlattenUri(const UriComponents& components,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	398 size_t fromLevel)
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 (components.size() <= fromLevel)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	401 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	402 return "/";
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 else
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 std::string r;
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 for (size_t i = fromLevel; i < components.size(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	409 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	410 r += "/" + components[i];
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	411 }
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 r;
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 }
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
2137 595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	418 #if ORTHANC_ENABLE_MD5 == 1
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	419 static char GetHexadecimalCharacter(uint8_t value)
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	420 {
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	421 assert(value < 16);
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	422
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	423 if (value < 10)
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	424 {
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	425 return value + '0';
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	426 }
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	427 else
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	428 {
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	429 return (value - 10) + 'a';
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	430 }
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	431 }
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	432
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 22 diff changeset	433
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	434 void Toolbox::ComputeMD5(std::string& result,
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	435 const std::string& data)
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	436 {
693 01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	437 if (data.size() > 0)
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	438 {
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	439 ComputeMD5(result, &data[0], data.size());
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	440 }
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	441 else
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	442 {
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	443 ComputeMD5(result, NULL, 0);
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	444 }
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	445 }
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	446
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	447
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	448 void Toolbox::ComputeMD5(std::string& result,
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	449 const void* data,
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	450 size_t size)
693 01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	451 {
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	452 md5_state_s state;
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	453 md5_init(&state);
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	454
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	455 if (size > 0)
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	456 {
693 01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	457 md5_append(&state,
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	458 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	459 static_cast<int>(size));
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	460 }
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	461
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	462 md5_byte_t actualHash[16];
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	463 md5_finish(&state, actualHash);
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	464
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	465 result.resize(32);
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	466 for (unsigned int i = 0; i < 16; i++)
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	467 {
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	468 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	469 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	470 }
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	471 }
1479 8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	472 #endif
24 166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	473
166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	474
2137 595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	475 #if ORTHANC_ENABLE_BASE64 == 1
809 8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	476 void Toolbox::EncodeBase64(std::string& result,
8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	477 const std::string& data)
24 166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	478 {
3326 b21d4cc8e5d1 speed up base64 decoding + added tests Alain Mazy <alain@mazy.be> parents: 3325 diff changeset	479 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	480 base64_encode(result, data);
24 166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	481 }
166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	482
809 8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	483 void Toolbox::DecodeBase64(std::string& result,
8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	484 const std::string& data)
365 cda6938a8c6f decode base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 337 diff changeset	485 {
1988 e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	486 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	487 {
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	488 if (!isalnum(data[i]) &&
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	489 data[i] != '+' &&
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	490 data[i] != '/' &&
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	491 data[i] != '=')
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	492 {
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	493 // 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	494 throw OrthancException(ErrorCode_BadFileFormat);
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	495 }
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	496 }
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	497
3326 b21d4cc8e5d1 speed up base64 decoding + added tests Alain Mazy <alain@mazy.be> parents: 3325 diff changeset	498 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	499 base64_decode(result, data);
365 cda6938a8c6f decode base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 337 diff changeset	500 }
1648 a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	501
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	502
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	503 bool Toolbox::DecodeDataUriScheme(std::string& mime,
1648 a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	504 std::string& content,
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	505 const std::string& source)
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	506 {
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	507 boost::regex pattern("data:([^;]+);base64,([a-zA-Z0-9=+/]*)",
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	508 boost::regex::icase /* case insensitive search */);
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	509
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	510 boost::cmatch what;
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	511 if (regex_match(source.c_str(), what, pattern))
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	512 {
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	513 mime = what[1];
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	514 DecodeBase64(content, what[2]);
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	515 return true;
1648 a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	516 }
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	517 else
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	518 {
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	519 return false;
1648 a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	520 }
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	521 }
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	522
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	523
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	524 void Toolbox::EncodeDataUriScheme(std::string& result,
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	525 const std::string& mime,
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	526 const std::string& content)
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	527 {
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	528 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	529 base64_encode(result, content);
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	530 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	531
1479 8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	532 #endif
8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	533
365 cda6938a8c6f decode base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 337 diff changeset	534
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2373 diff changeset	535 #if ORTHANC_ENABLE_LOCALE == 1
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	536 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	537 {
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	538 switch (sourceEncoding)
766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	539 {
766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	540 case Encoding_Utf8:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	541 return "UTF-8";
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	542
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 950 diff changeset	543 case Encoding_Ascii:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	544 return "ASCII";
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 950 diff changeset	545
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	546 case Encoding_Latin1:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	547 return "ISO-8859-1";
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	548
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	549 case Encoding_Latin2:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	550 return "ISO-8859-2";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	551
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	552 case Encoding_Latin3:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	553 return "ISO-8859-3";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	554
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	555 case Encoding_Latin4:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	556 return "ISO-8859-4";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	557
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	558 case Encoding_Latin5:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	559 return "ISO-8859-9";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	560
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	561 case Encoding_Cyrillic:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	562 return "ISO-8859-5";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	563
1347 60cc0ee61edb fix issue 32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1337 diff changeset	564 case Encoding_Windows1251:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	565 return "WINDOWS-1251";
1347 60cc0ee61edb fix issue 32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1337 diff changeset	566
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	567 case Encoding_Arabic:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	568 return "ISO-8859-6";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	569
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	570 case Encoding_Greek:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	571 return "ISO-8859-7";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	572
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	573 case Encoding_Hebrew:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	574 return "ISO-8859-8";
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	575
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	576 case Encoding_Japanese:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	577 return "SHIFT-JIS";
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	578
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	579 case Encoding_Chinese:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	580 return "GB18030";
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	581
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	582 case Encoding_Thai:
3230 4b042ec734c1 dynamic linking against libicu Sebastien Jodogne <s.jodogne@gmail.com> parents: 3226 diff changeset	583 #if BOOST_LOCALE_WITH_ICU == 1
4b042ec734c1 dynamic linking against libicu Sebastien Jodogne <s.jodogne@gmail.com> parents: 3226 diff changeset	584 return "tis620.2533";
4b042ec734c1 dynamic linking against libicu Sebastien Jodogne <s.jodogne@gmail.com> parents: 3226 diff changeset	585 #else
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	586 return "TIS620.2533-0";
3230 4b042ec734c1 dynamic linking against libicu Sebastien Jodogne <s.jodogne@gmail.com> parents: 3226 diff changeset	587 #endif
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	588
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	589 case Encoding_Korean:
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	590 return "ISO-IR-149";
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	591
3218 9a83d94b2a1e kanji encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	592 case Encoding_JapaneseKanji:
9a83d94b2a1e kanji encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	593 return "JIS";
9a83d94b2a1e kanji encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	594
3226 45e1631febbb support of simplified chinese Sebastien Jodogne <s.jodogne@gmail.com> parents: 3221 diff changeset	595 case Encoding_SimplifiedChinese:
45e1631febbb support of simplified chinese Sebastien Jodogne <s.jodogne@gmail.com> parents: 3221 diff changeset	596 return "GB2312";
45e1631febbb support of simplified chinese Sebastien Jodogne <s.jodogne@gmail.com> parents: 3221 diff changeset	597
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	598 default:
957 63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	599 throw OrthancException(ErrorCode_NotImplemented);
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	600 }
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	601 }
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2373 diff changeset	602 #endif
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	603
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	604
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	605 #if ORTHANC_ENABLE_LOCALE == 1
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	606 // 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	607 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	608 Encoding sourceEncoding,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	609 bool hasCodeExtensions)
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	610 {
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	611 #if ORTHANC_STATIC_ICU == 1
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	612 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	613 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	614 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	615 "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	616 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	617 #endif
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	618
2907 0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	619 // 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	620 // 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	621
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	622 try
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	623 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	624 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	625 {
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	626 return ConvertToAscii(source);
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	627 }
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	628 else
2907 0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	629 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	630 std::string s;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	631
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	632 if (sourceEncoding == Encoding_Utf8)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	633 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	634 // 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	635 // the output is correctly encoded
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	636 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	637 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	638 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	639 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	640 const char* encoding = GetBoostLocaleEncoding(sourceEncoding);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	641 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	642 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	643
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	644 if (hasCodeExtensions)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	645 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	646 std::string t;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	647 RemoveIso2022EscapeSequences(t, s);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	648 return t;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	649 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	650 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	651 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	652 return s;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	653 }
2907 0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	654 }
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	655 }
3218 9a83d94b2a1e kanji encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	656 catch (std::runtime_error& e)
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	657 {
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	658 // Bad input string or bad encoding
3218 9a83d94b2a1e kanji encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	659 LOG(INFO) << e.what();
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	660 return ConvertToAscii(source);
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	661 }
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	662 }
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	663 #endif
2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	664
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	665
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	666 #if ORTHANC_ENABLE_LOCALE == 1
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	667 std::string Toolbox::ConvertFromUtf8(const std::string& source,
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	668 Encoding targetEncoding)
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	669 {
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	670 #if ORTHANC_STATIC_ICU == 1
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	671 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	672 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	673 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	674 "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	675 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	676 #endif
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	677
2907 0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	678 // 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	679 // 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	680
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	681 try
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	682 {
2907 0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	683 if (targetEncoding == Encoding_Utf8)
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	684 {
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	685 // 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	686 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	687 }
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	688 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	689 {
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	690 return ConvertToAscii(source);
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	691 }
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	692 else
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	693 {
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	694 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	695 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	696 }
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	697 }
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	698 catch (std::runtime_error&)
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	699 {
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	700 // Bad input string or bad encoding
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	701 return ConvertToAscii(source);
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	702 }
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	703 }
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	704 #endif
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	705
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	706
2900 668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	707 static bool IsAsciiCharacter(uint8_t c)
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	708 {
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	709 return (c != 0 &&
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	710 c <= 127 &&
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	711 (c == '\n' \|\| !iscntrl(c)));
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	712 }
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	713
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	714
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	715 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	716 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	717 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	718 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	719
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	720 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	721 {
2900 668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	722 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	723 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	724 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	725 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	726 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	727
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	728 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	729 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	730
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	731
2442 330349d712f9 fix Toolbox::IsAsciiString Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	732 bool Toolbox::IsAsciiString(const std::string& s)
330349d712f9 fix Toolbox::IsAsciiString Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	733 {
330349d712f9 fix Toolbox::IsAsciiString Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	734 return IsAsciiString(s.c_str(), s.size());
330349d712f9 fix Toolbox::IsAsciiString Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	735 }
330349d712f9 fix Toolbox::IsAsciiString Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	736
330349d712f9 fix Toolbox::IsAsciiString Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	737
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	738 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	739 {
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	740 std::string result;
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	741
942 b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 930 diff changeset	742 result.reserve(source.size() + 1);
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	743 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	744 {
2900 668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	745 if (IsAsciiCharacter(source[i]))
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	746 {
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	747 result.push_back(source[i]);
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	748 }
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	749 }
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	750
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	751 return result;
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	752 }
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	753
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	754
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	755 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	756 const void* data,
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	757 size_t size)
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	758 {
560 69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	759 boost::uuids::detail::sha1 sha1;
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	760
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	761 if (size > 0)
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	762 {
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	763 sha1.process_bytes(data, size);
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	764 }
81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	765
560 69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	766 unsigned int digest[5];
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	767
81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	768 // 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	769 assert(sizeof(unsigned int) == 4 && sizeof(digest) == (160 / 8));
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	770
560 69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	771 sha1.get_digest(digest);
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	772
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	773 result.resize(8 * 5 + 4);
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	774 sprintf(&result[0], "%08x-%08x-%08x-%08x-%08x",
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	775 digest[0],
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	776 digest[1],
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	777 digest[2],
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	778 digest[3],
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	779 digest[4]);
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	780 }
81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	781
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	782 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	783 const std::string& data)
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	784 {
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	785 if (data.size() > 0)
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	786 {
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	787 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	788 }
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	789 else
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	790 {
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	791 ComputeSHA1(result, NULL, 0);
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	792 }
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	793 }
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	794
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	795
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3382 diff changeset	796 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	797 size_t size)
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	798 {
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	799 if (size == 0)
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	800 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	801 return false;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	802 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	803
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3382 diff changeset	804 const char* start = reinterpret_cast<const char*>(str);
962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3382 diff changeset	805 const char* end = start + size;
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	806
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	807 // Trim the beginning of the string
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	808 while (start < end)
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	809 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	810 if (*start == '\0' \|\|
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	811 isspace(*start))
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	812 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	813 start++;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	814 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	815 else
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	816 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	817 break;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	818 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	819 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	820
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	821 // Trim the trailing of the string
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	822 while (start < end)
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	823 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	824 if (*(end - 1) == '\0' \|\|
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	825 isspace(*(end - 1)))
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	826 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	827 end--;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	828 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	829 else
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	830 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	831 break;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	832 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	833 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	834
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	835 if (end - start != 44)
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	836 {
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	837 return false;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	838 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	839
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	840 for (unsigned int i = 0; i < 44; i++)
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	841 {
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	842 if (i == 8 \|\|
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	843 i == 17 \|\|
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	844 i == 26 \|\|
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	845 i == 35)
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	846 {
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	847 if (start[i] != '-')
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	848 return false;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	849 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	850 else
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	851 {
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	852 if (!isalnum(start[i]))
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	853 return false;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	854 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	855 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	856
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	857 return true;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	858 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	859
1397 704de8c30ff5 modularization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	860
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	861 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	862 {
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	863 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	864 {
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	865 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	866 }
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	867 else
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	868 {
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	869 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	870 }
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	871 }
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	872
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	873
247 c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	874 std::string Toolbox::StripSpaces(const std::string& source)
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	875 {
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	876 size_t first = 0;
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	877
247 c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	878 while (first < source.length() &&
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	879 isspace(source[first]))
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	880 {
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	881 first++;
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	882 }
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	883
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	884 if (first == source.length())
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	885 {
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	886 // String containing only spaces
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	887 return "";
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	888 }
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	889
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	890 size_t last = source.length();
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	891 while (last > first &&
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	892 isspace(source[last - 1]))
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	893 {
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	894 last--;
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	895 }
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	896
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	897 assert(first <= last);
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	898 return source.substr(first, last - first);
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	899 }
336 3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	900
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	901
337 26218c4de7e0 test added Sebastien Jodogne <s.jodogne@gmail.com> parents: 336 diff changeset	902 static char Hex2Dec(char c)
336 3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	903 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	904 return ((c >= '0' && c <= '9') ? c - '0' :
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	905 ((c >= 'a' && c <= 'f') ? c - 'a' + 10 : c - 'A' + 10));
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	906 }
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	907
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	908 void Toolbox::UrlDecode(std::string& s)
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	909 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	910 // http://en.wikipedia.org/wiki/Percent-encoding
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	911 // http://www.w3schools.com/tags/ref_urlencode.asp
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	912 // http://stackoverflow.com/questions/154536/encode-decode-urls-in-c
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	913
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	914 if (s.size() == 0)
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	915 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	916 return;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	917 }
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	918
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	919 size_t source = 0;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	920 size_t target = 0;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	921
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	922 while (source < s.size())
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	923 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	924 if (s[source] == '%' &&
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	925 source + 2 < s.size() &&
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	926 isalnum(s[source + 1]) &&
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	927 isalnum(s[source + 2]))
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	928 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	929 s[target] = (Hex2Dec(s[source + 1]) << 4) \| Hex2Dec(s[source + 2]);
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	930 source += 3;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	931 target += 1;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	932 }
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	933 else
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	934 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	935 if (s[source] == '+')
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	936 s[target] = ' ';
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	937 else
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	938 s[target] = s[source];
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	939
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	940 source++;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	941 target++;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	942 }
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	943 }
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	944
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	945 s.resize(target);
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	946 }
453 30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	947
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	948
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	949 Endianness Toolbox::DetectEndianness()
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	950 {
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	951 // http://sourceforge.net/p/predef/wiki/Endianness/
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	952
4203 4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	953 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	954
e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3462 diff changeset	955 uint8_t* buffer = reinterpret_cast<uint8_t*>(&bufferView);
453 30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	956
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	957 buffer[0] = 0x00;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	958 buffer[1] = 0x01;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	959 buffer[2] = 0x02;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	960 buffer[3] = 0x03;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	961
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3462 diff changeset	962 switch (bufferView)
453 30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	963 {
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	964 case 0x00010203:
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	965 return Endianness_Big;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	966
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	967 case 0x03020100:
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	968 return Endianness_Little;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	969
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	970 default:
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	971 throw OrthancException(ErrorCode_NotImplemented);
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	972 }
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	973 }
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	974
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	975 std::string Toolbox::WildcardToRegularExpression(const std::string& source)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	976 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	977 // TODO - Speed up this with a regular expression
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	978
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	979 std::string result = source;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	980
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	981 // Escape all special characters
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	982 boost::replace_all(result, "\\", "\\\\");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	983 boost::replace_all(result, "^", "\\^");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	984 boost::replace_all(result, ".", "\\.");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	985 boost::replace_all(result, "$", "\\$");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	986 boost::replace_all(result, "\|", "\\\|");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	987 boost::replace_all(result, "(", "\\(");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	988 boost::replace_all(result, ")", "\\)");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	989 boost::replace_all(result, "[", "\\[");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	990 boost::replace_all(result, "]", "\\]");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	991 boost::replace_all(result, "+", "\\+");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	992 boost::replace_all(result, "/", "\\/");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	993 boost::replace_all(result, "{", "\\{");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	994 boost::replace_all(result, "}", "\\}");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	995
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	996 // Convert wildcards '*' and '?' to their regex equivalents
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	997 boost::replace_all(result, "?", ".");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	998 boost::replace_all(result, "", ".");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	999
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1000 return result;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1001 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1002
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1003
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1004 void Toolbox::TokenizeString(std::vector<std::string>& result,
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1005 const std::string& value,
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1006 char separator)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1007 {
3382 a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1008 size_t countSeparators = 0;
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1009
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1010 for (size_t i = 0; i < value.size(); i++)
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1011 {
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1012 if (value[i] == separator)
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1013 {
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1014 countSeparators++;
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1015 }
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1016 }
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1017
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1018 result.clear();
3382 a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	1019 result.reserve(countSeparators + 1);
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1020
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1021 std::string currentItem;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1022
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1023 for (size_t i = 0; i < value.size(); i++)
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 if (value[i] == separator)
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 result.push_back(currentItem);
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1028 currentItem.clear();
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1029 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1030 else
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1031 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1032 currentItem.push_back(value[i]);
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1033 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1034 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1035
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1036 result.push_back(currentItem);
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1037 }
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	1038
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	1039
4938 f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1040 void Toolbox::JoinStrings(std::string& result,
f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1041 std::set<std::string>& source,
f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1042 const char* separator)
f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1043 {
f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1044 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	1045 }
f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1046
f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1047 void JoinStrings(std::string& result,
f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1048 std::vector<std::string>& source,
f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1049 const char* separator)
f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1050 {
f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1051 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	1052 }
f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1053
f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1054
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2129 diff changeset	1055 #if ORTHANC_ENABLE_PUGIXML == 1
1045 0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1056 class ChunkedBufferWriter : public pugi::xml_writer
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1057 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1058 private:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1059 ChunkedBuffer buffer_;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1060
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1061 public:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1062 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	1063 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1064 if (size > 0)
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1065 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1066 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	1067 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1068 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1069
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1070 void Flatten(std::string& s)
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1071 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1072 buffer_.Flatten(s);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1073 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1074 };
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1075
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1076
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1077 static void JsonToXmlInternal(pugi::xml_node& target,
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1078 const Json::Value& source,
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1079 const std::string& arrayElement)
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1080 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1081 // 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	1082
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1083 switch (source.type())
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1084 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1085 case Json::nullValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1086 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1087 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	1088 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1089 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1090
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1091 case Json::intValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1092 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1093 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	1094 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	1095 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1096 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1097
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1098 case Json::uintValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1099 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1100 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	1101 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	1102 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1103 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1104
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1105 case Json::realValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1106 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1107 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	1108 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	1109 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1110 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1111
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1112 case Json::stringValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1113 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1114 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	1115 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1116 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1117
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1118 case Json::booleanValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1119 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1120 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	1121 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1122 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1123
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1124 case Json::arrayValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1125 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1126 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	1127 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1128 pugi::xml_node node = target.append_child();
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1129 node.set_name(arrayElement.c_str());
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1130 JsonToXmlInternal(node, source[i], arrayElement);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1131 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1132 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1133 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1134
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1135 case Json::objectValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1136 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1137 Json::Value::Members members = source.getMemberNames();
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1138
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1139 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	1140 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1141 pugi::xml_node node = target.append_child();
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1142 node.set_name(members[i].c_str());
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1143 JsonToXmlInternal(node, source[members[i]], arrayElement);
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
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1146 break;
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
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1149 default:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1150 throw OrthancException(ErrorCode_NotImplemented);
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
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1155 void Toolbox::JsonToXml(std::string& target,
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1156 const Json::Value& source,
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1157 const std::string& rootElement,
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1158 const std::string& arrayElement)
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 pugi::xml_document doc;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1161
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1162 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	1163 JsonToXmlInternal(n, source, 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 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	1166 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	1167 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	1168
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	1169 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	1170 }
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1171
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1172 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	1173 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	1174 {
1045 0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1175 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	1176 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	1177 writer.Flatten(target);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1178 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1179 #endif
1050 64f1842aae2e Toolbox::ExecuteSystemCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 1045 diff changeset	1180
64f1842aae2e Toolbox::ExecuteSystemCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 1045 diff changeset	1181
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1182
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1183 bool Toolbox::IsInteger(const std::string& str)
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1184 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1185 std::string s = StripSpaces(str);
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1186
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1187 if (s.size() == 0)
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1188 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1189 return false;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1190 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1191
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1192 size_t pos = 0;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1193 if (s[0] == '-')
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1194 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1195 if (s.size() == 1)
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1196 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1197 return false;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1198 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1199
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1200 pos = 1;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1201 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1202
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1203 while (pos < s.size())
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1204 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1205 if (!isdigit(s[pos]))
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1206 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1207 return false;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1208 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1209
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1210 pos++;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1211 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1212
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1213 return true;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1214 }
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1215
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1216
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1217 void Toolbox::CopyJsonWithoutComments(Json::Value& target,
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1218 const Json::Value& source)
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1219 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1220 switch (source.type())
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1221 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1222 case Json::nullValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1223 target = Json::nullValue;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1224 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1225
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1226 case Json::intValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1227 target = source.asInt64();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1228 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1229
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1230 case Json::uintValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1231 target = source.asUInt64();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1232 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1233
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1234 case Json::realValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1235 target = source.asDouble();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1236 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1237
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1238 case Json::stringValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1239 target = source.asString();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1240 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1241
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1242 case Json::booleanValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1243 target = source.asBool();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1244 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1245
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1246 case Json::arrayValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1247 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1248 target = Json::arrayValue;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1249 for (Json::Value::ArrayIndex i = 0; i < source.size(); i++)
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1250 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1251 Json::Value& item = target.append(Json::nullValue);
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1252 CopyJsonWithoutComments(item, source[i]);
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1253 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1254
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1255 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1256 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1257
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1258 case Json::objectValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1259 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1260 target = Json::objectValue;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1261 Json::Value::Members members = source.getMemberNames();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1262 for (Json::Value::ArrayIndex i = 0; i < members.size(); i++)
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1263 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1264 const std::string item = members[i];
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1265 CopyJsonWithoutComments(target[item], source[item]);
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1266 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1267
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1268 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1269 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1270
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1271 default:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1272 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1273 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1274 }
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1275
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1276
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1277 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	1278 const std::string& prefix)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1279 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1280 if (str.size() < prefix.size())
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1281 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1282 return false;
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1283 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1284 else
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1285 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1286 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	1287 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1288 }
2043 35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1289
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1290
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1291 static bool IsUnreservedCharacter(char c)
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1292 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1293 // This function checks whether "c" is an unserved character
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1294 // wrt. an URI percent-encoding
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1295 // 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	1296
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1297 return ((c >= 'A' && c <= 'Z') \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1298 (c >= 'a' && c <= 'z') \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1299 (c >= '0' && c <= '9') \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1300 c == '-' \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1301 c == '_' \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1302 c == '.' \|\|
4234 a38376b80cd1 WebDAV: by-studies and by-patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 4203 diff changeset	1303 c == '~' \|\|
a38376b80cd1 WebDAV: by-studies and by-patients Sebastien Jodogne <s.jodogne@gmail.com> parents: 4203 diff changeset	1304 c == '/');
2043 35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1305 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1306
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1307 void Toolbox::UriEncode(std::string& target,
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1308 const std::string& source)
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1309 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1310 // Estimate the length of the percent-encoded URI
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1311 size_t length = 0;
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1312
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1313 for (size_t i = 0; i < source.size(); i++)
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1314 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1315 if (IsUnreservedCharacter(source[i]))
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1316 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1317 length += 1;
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1318 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1319 else
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1320 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1321 // This character must be percent-encoded
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1322 length += 3;
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1323 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1324 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1325
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1326 target.clear();
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1327 target.reserve(length);
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1328
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1329 for (size_t i = 0; i < source.size(); i++)
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1330 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1331 if (IsUnreservedCharacter(source[i]))
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1332 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1333 target.push_back(source[i]);
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1334 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1335 else
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1336 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1337 // This character must be percent-encoded
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1338 uint8_t byte = static_cast<uint8_t>(source[i]);
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1339 uint8_t a = byte >> 4;
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1340 uint8_t b = byte & 0x0f;
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1341
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1342 target.push_back('%');
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1343 target.push_back(a < 10 ? a + '0' : a - 10 + 'A');
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1344 target.push_back(b < 10 ? b + '0' : b - 10 + 'A');
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1345 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1346 }
2071 27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1347 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1348
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1349
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1350 static bool HasField(const Json::Value& json,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1351 const std::string& key,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1352 Json::ValueType expectedType)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1353 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1354 if (json.type() != Json::objectValue \|\|
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1355 !json.isMember(key))
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1356 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1357 return false;
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1358 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1359 else if (json[key].type() == expectedType)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1360 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1361 return true;
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1362 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1363 else
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1364 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1365 throw OrthancException(ErrorCode_BadParameterType);
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1366 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1367 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1368
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1369
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1370 std::string Toolbox::GetJsonStringField(const Json::Value& json,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1371 const std::string& key,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1372 const std::string& defaultValue)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1373 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1374 if (HasField(json, key, Json::stringValue))
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1375 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1376 return json[key].asString();
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1377 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1378 else
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1379 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1380 return defaultValue;
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1381 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1382 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1383
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1384
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1385 bool Toolbox::GetJsonBooleanField(const ::Json::Value& json,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1386 const std::string& key,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1387 bool defaultValue)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1388 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1389 if (HasField(json, key, Json::booleanValue))
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1390 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1391 return json[key].asBool();
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1392 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1393 else
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1394 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1395 return defaultValue;
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1396 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1397 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1398
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1399
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1400 int Toolbox::GetJsonIntegerField(const ::Json::Value& json,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1401 const std::string& key,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1402 int defaultValue)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1403 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1404 if (HasField(json, key, Json::intValue))
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1405 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1406 return json[key].asInt();
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1407 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1408 else
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1409 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1410 return defaultValue;
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1411 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1412 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1413
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1414
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1415 unsigned int Toolbox::GetJsonUnsignedIntegerField(const ::Json::Value& json,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1416 const std::string& key,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1417 unsigned int defaultValue)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1418 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1419 int v = GetJsonIntegerField(json, key, defaultValue);
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1420
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1421 if (v < 0)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1422 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1423 throw OrthancException(ErrorCode_ParameterOutOfRange);
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1424 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1425 else
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1426 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1427 return static_cast<unsigned int>(v);
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1428 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1429 }
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2137 diff changeset	1430
aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2137 diff changeset	1431
2141 a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1432 bool Toolbox::IsUuid(const std::string& str)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1433 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1434 if (str.size() != 36)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1435 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1436 return false;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1437 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1438
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1439 for (size_t i = 0; i < str.length(); i++)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1440 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1441 if (i == 8 \|\| i == 13 \|\| i == 18 \|\| i == 23)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1442 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1443 if (str[i] != '-')
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1444 return false;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1445 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1446 else
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1447 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1448 if (!isalnum(str[i]))
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1449 return false;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1450 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1451 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1452
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1453 return true;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1454 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1455
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1456
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1457 bool Toolbox::StartsWithUuid(const std::string& str)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1458 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1459 if (str.size() < 36)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1460 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1461 return false;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1462 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1463
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1464 if (str.size() == 36)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1465 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1466 return IsUuid(str);
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1467 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1468
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1469 assert(str.size() > 36);
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1470 if (!isspace(str[36]))
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1471 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1472 return false;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1473 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1474
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1475 return IsUuid(str.substr(0, 36));
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1476 }
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1477
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1478
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	1479 #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	1480 static std::unique_ptr<std::locale> globalLocale_;
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1481
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1482 static bool SetGlobalLocale(const char* locale)
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1483 {
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1484 try
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1485 {
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1486 if (locale == NULL)
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1487 {
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1488 LOG(WARNING) << "Falling back to system-wide default locale";
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1489 globalLocale_.reset(new std::locale());
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1490 }
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1491 else
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1492 {
2351 56504f89d4ac log info Sebastien Jodogne <s.jodogne@gmail.com> parents: 2334 diff changeset	1493 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	1494 globalLocale_.reset(new std::locale(locale));
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1495 }
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1496 }
3459 cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1497 catch (std::runtime_error& e)
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1498 {
3459 cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1499 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	1500 << (locale ? std::string(locale) : "(null)")
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1501 << ": " << e.what();
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1502 globalLocale_.reset(NULL);
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1503 }
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1504
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1505 return (globalLocale_.get() != NULL);
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1506 }
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1507
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1508
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1509 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	1510 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1511 #if ORTHANC_STATIC_ICU == 1
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1512 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	1513 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1514 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	1515
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1516 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	1517 compressor.Uncompress(globalIcuData_,
4032 058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	1518 FrameworkResources::GetFileResourceBuffer(FrameworkResources::LIBICU_DATA),
058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	1519 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	1520
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1521 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	1522 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	1523
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1524 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	1525 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	1526 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1527 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	1528 "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	1529 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1530
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1531 // "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	1532 // 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	1533
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1534 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1535 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	1536
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1537 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	1538
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1539 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	1540 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1541 // 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	1542 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	1543 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1544 else
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1545 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1546 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	1547 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	1548
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1549 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	1550 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	1551 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1552 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	1553 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1554
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1555 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	1556 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1557 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	1558 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1559
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1560 // 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	1561 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	1562 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	1563 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	1564 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1565 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	1566 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1567
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1568 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	1569
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1570 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	1571
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1572 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	1573 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1574 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	1575 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1576 else
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1577 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1578 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	1579 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1580 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1581
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1582 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	1583 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1584 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	1585 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1586 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1587
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1588 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	1589 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1590 // 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	1591 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	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
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1594 // "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	1595 // 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	1596 // 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	1597 // 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	1598 // 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	1599 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	1600 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1601 #endif
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1602 }
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1603
2330 9c7a80c87ae9 "Locale" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	1604 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	1605 {
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1606 InitializeIcu();
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1607
3459 cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1608 #if defined(__unix__) && ORTHANC_SANDBOXED != 1
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1609 static const char* LOCALTIME = "/etc/localtime";
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1610
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1611 if (!SystemToolbox::IsExistingFile(LOCALTIME))
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1612 {
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1613 // Check out file
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1614 // "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	1615 // 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	1616 // 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	1617 // 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	1618 throw OrthancException(
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1619 ErrorCode_InternalError,
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1620 "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	1621 " 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	1622 }
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1623 #endif
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1624
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1625 bool ok;
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1626
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1627 if (locale == NULL)
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1628 {
4203 4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1629 // Make Orthanc use English, United States locale
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1630 // Linux: use "en_US.UTF-8"
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1631 // Windows: use ""
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1632 // Wine: use NULL
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1633
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1634 #if defined(__MINGW32__)
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1635 // 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	1636 // 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	1637 static const char* DEFAULT_LOCALE = NULL;
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1638 #elif defined(_WIN32)
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1639 // 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	1640 static const char* DEFAULT_LOCALE = "";
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1641 #else
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1642 // For Linux & cie
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1643 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	1644 #endif
4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1645
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1646 ok = SetGlobalLocale(DEFAULT_LOCALE);
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1647
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1648 #if defined(__MINGW32__)
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1649 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	1650 << "strings with accents will not work outside of Wine";
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1651 #endif
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1652 }
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1653 else
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1654 {
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1655 ok = SetGlobalLocale(locale);
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1656 }
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1657
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1658 if (!ok &&
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1659 !SetGlobalLocale(NULL))
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1660 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2931 diff changeset	1661 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2931 diff changeset	1662 "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	1663 }
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1664
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1665 }
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1666
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1667
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1668 void Toolbox::FinalizeGlobalLocale()
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1669 {
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1670 globalLocale_.reset();
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1671 }
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1672
2677 0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	1673
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1674 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	1675 {
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1676 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	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 #if ORTHANC_STATIC_ICU == 1
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1679 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	1680 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1681 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	1682 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1683 #endif
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 if (error)
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1686 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2931 diff changeset	1687 throw OrthancException(ErrorCode_BadSequenceOfCalls,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2931 diff changeset	1688 "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	1689 }
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1690
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1691 /**
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1692 * 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	1693 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1694 * (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	1695 * 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	1696 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1697 * 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	1698 * 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	1699 * 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	1700 * 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	1701 * 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	1702 * would use:
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1703 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1704 * boost::locale::generator gen;
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1705 * 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	1706 * 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	1707 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1708 * (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	1709 * 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	1710 * global variable "globalLocale_".
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1711 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1712 * (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	1713 * 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	1714 * 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	1715 * "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	1716 **/
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1717
2907 0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	1718 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	1719 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	1720 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	1721 }
2373 68380777f9a6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2367 diff changeset	1722 #endif
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1723
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1724
3802 6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1725
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1726 #if ORTHANC_ENABLE_SSL == 0
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1727 /**
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1728 * OpenSSL is disabled
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1729 **/
2678 e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1730 void Toolbox::InitializeOpenSsl()
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1731 {
4706 dbee8bd8ee1f display OpenSSL version in the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 4622 diff changeset	1732 LOG(INFO) << "OpenSSL is disabled";
3802 6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1733 }
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1734
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1735 void Toolbox::FinalizeOpenSsl()
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1736 {
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1737 }
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1738
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1739
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1740 #elif (ORTHANC_ENABLE_SSL == 1 && \
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1741 OPENSSL_VERSION_NUMBER < 0x10100000L)
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1742 /**
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1743 * OpenSSL < 1.1.0
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1744 **/
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1745 void Toolbox::InitializeOpenSsl()
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1746 {
4706 dbee8bd8ee1f display OpenSSL version in the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 4622 diff changeset	1747 LOG(INFO) << "OpenSSL version: " << OPENSSL_VERSION_TEXT;
dbee8bd8ee1f display OpenSSL version in the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 4622 diff changeset	1748
2678 e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1749 // https://wiki.openssl.org/index.php/Library_Initialization
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1750 SSL_library_init();
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1751 SSL_load_error_strings();
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1752 OpenSSL_add_all_algorithms();
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1753 ERR_load_crypto_strings();
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1754 }
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1755
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1756 void Toolbox::FinalizeOpenSsl()
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1757 {
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1758 // Finalize OpenSSL
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1759 // https://wiki.openssl.org/index.php/Library_Initialization#Cleanup
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1760 #ifdef FIPS_mode_set
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1761 FIPS_mode_set(0);
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1762 #endif
3720 faa695f433d5 upgraded OpenSSL to 1.1.1d Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1763
faa695f433d5 upgraded OpenSSL to 1.1.1d Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1764 #if !defined(OPENSSL_NO_ENGINE)
2678 e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1765 ENGINE_cleanup();
3720 faa695f433d5 upgraded OpenSSL to 1.1.1d Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1766 #endif
faa695f433d5 upgraded OpenSSL to 1.1.1d Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1767
2678 e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1768 CONF_modules_unload(1);
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1769 EVP_cleanup();
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1770 CRYPTO_cleanup_all_ex_data();
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1771 ERR_remove_state(0);
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1772 ERR_free_strings();
3802 6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1773 }
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1774
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1775
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1776 #elif (ORTHANC_ENABLE_SSL == 1 && \
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1777 OPENSSL_VERSION_NUMBER >= 0x10100000L)
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1778 /**
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1779 * 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	1780 * 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	1781 * 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	1782 **/
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1783 void Toolbox::InitializeOpenSsl()
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1784 {
4706 dbee8bd8ee1f display OpenSSL version in the logs Sebastien Jodogne <s.jodogne@gmail.com> parents: 4622 diff changeset	1785 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	1786 }
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1787
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1788 void Toolbox::FinalizeOpenSsl()
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1789 {
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1790 }
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1791
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1792 #else
6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1793 # error "Support your platform here"
2678 e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1794 #endif
3802 6462ecaa045b fix unit test, reorganization of OpenSSL initialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3731 diff changeset	1795
2678 e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1796
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1797
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1798 std::string Toolbox::GenerateUuid()
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1799 {
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1800 #ifdef WIN32
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1801 UUID uuid;
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1802 UuidCreate ( &uuid );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1803
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1804 unsigned char * str;
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1805 UuidToStringA ( &uuid, &str );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1806
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1807 std::string s( ( char* ) str );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1808
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1809 RpcStringFreeA ( &str );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1810 #else
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1811 uuid_t uuid;
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1812 uuid_generate_random ( uuid );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1813 char s[37];
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1814 uuid_unparse ( uuid, s );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1815 #endif
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1816 return s;
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1817 }
2920 ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1818
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1819
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1820 namespace
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1821 {
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1822 // Anonymous namespace to avoid clashes between compilation modules
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1823
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1824 class VariableFormatter
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1825 {
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1826 public:
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1827 typedef std::map<std::string, std::string> Dictionary;
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1828
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1829 private:
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1830 const Dictionary& dictionary_;
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1831
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1832 public:
4203 4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1833 explicit VariableFormatter(const Dictionary& dictionary) :
2920 ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1834 dictionary_(dictionary)
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1835 {
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1836 }
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1837
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1838 template<typename Out>
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1839 Out operator()(const boost::smatch& what,
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1840 Out out) const
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1841 {
2921 0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1842 if (!what[1].str().empty())
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1843 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1844 // Variable without a default value
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1845 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	1846
2921 0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1847 if (found != dictionary_.end())
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1848 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1849 const std::string& value = found->second;
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1850 out = std::copy(value.begin(), value.end(), out);
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1851 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1852 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1853 else
2920 ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1854 {
2921 0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1855 // Variable with a default value
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1856 std::string key;
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1857 std::string defaultValue;
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1858
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1859 if (!what[2].str().empty())
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1860 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1861 key = what[2].str();
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1862 defaultValue = what[3].str();
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1863 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1864 else if (!what[4].str().empty())
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1865 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1866 key = what[4].str();
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1867 defaultValue = what[5].str();
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1868 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1869 else if (!what[6].str().empty())
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1870 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1871 key = what[6].str();
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1872 defaultValue = what[7].str();
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1873 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1874 else
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1875 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1876 throw OrthancException(ErrorCode_InternalError);
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1877 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1878
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1879 Dictionary::const_iterator found = dictionary_.find(key);
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1880
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1881 if (found == dictionary_.end())
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1882 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1883 out = std::copy(defaultValue.begin(), defaultValue.end(), out);
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1884 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1885 else
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1886 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1887 const std::string& value = found->second;
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1888 out = std::copy(value.begin(), value.end(), out);
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1889 }
2920 ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1890 }
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1891
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1892 return out;
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1893 }
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1894 };
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1895 }
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1896
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1897
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1898 std::string Toolbox::SubstituteVariables(const std::string& source,
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1899 const std::map<std::string, std::string>& dictionary)
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1900 {
2926 0bcf46cea4e4 fix for older versions of boost::regex Sebastien Jodogne <s.jodogne@gmail.com> parents: 2921 diff changeset	1901 const boost::regex pattern("\\$\\{([^:]*?)\\}\|" // ${what[1]}
0bcf46cea4e4 fix for older versions of boost::regex Sebastien Jodogne <s.jodogne@gmail.com> parents: 2921 diff changeset	1902 "\\$\\{([^:]?):-([^'\"]?)\\}\|" // ${what[2]:-what[3]}
0bcf46cea4e4 fix for older versions of boost::regex Sebastien Jodogne <s.jodogne@gmail.com> parents: 2921 diff changeset	1903 "\\$\\{([^:]?):-\"([^\"]?)\"\\}\|" // ${what[4]:-"what[5]"}
0bcf46cea4e4 fix for older versions of boost::regex Sebastien Jodogne <s.jodogne@gmail.com> parents: 2921 diff changeset	1904 "\\$\\{([^:]?):-'([^']?)'\\}"); // ${what[6]:-'what[7]'}
2920 ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1905
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1906 VariableFormatter formatter(dictionary);
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 return boost::regex_replace(source, pattern, formatter);
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1909 }
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1910
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1911
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1912 namespace Iso2022
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1913 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1914 /**
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1915 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	1916 at index i
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1917 **/
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1918 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	1919 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1920 if (i < s.size())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1921 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1922 char c = s[i];
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1923 return
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1924 (c == '\x0f') \|\| // Locking shift zero
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1925 (c == '\x0e'); // Locking shift one
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1926 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1927 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1928 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1929 return false;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1930 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1931 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1932
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1933 /**
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1934 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	1935 at index i
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1936 **/
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1937 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	1938 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1939 if (i + 1 < s.size())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1940 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1941 char c1 = s[i];
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1942 char c2 = s[i + 1];
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1943 return (c1 == 0x1b) && (
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1944 (c2 == '\x6e') \|\| // Locking shift two
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1945 (c2 == '\x6f') \|\| // Locking shift three
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1946 (c2 == '\x4e') \|\| // Single shift two (alt)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1947 (c2 == '\x4f') \|\| // Single shift three (alt)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1948 (c2 == '\x7c') \|\| // Locking shift three right
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1949 (c2 == '\x7d') \|\| // Locking shift two right
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1950 (c2 == '\x7e') // Locking shift one right
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1951 );
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1952 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1953 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1954 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1955 return false;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1956 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1957 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1958
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1959 /**
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1960 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	1961 at index i
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1962 **/
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1963 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	1964 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1965 if (i + 2 < s.size())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1966 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1967 char c1 = s[i];
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1968 char c2 = s[i + 1];
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1969 char c3 = s[i + 2];
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1970 return ((c1 == '\x8e' && c2 == 0x1b && c3 == '\x4e') \|\|
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1971 (c1 == '\x8f' && c2 == 0x1b && c3 == '\x4f'));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1972 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1973 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1974 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1975 return false;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1976 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1977 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1978
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1979 /**
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1980 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	1981 - is valid
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1982 - contains the c character
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1983 This function returns false otherwise.
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1984 **/
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1985 static inline bool TestCharValue(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1986 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	1987 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1988 if (i < s.size())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1989 return s[i] == c;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1990 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1991 return false;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1992 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1993
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1994 /**
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1995 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	1996 - is valid
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1997 - 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	1998 This function returns false otherwise.
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 static inline bool TestCharRange(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2001 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	2002 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2003 if (i < s.size())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2004 return (s[i] >= cMin) && (s[i] <= cMax);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2005 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2006 return false;
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
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 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	2011 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	2012 **/
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2013 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	2014 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2015 if (TestCharValue(s, i, 0x1b))
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 size_t j = i+1;
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 // 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	2020 while (TestCharRange(s, j, '\x20', '\x2f'))
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2021 ++j;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2022
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2023 // 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	2024 // 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	2025 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	2026 return j - i + 1;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2027 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2028 return 0;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2029 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2030 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2031 return 0;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2032 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2033 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2034
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2035
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2036
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2037 /**
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2038 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	2039 sequences.
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2040 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	2041 for a list of those.
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 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	2044 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	2045
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2046 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	2047 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	2048 conversion to utf-8 with boost.
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2049 **/
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2050 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	2051 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2052 // 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	2053 dest.clear();
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2054 if (dest.capacity() < src.size())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2055 dest.reserve(src.size());
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2056
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2057 size_t i = 0;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2058
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2059 // uint8_t view to the string
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2060 while (i < src.size())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2061 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2062 size_t j = i;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2063
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2064 // 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	2065 // 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	2066 // next position to read
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2067 if (Iso2022::IsControlMessage1(src, i))
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2068 i += 1;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2069 else if (Iso2022::IsControlMessage2(src, i))
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2070 i += 2;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2071 else if (Iso2022::IsControlMessage3(src, i))
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2072 i += 3;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2073 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2074 i += Iso2022::GetEscapeSequenceLength(src, i);
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 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	2077 // 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	2078 // 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	2079 if (j == i)
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 dest.push_back(src[i]);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2082 i++;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2083 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2084 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	2085 }
3322 b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2086
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2087
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2088 void Toolbox::Utf8ToUnicodeCharacter(uint32_t& unicode,
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2089 size_t& length,
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2090 const std::string& utf8,
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2091 size_t position)
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2092 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2093 // https://en.wikipedia.org/wiki/UTF-8
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2094
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2095 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	2096 static const uint8_t TEST_IS_1_BYTE = 0x00;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2097
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2098 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	2099 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	2100
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2101 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	2102 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	2103
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2104 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	2105 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	2106
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2107 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	2108 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	2109
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2110 if (position >= utf8.size())
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2111 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2112 throw OrthancException(ErrorCode_ParameterOutOfRange);
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2113 }
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2114
3324 87396c571109 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 3322 diff changeset	2115 assert(sizeof(uint8_t) == sizeof(char));
87396c571109 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 3322 diff changeset	2116 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	2117
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2118 if ((buffer[0] & MASK_IS_1_BYTE) == TEST_IS_1_BYTE)
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2119 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2120 length = 1;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2121 unicode = buffer[0] & ~MASK_IS_1_BYTE;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2122 }
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2123 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	2124 position + 1 < utf8.size() &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2125 (buffer[1] & MASK_CONTINUATION) == TEST_CONTINUATION)
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2126 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2127 length = 2;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2128 uint32_t a = buffer[0] & ~MASK_IS_2_BYTES;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2129 uint32_t b = buffer[1] & ~MASK_CONTINUATION;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2130 unicode = (a << 6) \| b;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2131 }
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2132 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	2133 position + 2 < utf8.size() &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2134 (buffer[1] & MASK_CONTINUATION) == TEST_CONTINUATION &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2135 (buffer[2] & MASK_CONTINUATION) == TEST_CONTINUATION)
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2136 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2137 length = 3;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2138 uint32_t a = buffer[0] & ~MASK_IS_3_BYTES;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2139 uint32_t b = buffer[1] & ~MASK_CONTINUATION;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2140 uint32_t c = buffer[2] & ~MASK_CONTINUATION;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2141 unicode = (a << 12) \| (b << 6) \| c;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2142 }
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2143 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	2144 position + 3 < utf8.size() &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2145 (buffer[1] & MASK_CONTINUATION) == TEST_CONTINUATION &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2146 (buffer[2] & MASK_CONTINUATION) == TEST_CONTINUATION &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2147 (buffer[3] & MASK_CONTINUATION) == TEST_CONTINUATION)
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2148 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2149 length = 4;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2150 uint32_t a = buffer[0] & ~MASK_IS_4_BYTES;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2151 uint32_t b = buffer[1] & ~MASK_CONTINUATION;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2152 uint32_t c = buffer[2] & ~MASK_CONTINUATION;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2153 uint32_t d = buffer[3] & ~MASK_CONTINUATION;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2154 unicode = (a << 18) \| (b << 12) \| (c << 6) \| d;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2155 }
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2156 else
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2157 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2158 // This is not a valid UTF-8 encoding
3324 87396c571109 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 3322 diff changeset	2159 throw OrthancException(ErrorCode_BadFileFormat, "Invalid UTF-8 string");
3322 b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2160 }
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2161 }
3608 7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2162
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2163
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2164 std::string Toolbox::LargeHexadecimalToDecimal(const std::string& hex)
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2165 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2166 /**
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2167 * NB: Focus of the code below is not efficiency, but
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2168 * readability!
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2169 **/
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2170
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2171 for (size_t i = 0; i < hex.size(); i++)
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2172 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2173 const char c = hex[i];
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2174 if (!((c >= 'A' && c <= 'F') \|\|
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2175 (c >= 'a' && c <= 'f') \|\|
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2176 (c >= '0' && c <= '9')))
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2177 {
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4234 diff changeset	2178 throw OrthancException(ErrorCode_ParameterOutOfRange,
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4234 diff changeset	2179 "Not an hexadecimal number");
3608 7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2180 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2181 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2182
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2183 std::vector<uint8_t> decimal;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2184 decimal.push_back(0);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2185
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2186 for (size_t i = 0; i < hex.size(); i++)
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2187 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2188 uint8_t hexDigit = static_cast<uint8_t>(Hex2Dec(hex[i]));
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2189 assert(hexDigit <= 15);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2190
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2191 for (size_t j = 0; j < decimal.size(); j++)
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2192 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2193 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	2194 assert(val <= 159 /* == 9 * 16 + 15 */);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2195
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2196 decimal[j] = val % 10;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2197 hexDigit = val / 10;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2198 assert(hexDigit <= 15 /* == 159 / 10 */);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2199 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2200
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2201 while (hexDigit > 0)
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2202 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2203 decimal.push_back(hexDigit % 10);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2204 hexDigit /= 10;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2205 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2206 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2207
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2208 size_t start = 0;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2209 while (start < decimal.size() &&
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2210 decimal[start] == '0')
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2211 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2212 start++;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2213 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2214
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2215 std::string s;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2216 s.reserve(decimal.size() - start);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2217
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2218 for (size_t i = decimal.size(); i > start; i--)
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2219 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2220 s.push_back(decimal[i - 1] + '0');
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2221 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2222
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2223 return s;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2224 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2225
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2226
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2227 std::string Toolbox::GenerateDicomPrivateUniqueIdentifier()
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2228 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2229 /**
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2230 * REFERENCE: "Creating a Privately Defined Unique Identifier
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2231 * (Informative)" / "UUID Derived UID"
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2232 * 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	2233 * https://stackoverflow.com/a/46316162/881731
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2234 **/
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2235
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2236 std::string uuid = GenerateUuid();
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2237 assert(IsUuid(uuid) && uuid.size() == 36);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2238
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2239 /**
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2240 * After removing the four dashes ("-") out of the 36-character
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2241 * UUID, we get a large hexadecimal number with 32 characters,
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2242 * 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	2243 * 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	2244 * 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	2245 *
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2246 * # 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	2247 * 38.531839445
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2248 *
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2249 * 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	2250 * 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	2251 * prefix it with "2.25."
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2252 **/
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 // Remove the dashes
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2255 std::string hex = (uuid.substr(0, 8) +
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2256 uuid.substr(9, 4) +
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2257 uuid.substr(14, 4) +
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2258 uuid.substr(19, 4) +
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2259 uuid.substr(24, 12));
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2260 assert(hex.size() == 32);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2261
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2262 return "2.25." + LargeHexadecimalToDecimal(hex);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	2263 }
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2264
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2265
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2266 void Toolbox::SimplifyDicomAsJson(Json::Value& target,
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2267 const Json::Value& source,
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2268 DicomToJsonFormat format)
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2269 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2270 if (!source.isObject())
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2271 {
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4234 diff changeset	2272 throw OrthancException(ErrorCode_BadFileFormat);
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2273 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2274
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2275 target = Json::objectValue;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2276 Json::Value::Members members = source.getMemberNames();
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2277
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2278 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	2279 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2280 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	2281 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	2282
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2283 std::string name;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2284 switch (format)
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2285 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2286 case DicomToJsonFormat_Human:
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2287 name = v["Name"].asString();
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2288 break;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2289
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2290 case DicomToJsonFormat_Short:
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2291 name = members[i];
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2292 break;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2293
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2294 default:
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2295 throw OrthancException(ErrorCode_ParameterOutOfRange);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2296 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2297
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2298 if (type == "String")
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2299 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2300 target[name] = v["Value"].asString();
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2301 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2302 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	2303 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	2304 type == "Binary")
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2305 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2306 target[name] = Json::nullValue;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2307 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2308 else if (type == "Sequence")
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2309 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2310 const Json::Value& array = v["Value"];
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2311 assert(array.isArray());
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2312
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2313 Json::Value children = Json::arrayValue;
4203 4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	2314 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	2315 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2316 Json::Value c;
4203 4d42408da117 improving const-correctness in ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	2317 SimplifyDicomAsJson(c, array[j], format);
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2318 children.append(c);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2319 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2320
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2321 target[name] = children;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2322 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2323 else
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2324 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2325 assert(0);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2326 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2327 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	2328 }
4392 3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	2329
3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	2330
4397 3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2331 static bool ReadJsonInternal(Json::Value& target,
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2332 const void* buffer,
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2333 size_t size,
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2334 bool collectComments)
4392 3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	2335 {
4393 e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2336 #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	2337 Json::Reader reader;
3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	2338 return reader.parse(reinterpret_cast<const char*>(buffer),
4397 3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2339 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	2340 #else
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2341 Json::CharReaderBuilder builder;
4397 3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2342 builder.settings_["collectComments"] = collectComments;
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2343
4393 e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2344 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	2345 assert(reader.get() != NULL);
4397 3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2346
4393 e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2347 JSONCPP_STRING err;
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2348 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	2349 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	2350 {
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2351 return true;
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2352 }
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2353 else
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2354 {
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2355 LOG(ERROR) << "Cannot parse JSON: " << err;
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2356 return false;
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2357 }
e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2358 #endif
4392 3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	2359 }
4397 3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2360
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2361
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2362 bool Toolbox::ReadJson(Json::Value& target,
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2363 const std::string& source)
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2364 {
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2365 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	2366 }
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2367
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2368
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2369 bool Toolbox::ReadJson(Json::Value& target,
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2370 const void* buffer,
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2371 size_t size)
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2372 {
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2373 return ReadJsonInternal(target, buffer, size, true);
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2374 }
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2375
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2376
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2377 bool Toolbox::ReadJsonWithoutComments(Json::Value& target,
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2378 const std::string& source)
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2379 {
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2380 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	2381 }
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2382
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2383
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2384 bool Toolbox::ReadJsonWithoutComments(Json::Value& target,
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2385 const void* buffer,
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2386 size_t size)
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2387 {
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2388 return ReadJsonInternal(target, buffer, size, false);
3aeb5171fbd4 new function Toolbox::ReadJsonWithoutComments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4396 diff changeset	2389 }
4392 3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	2390
3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	2391
4394 f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2392 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	2393 const Json::Value& source)
4392 3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	2394 {
4393 e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2395 #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	2396 Json::FastWriter writer;
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2397 target = writer.write(source);
4393 e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2398 #else
4394 f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2399 Json::StreamWriterBuilder builder;
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2400 builder.settings_["indentation"] = "";
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2401 target = Json::writeString(builder, source);
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2402 #endif
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2403 }
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2404
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2405
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2406 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	2407 const Json::Value& source)
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2408 {
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2409 #if JSONCPP_USE_DEPRECATED == 1
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2410 Json::StyledWriter writer;
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2411 target = writer.write(source);
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2412 #else
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2413 Json::StreamWriterBuilder builder;
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2414 builder.settings_["indentation"] = " ";
f7104e9d044c functions to read/write JSON in OrthancPluginCppWrapper.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4393 diff changeset	2415 target = Json::writeString(builder, source);
4393 e8e95b80194f removing usage of deprecated JsonCpp classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4392 diff changeset	2416 #endif
4392 3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4297 diff changeset	2417 }
4622 9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2418
9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2419
9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2420 void Toolbox::RemoveSurroundingQuotes(std::string& value)
9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2421 {
9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2422 if (!value.empty() &&
9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2423 value[0] == '\"' &&
9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2424 value[value.size() - 1] == '\"')
9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2425 {
9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2426 value = value.substr(1, value.size() - 2);
9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2427 }
9086aeb9d9d2 RestApiCallDocumentation::SetAnswerHeader() and Toolbox::RemoveSurroundingQuotes() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4527 diff changeset	2428 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2429 }
2513 97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2430
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2431
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2432
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2433 OrthancLinesIterator* OrthancLinesIterator_Create(const std::string& content)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2434 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2435 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	2436 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2437
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2438
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2439 bool OrthancLinesIterator_GetLine(std::string& target,
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3973 diff changeset	2440 const OrthancLinesIterator* iterator)
2513 97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2441 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2442 if (iterator != NULL)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2443 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2444 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	2445 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2446 else
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2447 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2448 return false;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2449 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2450 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2451
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2452
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2453 void OrthancLinesIterator_Next(OrthancLinesIterator* iterator)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2454 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2455 if (iterator != NULL)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2456 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2457 reinterpret_cast<Orthanc::Toolbox::LinesIterator*>(iterator)->Next();
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2458 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2459 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2460
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2461
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2462 void OrthancLinesIterator_Free(OrthancLinesIterator* iterator)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2463 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2464 if (iterator != NULL)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2465 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2466 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	2467 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2468 }

Mercurial > hg > orthanc

annotate OrthancFramework/Sources/Toolbox.cpp @ 5141:023569e7155b