orthanc: Core/Toolbox.cpp annotate

annotate Core/Toolbox.cpp @ 3487:ce29644acd19

Prevented unaligned memcpy when using Web Assembly

author	Benjamin Golinvaux <bgo@osimis.io>
date	Mon, 05 Aug 2019 13:57:54 +0200
parents	7d72e43f4a2d
children	e7723a39adf8

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
3060 4e43e67f8ecf preparing for 2019 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	5 * Copyright (C) 2017-2019 Osimis S.A., Belgium
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 110 diff changeset	11 *
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 110 diff changeset	12 * In addition, as a special exception, the copyright holders of this
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 110 diff changeset	13 * program give permission to link the code of its release with the
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 110 diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 110 diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 110 diff changeset	16 * the linked executables. You must obey the GNU General Public License
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 110 diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 110 diff changeset	18 * modify file(s) with this exception, you may extend this exception to
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 110 diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 110 diff changeset	20 * you do not wish to do so, delete this exception statement from your
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 110 diff changeset	21 * version. If you delete this exception statement from all source files
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 110 diff changeset	22 * in the program, then also delete it here.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * 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	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
824 a811bdf8b8eb precompiled headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	34 #include "PrecompiledHeaders.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "Toolbox.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	37 #include "OrthancException.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1480 diff changeset	38 #include "Logging.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	40 #include <boost/algorithm/string/case_conv.hpp>
2143 fd5875662670 creation of namespace SystemToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2141 diff changeset	41 #include <boost/algorithm/string/replace.hpp>
fd5875662670 creation of namespace SystemToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2141 diff changeset	42 #include <boost/lexical_cast.hpp>
2931 89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	43 #include <boost/regex.hpp>
89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	44
89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	45 #if BOOST_VERSION >= 106600
89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	46 # include <boost/uuid/detail/sha1.hpp>
89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	47 #else
89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	48 # include <boost/uuid/sha1.hpp>
89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	49 #endif
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	50
1397 704de8c30ff5 modularization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	51 #include <string>
453 30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	52 #include <stdint.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53 #include <string.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54 #include <algorithm>
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	55 #include <ctype.h>
1397 704de8c30ff5 modularization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	56
915 703bef350e89 Orthanc now relies entirely on boost::locale Sebastien Jodogne <s.jodogne@gmail.com> parents: 890 diff changeset	57
2137 595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	58 #if ORTHANC_ENABLE_MD5 == 1
2931 89f2c302fc37 Fix issue #114 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2926 diff changeset	59 // 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	60 // with Boost >= 1.66.0
2137 595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	61 # 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	62 #endif
8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	63
2137 595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	64 #if ORTHANC_ENABLE_BASE64 == 1
595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	65 # 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	66 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	68 #if ORTHANC_ENABLE_LOCALE == 1
2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	69 # include <boost/locale.hpp>
2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	70 #endif
2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	71
2677 0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	72 #if ORTHANC_ENABLE_SSL == 1
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	73 // For OpenSSL initialization and finalization
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	74 # include <openssl/conf.h>
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	75 # include <openssl/engine.h>
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	76 # include <openssl/err.h>
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	77 # include <openssl/evp.h>
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	78 # include <openssl/ssl.h>
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	79 #endif
0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	80
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	81
1111 929bf8c2123d Fixes for Visual Studio 2013 64bit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1103 diff changeset	82 #if defined(_MSC_VER) && (_MSC_VER < 1800)
929bf8c2123d Fixes for Visual Studio 2013 64bit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1103 diff changeset	83 // Patch for the missing "_strtoll" symbol when compiling with Visual Studio < 2013
570 86c5bb651bfa fix jodogne parents: 568 diff changeset	84 extern "C"
86c5bb651bfa fix jodogne parents: 568 diff changeset	85 {
915 703bef350e89 Orthanc now relies entirely on boost::locale Sebastien Jodogne <s.jodogne@gmail.com> parents: 890 diff changeset	86 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	87 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	88 {
915 703bef350e89 Orthanc now relies entirely on boost::locale Sebastien Jodogne <s.jodogne@gmail.com> parents: 890 diff changeset	89 return _strtoi64(nptr, endptr, base);
703bef350e89 Orthanc now relies entirely on boost::locale Sebastien Jodogne <s.jodogne@gmail.com> parents: 890 diff changeset	90 }
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	91 }
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	92 #endif
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	93
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	94
2173 1c42860097fc fix windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	95 #if defined(_WIN32)
1c42860097fc fix windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	96 # include <windows.h> // For ::Sleep
1c42860097fc fix windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	97 #endif
1c42860097fc fix windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	98
2141 a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	99
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2129 diff changeset	100 #if ORTHANC_ENABLE_PUGIXML == 1
2143 fd5875662670 creation of namespace SystemToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2141 diff changeset	101 # include "ChunkedBuffer.h"
1045 0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	102 #endif
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	103
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	104
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	105 // Inclusions for UUID
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	106 // http://stackoverflow.com/a/1626302
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	107
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	108 extern "C"
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	109 {
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	110 #if defined(_WIN32)
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	111 # include <rpc.h>
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	112 #else
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	113 # include <uuid/uuid.h>
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	114 #endif
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	115 }
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	116
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	117
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	118 #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	119 # if (ORTHANC_STATIC_ICU == 1 && ORTHANC_ENABLE_LOCALE == 1)
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	120 # include <EmbeddedResources.h>
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	121 # 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	122 # 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	123 # 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	124
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	125 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	126
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	127 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	128 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	129 // 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	130 // 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	131 // (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	132 // 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	133 // 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	134 // 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	135 struct
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	136 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	137 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	138 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	139 } 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	140 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	141
3462 7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	142 # if defined(__LSB_VERSION__)
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	143 extern "C"
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	144 {
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	145 /**
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	146 * 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	147 * 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	148 * 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	149 * 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	150 * 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	151 * 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	152 * 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	153 * 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	154 **/
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	155 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	156 }
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	157 # endif
7d72e43f4a2d attempt to fix LSB on Ubuntu 18.04 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3459 diff changeset	158
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	159 # endif
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	160 #endif
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	161
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	162
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	163
3459 cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	164 #if defined(__unix__) && ORTHANC_SANDBOXED != 1
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	165 # include "SystemToolbox.h" // Check out "InitializeGlobalLocale()"
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	166 #endif
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	167
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	168
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	169
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	170 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	171 {
2513 97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	172 void Toolbox::LinesIterator::FindEndOfLine()
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	173 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	174 lineEnd_ = lineStart_;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	175
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	176 while (lineEnd_ < content_.size() &&
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	177 content_[lineEnd_] != '\n' &&
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	178 content_[lineEnd_] != '\r')
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	179 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	180 lineEnd_ += 1;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	181 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	182 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	183
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	184
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	185 Toolbox::LinesIterator::LinesIterator(const std::string& content) :
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	186 content_(content),
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	187 lineStart_(0)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	188 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	189 FindEndOfLine();
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	190 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	191
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	192
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	193 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	194 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	195 assert(lineStart_ <= content_.size() &&
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	196 lineEnd_ <= content_.size() &&
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	197 lineStart_ <= lineEnd_);
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	198
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	199 if (lineStart_ == content_.size())
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 return false;
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 else
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	204 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	205 target = content_.substr(lineStart_, lineEnd_ - lineStart_);
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	206 return true;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	207 }
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 void Toolbox::LinesIterator::Next()
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	212 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	213 lineStart_ = lineEnd_;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	214
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	215 if (lineStart_ != content_.size())
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	216 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	217 assert(content_[lineStart_] == '\r' \|\|
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	218 content_[lineStart_] == '\n');
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 char second;
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 if (content_[lineStart_] == '\r')
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	223 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	224 second = '\n';
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 else
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 second = '\r';
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	229 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	230
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	231 lineStart_ += 1;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	232
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	233 if (lineStart_ < content_.size() &&
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	234 content_[lineStart_] == second)
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 lineStart_ += 1;
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
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	239 FindEndOfLine();
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	240 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	241 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	242
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	243
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244 void Toolbox::ToUpperCase(std::string& s)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246 std::transform(s.begin(), s.end(), s.begin(), toupper);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	247 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250 void Toolbox::ToLowerCase(std::string& s)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	251 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 std::transform(s.begin(), s.end(), s.begin(), tolower);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	255
690 2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	256 void Toolbox::ToUpperCase(std::string& result,
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	257 const std::string& source)
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	258 {
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	259 result = source;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	260 ToUpperCase(result);
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	261 }
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	262
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	263 void Toolbox::ToLowerCase(std::string& result,
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	264 const std::string& source)
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	265 {
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	266 result = source;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	267 ToLowerCase(result);
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	268 }
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	269
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	270
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	271 void Toolbox::SplitUriComponents(UriComponents& components,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	272 const std::string& uri)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	273 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	274 static const char URI_SEPARATOR = '/';
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 components.clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	277
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	278 if (uri.size() == 0 \|\|
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	279 uri[0] != URI_SEPARATOR)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	280 {
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	281 throw OrthancException(ErrorCode_UriSyntax);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	282 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	283
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	284 // Count the number of slashes in the URI to make an assumption
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	285 // about the number of components in the URI
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	286 unsigned int estimatedSize = 0;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	287 for (unsigned int i = 0; i < uri.size(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	288 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	289 if (uri[i] == URI_SEPARATOR)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	290 estimatedSize++;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	291 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	292
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	293 components.reserve(estimatedSize - 1);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	294
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	295 unsigned int start = 1;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	296 unsigned int end = 1;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	297 while (end < uri.size())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	298 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	299 // This is the loop invariant
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	300 assert(uri[start - 1] == '/' && (end >= start));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	301
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	302 if (uri[end] == '/')
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	303 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	304 components.push_back(std::string(&uri[start], end - start));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	305 end++;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	306 start = end;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	307 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	308 else
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 end++;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	311 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	312 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	313
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	314 if (start < uri.size())
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 components.push_back(std::string(&uri[start], end - start));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	317 }
207 7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	318
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	319 for (size_t i = 0; i < components.size(); i++)
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	320 {
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	321 if (components[i].size() == 0)
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	322 {
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	323 // Empty component, as in: "/coucou//e"
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	324 throw OrthancException(ErrorCode_UriSyntax);
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	325 }
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	326 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	327 }
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
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	330 void Toolbox::TruncateUri(UriComponents& target,
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	331 const UriComponents& source,
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	332 size_t fromLevel)
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	333 {
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	334 target.clear();
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	335
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	336 if (source.size() > fromLevel)
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	337 {
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	338 target.resize(source.size() - fromLevel);
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	339
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	340 size_t j = 0;
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	341 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	342 {
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	343 target[j] = source[i];
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	344 }
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	345
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	346 assert(j == target.size());
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	347 }
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	348 }
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	349
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	350
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	351
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352 bool Toolbox::IsChildUri(const UriComponents& baseUri,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 const UriComponents& testedUri)
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 if (testedUri.size() < baseUri.size())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	356 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357 return false;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360 for (size_t i = 0; i < baseUri.size(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	361 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	362 if (baseUri[i] != testedUri[i])
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	363 return false;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	364 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	366 return true;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	367 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	368
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	369
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	370 std::string Toolbox::FlattenUri(const UriComponents& components,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	371 size_t fromLevel)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	372 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	373 if (components.size() <= fromLevel)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	374 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	375 return "/";
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	376 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	377 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	378 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	379 std::string r;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	380
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	381 for (size_t i = fromLevel; i < components.size(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	382 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	383 r += "/" + components[i];
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	384 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	385
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	386 return r;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	387 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	388 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	389
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	390
2137 595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	391 #if ORTHANC_ENABLE_MD5 == 1
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	392 static char GetHexadecimalCharacter(uint8_t value)
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	393 {
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	394 assert(value < 16);
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	395
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	396 if (value < 10)
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	397 {
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	398 return value + '0';
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	399 }
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	400 else
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	401 {
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	402 return (value - 10) + 'a';
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	403 }
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	404 }
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	405
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 22 diff changeset	406
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	407 void Toolbox::ComputeMD5(std::string& result,
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	408 const std::string& data)
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	409 {
693 01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	410 if (data.size() > 0)
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	411 {
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	412 ComputeMD5(result, &data[0], data.size());
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	413 }
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	414 else
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	415 {
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	416 ComputeMD5(result, NULL, 0);
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	417 }
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	418 }
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	419
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	420
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	421 void Toolbox::ComputeMD5(std::string& result,
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	422 const void* data,
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	423 size_t size)
693 01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	424 {
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	425 md5_state_s state;
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	426 md5_init(&state);
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	427
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	428 if (size > 0)
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	429 {
693 01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	430 md5_append(&state,
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	431 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	432 static_cast<int>(size));
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	433 }
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	434
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	435 md5_byte_t actualHash[16];
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	436 md5_finish(&state, actualHash);
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	437
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	438 result.resize(32);
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	439 for (unsigned int i = 0; i < 16; i++)
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	440 {
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	441 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	442 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	443 }
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	444 }
1479 8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	445 #endif
24 166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	446
166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	447
2137 595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	448 #if ORTHANC_ENABLE_BASE64 == 1
809 8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	449 void Toolbox::EncodeBase64(std::string& result,
8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	450 const std::string& data)
24 166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	451 {
3326 b21d4cc8e5d1 speed up base64 decoding + added tests Alain Mazy <alain@mazy.be> parents: 3325 diff changeset	452 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	453 base64_encode(result, data);
24 166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	454 }
166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	455
809 8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	456 void Toolbox::DecodeBase64(std::string& result,
8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	457 const std::string& data)
365 cda6938a8c6f decode base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 337 diff changeset	458 {
1988 e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	459 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	460 {
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	461 if (!isalnum(data[i]) &&
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	462 data[i] != '+' &&
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	463 data[i] != '/' &&
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	464 data[i] != '=')
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	465 {
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	466 // 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	467 throw OrthancException(ErrorCode_BadFileFormat);
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	468 }
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	469 }
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	470
3326 b21d4cc8e5d1 speed up base64 decoding + added tests Alain Mazy <alain@mazy.be> parents: 3325 diff changeset	471 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	472 base64_decode(result, data);
365 cda6938a8c6f decode base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 337 diff changeset	473 }
1648 a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	474
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	475
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	476 bool Toolbox::DecodeDataUriScheme(std::string& mime,
1648 a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	477 std::string& content,
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	478 const std::string& source)
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	479 {
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	480 boost::regex pattern("data:([^;]+);base64,([a-zA-Z0-9=+/]*)",
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	481 boost::regex::icase /* case insensitive search */);
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	482
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	483 boost::cmatch what;
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	484 if (regex_match(source.c_str(), what, pattern))
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	485 {
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	486 mime = what[1];
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	487 DecodeBase64(content, what[2]);
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	488 return true;
1648 a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	489 }
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	490 else
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	491 {
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	492 return false;
1648 a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	493 }
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	494 }
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	495
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	496
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	497 void Toolbox::EncodeDataUriScheme(std::string& result,
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	498 const std::string& mime,
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	499 const std::string& content)
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	500 {
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	501 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	502 base64_encode(result, content);
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	503 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	504
1479 8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	505 #endif
8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	506
365 cda6938a8c6f decode base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 337 diff changeset	507
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2373 diff changeset	508 #if ORTHANC_ENABLE_LOCALE == 1
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	509 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	510 {
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	511 switch (sourceEncoding)
766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	512 {
766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	513 case Encoding_Utf8:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	514 return "UTF-8";
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	515
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 950 diff changeset	516 case Encoding_Ascii:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	517 return "ASCII";
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 950 diff changeset	518
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	519 case Encoding_Latin1:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	520 return "ISO-8859-1";
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	521
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	522 case Encoding_Latin2:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	523 return "ISO-8859-2";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	524
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	525 case Encoding_Latin3:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	526 return "ISO-8859-3";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	527
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	528 case Encoding_Latin4:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	529 return "ISO-8859-4";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	530
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	531 case Encoding_Latin5:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	532 return "ISO-8859-9";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	533
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	534 case Encoding_Cyrillic:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	535 return "ISO-8859-5";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	536
1347 60cc0ee61edb fix issue 32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1337 diff changeset	537 case Encoding_Windows1251:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	538 return "WINDOWS-1251";
1347 60cc0ee61edb fix issue 32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1337 diff changeset	539
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	540 case Encoding_Arabic:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	541 return "ISO-8859-6";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	542
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	543 case Encoding_Greek:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	544 return "ISO-8859-7";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	545
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	546 case Encoding_Hebrew:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	547 return "ISO-8859-8";
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	548
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	549 case Encoding_Japanese:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	550 return "SHIFT-JIS";
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	551
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	552 case Encoding_Chinese:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	553 return "GB18030";
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	554
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	555 case Encoding_Thai:
3230 4b042ec734c1 dynamic linking against libicu Sebastien Jodogne <s.jodogne@gmail.com> parents: 3226 diff changeset	556 #if BOOST_LOCALE_WITH_ICU == 1
4b042ec734c1 dynamic linking against libicu Sebastien Jodogne <s.jodogne@gmail.com> parents: 3226 diff changeset	557 return "tis620.2533";
4b042ec734c1 dynamic linking against libicu Sebastien Jodogne <s.jodogne@gmail.com> parents: 3226 diff changeset	558 #else
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	559 return "TIS620.2533-0";
3230 4b042ec734c1 dynamic linking against libicu Sebastien Jodogne <s.jodogne@gmail.com> parents: 3226 diff changeset	560 #endif
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	561
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	562 case Encoding_Korean:
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	563 return "ISO-IR-149";
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	564
3218 9a83d94b2a1e kanji encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	565 case Encoding_JapaneseKanji:
9a83d94b2a1e kanji encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	566 return "JIS";
9a83d94b2a1e kanji encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	567
3226 45e1631febbb support of simplified chinese Sebastien Jodogne <s.jodogne@gmail.com> parents: 3221 diff changeset	568 case Encoding_SimplifiedChinese:
45e1631febbb support of simplified chinese Sebastien Jodogne <s.jodogne@gmail.com> parents: 3221 diff changeset	569 return "GB2312";
45e1631febbb support of simplified chinese Sebastien Jodogne <s.jodogne@gmail.com> parents: 3221 diff changeset	570
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	571 default:
957 63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	572 throw OrthancException(ErrorCode_NotImplemented);
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	573 }
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	574 }
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2373 diff changeset	575 #endif
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	576
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	577
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	578 #if ORTHANC_ENABLE_LOCALE == 1
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	579 // 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	580 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	581 Encoding sourceEncoding,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	582 bool hasCodeExtensions)
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	583 {
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	584 #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	585 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	586 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	587 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	588 "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	589 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	590 #endif
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	591
2907 0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	592 // 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	593 // 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	594
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	595 try
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	596 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	597 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	598 {
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	599 return ConvertToAscii(source);
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	600 }
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	601 else
2907 0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	602 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	603 std::string s;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	604
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	605 if (sourceEncoding == Encoding_Utf8)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	606 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	607 // 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	608 // the output is correctly encoded
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	609 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	610 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	611 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	612 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	613 const char* encoding = GetBoostLocaleEncoding(sourceEncoding);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	614 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	615 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	616
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	617 if (hasCodeExtensions)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	618 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	619 std::string t;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	620 RemoveIso2022EscapeSequences(t, s);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	621 return t;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	622 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	623 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	624 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	625 return s;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	626 }
2907 0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	627 }
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	628 }
3218 9a83d94b2a1e kanji encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	629 catch (std::runtime_error& e)
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	630 {
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	631 // Bad input string or bad encoding
3218 9a83d94b2a1e kanji encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	632 LOG(INFO) << e.what();
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	633 return ConvertToAscii(source);
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	634 }
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	635 }
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	636 #endif
2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	637
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	638
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	639 #if ORTHANC_ENABLE_LOCALE == 1
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	640 std::string Toolbox::ConvertFromUtf8(const std::string& source,
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	641 Encoding targetEncoding)
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	642 {
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	643 #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	644 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	645 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	646 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	647 "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	648 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	649 #endif
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	650
2907 0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	651 // 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	652 // 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	653
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	654 try
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	655 {
2907 0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	656 if (targetEncoding == Encoding_Utf8)
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	657 {
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	658 // 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	659 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	660 }
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	661 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	662 {
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	663 return ConvertToAscii(source);
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	664 }
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	665 else
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	666 {
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	667 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	668 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	669 }
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	670 }
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	671 catch (std::runtime_error&)
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	672 {
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	673 // Bad input string or bad encoding
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	674 return ConvertToAscii(source);
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	675 }
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	676 }
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	677 #endif
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	678
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	679
2900 668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	680 static bool IsAsciiCharacter(uint8_t c)
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	681 {
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	682 return (c != 0 &&
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	683 c <= 127 &&
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	684 (c == '\n' \|\| !iscntrl(c)));
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	685 }
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	686
668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	687
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	688 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	689 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	690 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	691 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	692
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	693 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	694 {
2900 668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	695 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	696 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	697 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	698 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	699 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	700
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	701 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	702 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	703
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	704
2442 330349d712f9 fix Toolbox::IsAsciiString Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	705 bool Toolbox::IsAsciiString(const std::string& s)
330349d712f9 fix Toolbox::IsAsciiString Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	706 {
330349d712f9 fix Toolbox::IsAsciiString Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	707 return IsAsciiString(s.c_str(), s.size());
330349d712f9 fix Toolbox::IsAsciiString Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	708 }
330349d712f9 fix Toolbox::IsAsciiString Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	709
330349d712f9 fix Toolbox::IsAsciiString Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	710
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	711 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	712 {
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	713 std::string result;
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	714
942 b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 930 diff changeset	715 result.reserve(source.size() + 1);
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	716 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	717 {
2900 668d5ad73c74 Font::Render() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2856 diff changeset	718 if (IsAsciiCharacter(source[i]))
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	719 {
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	720 result.push_back(source[i]);
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	721 }
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	722 }
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	723
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	724 return result;
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	725 }
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	726
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	727
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	728 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	729 const void* data,
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	730 size_t size)
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	731 {
560 69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	732 boost::uuids::detail::sha1 sha1;
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	733
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	734 if (size > 0)
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	735 {
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	736 sha1.process_bytes(data, size);
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	737 }
81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	738
560 69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	739 unsigned int digest[5];
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	740
81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	741 // 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	742 assert(sizeof(unsigned int) == 4 && sizeof(digest) == (160 / 8));
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	743
560 69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	744 sha1.get_digest(digest);
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	745
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	746 result.resize(8 * 5 + 4);
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	747 sprintf(&result[0], "%08x-%08x-%08x-%08x-%08x",
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	748 digest[0],
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	749 digest[1],
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	750 digest[2],
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	751 digest[3],
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	752 digest[4]);
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	753 }
81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	754
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	755 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	756 const std::string& data)
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	757 {
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	758 if (data.size() > 0)
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	759 {
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	760 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	761 }
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	762 else
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	763 {
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	764 ComputeSHA1(result, NULL, 0);
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	765 }
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	766 }
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	767
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	768
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3382 diff changeset	769 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	770 size_t size)
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	771 {
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	772 if (size == 0)
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	773 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	774 return false;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	775 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	776
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3382 diff changeset	777 const char* start = reinterpret_cast<const char*>(str);
962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3382 diff changeset	778 const char* end = start + size;
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	779
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	780 // Trim the beginning of the string
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	781 while (start < end)
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	782 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	783 if (*start == '\0' \|\|
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	784 isspace(*start))
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	785 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	786 start++;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	787 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	788 else
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	789 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	790 break;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	791 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	792 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	793
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	794 // Trim the trailing of the string
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	795 while (start < end)
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	796 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	797 if (*(end - 1) == '\0' \|\|
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	798 isspace(*(end - 1)))
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	799 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	800 end--;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	801 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	802 else
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	803 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	804 break;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	805 }
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
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	808 if (end - start != 44)
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	809 {
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	810 return false;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	811 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	812
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	813 for (unsigned int i = 0; i < 44; i++)
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	814 {
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	815 if (i == 8 \|\|
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	816 i == 17 \|\|
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	817 i == 26 \|\|
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	818 i == 35)
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	819 {
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	820 if (start[i] != '-')
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	821 return false;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	822 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	823 else
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	824 {
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	825 if (!isalnum(start[i]))
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	826 return false;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	827 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	828 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	829
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	830 return true;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	831 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	832
1397 704de8c30ff5 modularization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	833
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	834 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	835 {
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	836 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	837 {
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	838 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	839 }
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	840 else
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	841 {
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	842 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	843 }
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	844 }
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	845
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	846
247 c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	847 std::string Toolbox::StripSpaces(const std::string& source)
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	848 {
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	849 size_t first = 0;
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	850
247 c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	851 while (first < source.length() &&
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	852 isspace(source[first]))
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	853 {
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	854 first++;
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	855 }
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	856
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	857 if (first == source.length())
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	858 {
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	859 // String containing only spaces
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	860 return "";
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	861 }
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	862
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	863 size_t last = source.length();
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	864 while (last > first &&
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	865 isspace(source[last - 1]))
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	866 {
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	867 last--;
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	868 }
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	869
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	870 assert(first <= last);
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	871 return source.substr(first, last - first);
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	872 }
336 3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	873
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	874
337 26218c4de7e0 test added Sebastien Jodogne <s.jodogne@gmail.com> parents: 336 diff changeset	875 static char Hex2Dec(char c)
336 3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	876 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	877 return ((c >= '0' && c <= '9') ? c - '0' :
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	878 ((c >= 'a' && c <= 'f') ? c - 'a' + 10 : c - 'A' + 10));
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	879 }
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	880
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	881 void Toolbox::UrlDecode(std::string& s)
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	882 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	883 // http://en.wikipedia.org/wiki/Percent-encoding
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	884 // http://www.w3schools.com/tags/ref_urlencode.asp
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	885 // http://stackoverflow.com/questions/154536/encode-decode-urls-in-c
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	886
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	887 if (s.size() == 0)
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	888 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	889 return;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	890 }
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	891
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	892 size_t source = 0;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	893 size_t target = 0;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	894
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	895 while (source < s.size())
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	896 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	897 if (s[source] == '%' &&
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	898 source + 2 < s.size() &&
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	899 isalnum(s[source + 1]) &&
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	900 isalnum(s[source + 2]))
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	901 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	902 s[target] = (Hex2Dec(s[source + 1]) << 4) \| Hex2Dec(s[source + 2]);
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	903 source += 3;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	904 target += 1;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	905 }
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	906 else
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 if (s[source] == '+')
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	909 s[target] = ' ';
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	910 else
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	911 s[target] = s[source];
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	912
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	913 source++;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	914 target++;
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 }
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 s.resize(target);
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	919 }
453 30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	920
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	921
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	922 Endianness Toolbox::DetectEndianness()
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	923 {
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	924 // http://sourceforge.net/p/predef/wiki/Endianness/
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	925
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	926 uint8_t buffer[4];
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	927
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	928 buffer[0] = 0x00;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	929 buffer[1] = 0x01;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	930 buffer[2] = 0x02;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	931 buffer[3] = 0x03;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	932
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	933 switch (((uint32_t )buffer))
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	934 {
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	935 case 0x00010203:
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	936 return Endianness_Big;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	937
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	938 case 0x03020100:
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	939 return Endianness_Little;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	940
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	941 default:
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	942 throw OrthancException(ErrorCode_NotImplemented);
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	943 }
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	944 }
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	945
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	946
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	947 std::string Toolbox::WildcardToRegularExpression(const std::string& source)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	948 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	949 // TODO - Speed up this with a regular expression
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	950
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	951 std::string result = source;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	952
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	953 // Escape all special characters
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	954 boost::replace_all(result, "\\", "\\\\");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	955 boost::replace_all(result, "^", "\\^");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	956 boost::replace_all(result, ".", "\\.");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	957 boost::replace_all(result, "$", "\\$");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	958 boost::replace_all(result, "\|", "\\\|");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	959 boost::replace_all(result, "(", "\\(");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	960 boost::replace_all(result, ")", "\\)");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	961 boost::replace_all(result, "[", "\\[");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	962 boost::replace_all(result, "]", "\\]");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	963 boost::replace_all(result, "+", "\\+");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	964 boost::replace_all(result, "/", "\\/");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	965 boost::replace_all(result, "{", "\\{");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	966 boost::replace_all(result, "}", "\\}");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	967
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	968 // Convert wildcards '*' and '?' to their regex equivalents
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	969 boost::replace_all(result, "?", ".");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	970 boost::replace_all(result, "", ".");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	971
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	972 return result;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	973 }
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
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	976 void Toolbox::TokenizeString(std::vector<std::string>& result,
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	977 const std::string& value,
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	978 char separator)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	979 {
3382 a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	980 size_t countSeparators = 0;
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	981
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	982 for (size_t i = 0; i < value.size(); i++)
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	983 {
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	984 if (value[i] == separator)
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	985 {
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	986 countSeparators++;
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	987 }
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	988 }
a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	989
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	990 result.clear();
3382 a2862d4484f5 optimization of Toolbox::TokenizeString() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3333 diff changeset	991 result.reserve(countSeparators + 1);
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	992
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	993 std::string currentItem;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	994
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	995 for (size_t i = 0; i < value.size(); i++)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	996 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	997 if (value[i] == separator)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	998 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	999 result.push_back(currentItem);
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1000 currentItem.clear();
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 else
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 currentItem.push_back(value[i]);
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1005 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1006 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1007
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1008 result.push_back(currentItem);
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	1009 }
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	1010
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	1011
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2129 diff changeset	1012 #if ORTHANC_ENABLE_PUGIXML == 1
1045 0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1013 class ChunkedBufferWriter : public pugi::xml_writer
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1014 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1015 private:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1016 ChunkedBuffer buffer_;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1017
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1018 public:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1019 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	1020 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1021 if (size > 0)
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1022 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1023 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	1024 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1025 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1026
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1027 void Flatten(std::string& s)
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1028 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1029 buffer_.Flatten(s);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1030 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1031 };
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1032
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1033
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1034 static void JsonToXmlInternal(pugi::xml_node& target,
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1035 const Json::Value& source,
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1036 const std::string& arrayElement)
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1037 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1038 // 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	1039
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1040 switch (source.type())
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1041 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1042 case Json::nullValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1043 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1044 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	1045 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1046 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1047
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1048 case Json::intValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1049 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1050 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	1051 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	1052 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1053 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1054
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1055 case Json::uintValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1056 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1057 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	1058 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	1059 break;
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
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1062 case Json::realValue:
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 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	1065 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	1066 break;
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 case Json::stringValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1070 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1071 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	1072 break;
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 case Json::booleanValue:
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 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	1078 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1079 }
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 case Json::arrayValue:
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 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	1084 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1085 pugi::xml_node node = target.append_child();
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1086 node.set_name(arrayElement.c_str());
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1087 JsonToXmlInternal(node, source[i], arrayElement);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1088 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1089 break;
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
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1092 case Json::objectValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1093 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1094 Json::Value::Members members = source.getMemberNames();
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1095
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1096 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	1097 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1098 pugi::xml_node node = target.append_child();
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1099 node.set_name(members[i].c_str());
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1100 JsonToXmlInternal(node, source[members[i]], arrayElement);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1101 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1102
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1103 break;
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
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1106 default:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1107 throw OrthancException(ErrorCode_NotImplemented);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1108 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1109 }
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 void Toolbox::JsonToXml(std::string& target,
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1113 const Json::Value& source,
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1114 const std::string& rootElement,
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1115 const std::string& arrayElement)
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 pugi::xml_document doc;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1118
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1119 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	1120 JsonToXmlInternal(n, source, arrayElement);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1121
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1122 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	1123 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	1124 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	1125
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	1126 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	1127 }
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1128
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1129 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	1130 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	1131 {
1045 0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1132 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	1133 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	1134 writer.Flatten(target);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1135 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	1136 #endif
1050 64f1842aae2e Toolbox::ExecuteSystemCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 1045 diff changeset	1137
64f1842aae2e Toolbox::ExecuteSystemCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 1045 diff changeset	1138
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1139
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1140 bool Toolbox::IsInteger(const std::string& str)
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1141 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1142 std::string s = StripSpaces(str);
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1143
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1144 if (s.size() == 0)
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1145 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1146 return false;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1147 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1148
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1149 size_t pos = 0;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1150 if (s[0] == '-')
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1151 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1152 if (s.size() == 1)
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1153 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1154 return false;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1155 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1156
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1157 pos = 1;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1158 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1159
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1160 while (pos < s.size())
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1161 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1162 if (!isdigit(s[pos]))
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1163 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1164 return false;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1165 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1166
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1167 pos++;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1168 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1169
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1170 return true;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	1171 }
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1172
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1173
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1174 void Toolbox::CopyJsonWithoutComments(Json::Value& target,
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1175 const Json::Value& source)
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1176 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1177 switch (source.type())
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1178 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1179 case Json::nullValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1180 target = Json::nullValue;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1181 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1182
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1183 case Json::intValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1184 target = source.asInt64();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1185 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1186
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1187 case Json::uintValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1188 target = source.asUInt64();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1189 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1190
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1191 case Json::realValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1192 target = source.asDouble();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1193 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1194
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1195 case Json::stringValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1196 target = source.asString();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1197 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1198
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1199 case Json::booleanValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1200 target = source.asBool();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1201 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1202
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1203 case Json::arrayValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1204 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1205 target = Json::arrayValue;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1206 for (Json::Value::ArrayIndex i = 0; i < source.size(); i++)
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1207 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1208 Json::Value& item = target.append(Json::nullValue);
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1209 CopyJsonWithoutComments(item, source[i]);
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1210 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1211
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1212 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1213 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1214
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1215 case Json::objectValue:
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 target = Json::objectValue;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1218 Json::Value::Members members = source.getMemberNames();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1219 for (Json::Value::ArrayIndex i = 0; i < members.size(); i++)
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1220 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1221 const std::string item = members[i];
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1222 CopyJsonWithoutComments(target[item], source[item]);
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1223 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1224
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1225 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1226 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1227
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1228 default:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1229 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1230 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1231 }
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1232
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1233
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1234 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	1235 const std::string& prefix)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1236 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1237 if (str.size() < prefix.size())
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1238 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1239 return false;
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1240 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1241 else
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1242 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1243 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	1244 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1245 }
2043 35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1246
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1247
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1248 static bool IsUnreservedCharacter(char c)
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1249 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1250 // This function checks whether "c" is an unserved character
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1251 // wrt. an URI percent-encoding
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1252 // 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	1253
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1254 return ((c >= 'A' && c <= 'Z') \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1255 (c >= 'a' && c <= 'z') \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1256 (c >= '0' && c <= '9') \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1257 c == '-' \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1258 c == '_' \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1259 c == '.' \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1260 c == '~');
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1261 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1262
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1263 void Toolbox::UriEncode(std::string& target,
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1264 const std::string& source)
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1265 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1266 // Estimate the length of the percent-encoded URI
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1267 size_t length = 0;
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1268
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1269 for (size_t i = 0; i < source.size(); i++)
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1270 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1271 if (IsUnreservedCharacter(source[i]))
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1272 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1273 length += 1;
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1274 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1275 else
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1276 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1277 // This character must be percent-encoded
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1278 length += 3;
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1279 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1280 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1281
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1282 target.clear();
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1283 target.reserve(length);
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1284
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1285 for (size_t i = 0; i < source.size(); i++)
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1286 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1287 if (IsUnreservedCharacter(source[i]))
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1288 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1289 target.push_back(source[i]);
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 else
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 character must be percent-encoded
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1294 uint8_t byte = static_cast<uint8_t>(source[i]);
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1295 uint8_t a = byte >> 4;
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1296 uint8_t b = byte & 0x0f;
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1297
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1298 target.push_back('%');
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1299 target.push_back(a < 10 ? a + '0' : a - 10 + 'A');
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1300 target.push_back(b < 10 ? b + '0' : b - 10 + 'A');
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1301 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1302 }
2071 27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1303 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1304
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1305
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1306 static bool HasField(const Json::Value& json,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1307 const std::string& key,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1308 Json::ValueType expectedType)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1309 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1310 if (json.type() != Json::objectValue \|\|
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1311 !json.isMember(key))
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1312 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1313 return false;
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1314 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1315 else if (json[key].type() == expectedType)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1316 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1317 return true;
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1318 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1319 else
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1320 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1321 throw OrthancException(ErrorCode_BadParameterType);
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1322 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1323 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1324
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1325
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1326 std::string Toolbox::GetJsonStringField(const Json::Value& json,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1327 const std::string& key,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1328 const std::string& defaultValue)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1329 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1330 if (HasField(json, key, Json::stringValue))
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1331 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1332 return json[key].asString();
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1333 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1334 else
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1335 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1336 return defaultValue;
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1337 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1338 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1339
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1340
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1341 bool Toolbox::GetJsonBooleanField(const ::Json::Value& json,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1342 const std::string& key,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1343 bool defaultValue)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1344 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1345 if (HasField(json, key, Json::booleanValue))
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1346 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1347 return json[key].asBool();
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 else
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1350 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1351 return defaultValue;
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1352 }
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
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1355
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1356 int Toolbox::GetJsonIntegerField(const ::Json::Value& json,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1357 const std::string& key,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1358 int defaultValue)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1359 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1360 if (HasField(json, key, Json::intValue))
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1361 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1362 return json[key].asInt();
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1363 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1364 else
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1365 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1366 return defaultValue;
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
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1371 unsigned int Toolbox::GetJsonUnsignedIntegerField(const ::Json::Value& json,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1372 const std::string& key,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1373 unsigned int defaultValue)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1374 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1375 int v = GetJsonIntegerField(json, key, defaultValue);
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1376
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1377 if (v < 0)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1378 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1379 throw OrthancException(ErrorCode_ParameterOutOfRange);
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1380 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1381 else
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 return static_cast<unsigned int>(v);
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 }
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2137 diff changeset	1386
aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2137 diff changeset	1387
2141 a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1388 bool Toolbox::IsUuid(const std::string& str)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1389 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1390 if (str.size() != 36)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1391 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1392 return false;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1393 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1394
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1395 for (size_t i = 0; i < str.length(); i++)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1396 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1397 if (i == 8 \|\| i == 13 \|\| i == 18 \|\| i == 23)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1398 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1399 if (str[i] != '-')
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1400 return false;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1401 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1402 else
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1403 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1404 if (!isalnum(str[i]))
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1405 return false;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1406 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1407 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1408
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1409 return true;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1410 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1411
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1412
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1413 bool Toolbox::StartsWithUuid(const std::string& str)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1414 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1415 if (str.size() < 36)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1416 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1417 return false;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1418 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1419
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1420 if (str.size() == 36)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1421 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1422 return IsUuid(str);
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1423 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1424
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1425 assert(str.size() > 36);
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1426 if (!isspace(str[36]))
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1427 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1428 return false;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1429 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1430
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1431 return IsUuid(str.substr(0, 36));
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1432 }
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1433
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1434
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	1435 #if ORTHANC_ENABLE_LOCALE == 1
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1436 static std::auto_ptr<std::locale> globalLocale_;
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1437
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1438 static bool SetGlobalLocale(const char* locale)
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1439 {
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1440 try
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1441 {
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1442 if (locale == NULL)
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1443 {
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1444 LOG(WARNING) << "Falling back to system-wide default locale";
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1445 globalLocale_.reset(new std::locale());
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1446 }
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1447 else
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1448 {
2351 56504f89d4ac log info Sebastien Jodogne <s.jodogne@gmail.com> parents: 2334 diff changeset	1449 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	1450 globalLocale_.reset(new std::locale(locale));
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1451 }
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1452 }
3459 cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1453 catch (std::runtime_error& e)
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1454 {
3459 cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1455 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	1456 << (locale ? std::string(locale) : "(null)")
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1457 << ": " << e.what();
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1458 globalLocale_.reset(NULL);
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1459 }
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1460
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1461 return (globalLocale_.get() != NULL);
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1462 }
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1463
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1464
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1465 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	1466 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1467 #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	1468 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	1469 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1470 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	1471
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1472 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	1473 compressor.Uncompress(globalIcuData_,
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1474 EmbeddedResources::GetFileResourceBuffer(EmbeddedResources::LIBICU_DATA),
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1475 EmbeddedResources::GetFileResourceSize(EmbeddedResources::LIBICU_DATA));
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1476
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1477 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	1478 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	1479
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1480 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	1481 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	1482 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1483 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	1484 "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	1485 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1486
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1487 // "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	1488 // 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	1489
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1490 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1491 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	1492
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1493 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	1494
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1495 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	1496 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1497 // 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	1498 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	1499 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1500 else
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1501 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1502 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	1503 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	1504
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1505 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	1506 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	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 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	1509 }
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 (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	1512 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1513 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	1514 }
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 // 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	1517 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	1518 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	1519 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	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 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	1522 }
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 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	1525
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1526 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	1527
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1528 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	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 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	1531 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1532 else
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 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	1535 }
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
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1538 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	1539 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1540 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	1541 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1542 }
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 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	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 // 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	1547 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	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
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1550 // "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	1551 // 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	1552 // 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	1553 // 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	1554 // 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	1555 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	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 #endif
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1558 }
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1559
2330 9c7a80c87ae9 "Locale" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	1560 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	1561 {
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1562 InitializeIcu();
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1563
3459 cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1564 #if defined(__unix__) && ORTHANC_SANDBOXED != 1
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1565 static const char* LOCALTIME = "/etc/localtime";
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1566
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1567 if (!SystemToolbox::IsExistingFile(LOCALTIME))
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1568 {
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1569 // Check out file
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1570 // "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	1571 // 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	1572 // 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	1573 // 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	1574 throw OrthancException(
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1575 ErrorCode_InternalError,
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1576 "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	1577 " 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	1578 }
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1579 #endif
cbbe0bb80bd4 explicit error message if missing /etc/localtime Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	1580
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1581 // Make Orthanc use English, United States locale
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1582 // Linux: use "en_US.UTF-8"
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1583 // Windows: use ""
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1584 // Wine: use NULL
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1585
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1586 #if defined(__MINGW32__)
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1587 // Visibly, there is no support of locales in MinGW yet
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1588 // http://mingw.5.n7.nabble.com/How-to-use-std-locale-global-with-MinGW-correct-td33048.html
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1589 static const char* DEFAULT_LOCALE = NULL;
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1590 #elif defined(_WIN32)
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1591 // For Windows: use default locale (using "en_US" does not work)
2333 6677cdbfbafd fix default locale for Windows jodogne parents: 2330 diff changeset	1592 static const char* DEFAULT_LOCALE = "";
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1593 #else
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1594 // For Linux & cie
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1595 static const char* DEFAULT_LOCALE = "en_US.UTF-8";
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1596 #endif
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1597
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1598 bool ok;
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1599
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1600 if (locale == NULL)
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1601 {
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1602 ok = SetGlobalLocale(DEFAULT_LOCALE);
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1603
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1604 #if defined(__MINGW32__)
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1605 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	1606 << "strings with accents will not work outside of Wine";
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1607 #endif
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1608 }
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1609 else
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1610 {
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1611 ok = SetGlobalLocale(locale);
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1612 }
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1613
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1614 if (!ok &&
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1615 !SetGlobalLocale(NULL))
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1616 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2931 diff changeset	1617 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2931 diff changeset	1618 "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	1619 }
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1620
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1621 }
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1622
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1623
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1624 void Toolbox::FinalizeGlobalLocale()
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1625 {
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1626 globalLocale_.reset();
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1627 }
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1628
2677 0196d07a900f migrate OpenSSL initialization to Toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2513 diff changeset	1629
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1630 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	1631 {
3333 2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1632 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	1633
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1634 #if 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	1635 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	1636 {
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1637 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	1638 }
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1639 #endif
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1640
2a38e00a0638 Size of the Orthanc static binaries are reduced by compressing ICU data Sebastien Jodogne <s.jodogne@gmail.com> parents: 3328 diff changeset	1641 if (error)
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1642 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2931 diff changeset	1643 throw OrthancException(ErrorCode_BadSequenceOfCalls,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2931 diff changeset	1644 "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	1645 }
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1646
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1647 /**
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1648 * 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	1649 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1650 * (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	1651 * 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	1652 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1653 * 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	1654 * 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	1655 * 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	1656 * 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	1657 * 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	1658 * would use:
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1659 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1660 * boost::locale::generator gen;
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1661 * 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	1662 * 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	1663 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1664 * (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	1665 * 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	1666 * global variable "globalLocale_".
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 * (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	1669 * 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	1670 * 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	1671 * "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	1672 **/
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1673
2907 0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2906 diff changeset	1674 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	1675 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	1676 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	1677 }
2373 68380777f9a6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2367 diff changeset	1678 #endif
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1679
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1680
2678 e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1681 void Toolbox::InitializeOpenSsl()
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1682 {
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1683 #if ORTHANC_ENABLE_SSL == 1
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1684 // https://wiki.openssl.org/index.php/Library_Initialization
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1685 SSL_library_init();
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1686 SSL_load_error_strings();
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1687 OpenSSL_add_all_algorithms();
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1688 ERR_load_crypto_strings();
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1689 #endif
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1690 }
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1691
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1692
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1693 void Toolbox::FinalizeOpenSsl()
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1694 {
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1695 #if ORTHANC_ENABLE_SSL == 1
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1696 // Finalize OpenSSL
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1697 // https://wiki.openssl.org/index.php/Library_Initialization#Cleanup
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1698 #ifdef FIPS_mode_set
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1699 FIPS_mode_set(0);
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1700 #endif
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1701 ENGINE_cleanup();
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1702 CONF_modules_unload(1);
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1703 EVP_cleanup();
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1704 CRYPTO_cleanup_all_ex_data();
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1705 ERR_remove_state(0);
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1706 ERR_free_strings();
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1707 #endif
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1708 }
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1709
e0476e8cb73d fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2677 diff changeset	1710
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1711 std::string Toolbox::GenerateUuid()
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1712 {
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1713 #ifdef WIN32
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1714 UUID uuid;
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1715 UuidCreate ( &uuid );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1716
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1717 unsigned char * str;
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1718 UuidToStringA ( &uuid, &str );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1719
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1720 std::string s( ( char* ) str );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1721
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1722 RpcStringFreeA ( &str );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1723 #else
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1724 uuid_t uuid;
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1725 uuid_generate_random ( uuid );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1726 char s[37];
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1727 uuid_unparse ( uuid, s );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1728 #endif
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1729 return s;
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1730 }
2920 ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1731
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1732
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1733 namespace
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1734 {
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1735 // Anonymous namespace to avoid clashes between compilation modules
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1736
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1737 class VariableFormatter
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1738 {
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1739 public:
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1740 typedef std::map<std::string, std::string> Dictionary;
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1741
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1742 private:
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1743 const Dictionary& dictionary_;
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1744
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1745 public:
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1746 VariableFormatter(const Dictionary& dictionary) :
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1747 dictionary_(dictionary)
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1748 {
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1749 }
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1750
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1751 template<typename Out>
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1752 Out operator()(const boost::smatch& what,
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1753 Out out) const
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1754 {
2921 0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1755 if (!what[1].str().empty())
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1756 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1757 // Variable without a default value
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1758 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	1759
2921 0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1760 if (found != dictionary_.end())
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1761 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1762 const std::string& value = found->second;
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1763 out = std::copy(value.begin(), value.end(), out);
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1764 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1765 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1766 else
2920 ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1767 {
2921 0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1768 // Variable with a default value
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1769 std::string key;
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1770 std::string defaultValue;
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1771
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1772 if (!what[2].str().empty())
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1773 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1774 key = what[2].str();
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1775 defaultValue = what[3].str();
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1776 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1777 else if (!what[4].str().empty())
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1778 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1779 key = what[4].str();
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1780 defaultValue = what[5].str();
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1781 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1782 else if (!what[6].str().empty())
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1783 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1784 key = what[6].str();
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1785 defaultValue = what[7].str();
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1786 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1787 else
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1788 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1789 throw OrthancException(ErrorCode_InternalError);
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1790 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1791
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1792 Dictionary::const_iterator found = dictionary_.find(key);
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1793
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1794 if (found == dictionary_.end())
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1795 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1796 out = std::copy(defaultValue.begin(), defaultValue.end(), out);
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1797 }
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1798 else
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1799 {
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1800 const std::string& value = found->second;
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1801 out = std::copy(value.begin(), value.end(), out);
0a4428aad512 variable substitution with default value Sebastien Jodogne <s.jodogne@gmail.com> parents: 2920 diff changeset	1802 }
2920 ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1803 }
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1804
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1805 return out;
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1806 }
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1807 };
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1808 }
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1809
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1810
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1811 std::string Toolbox::SubstituteVariables(const std::string& source,
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1812 const std::map<std::string, std::string>& dictionary)
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1813 {
2926 0bcf46cea4e4 fix for older versions of boost::regex Sebastien Jodogne <s.jodogne@gmail.com> parents: 2921 diff changeset	1814 const boost::regex pattern("\\$\\{([^:]*?)\\}\|" // ${what[1]}
0bcf46cea4e4 fix for older versions of boost::regex Sebastien Jodogne <s.jodogne@gmail.com> parents: 2921 diff changeset	1815 "\\$\\{([^:]?):-([^'\"]?)\\}\|" // ${what[2]:-what[3]}
0bcf46cea4e4 fix for older versions of boost::regex Sebastien Jodogne <s.jodogne@gmail.com> parents: 2921 diff changeset	1816 "\\$\\{([^:]?):-\"([^\"]?)\"\\}\|" // ${what[4]:-"what[5]"}
0bcf46cea4e4 fix for older versions of boost::regex Sebastien Jodogne <s.jodogne@gmail.com> parents: 2921 diff changeset	1817 "\\$\\{([^:]?):-'([^']?)'\\}"); // ${what[6]:-'what[7]'}
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 VariableFormatter formatter(dictionary);
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1820
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1821 return boost::regex_replace(source, pattern, formatter);
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 2907 diff changeset	1822 }
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1823
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1824
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1825 namespace Iso2022
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1826 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1827 /**
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1828 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	1829 at index i
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1830 **/
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1831 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	1832 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1833 if (i < s.size())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1834 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1835 char c = s[i];
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1836 return
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1837 (c == '\x0f') \|\| // Locking shift zero
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1838 (c == '\x0e'); // Locking shift one
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1839 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1840 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1841 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1842 return false;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1843 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1844 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1845
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1846 /**
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1847 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	1848 at index i
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1849 **/
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1850 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	1851 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1852 if (i + 1 < s.size())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1853 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1854 char c1 = s[i];
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1855 char c2 = s[i + 1];
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1856 return (c1 == 0x1b) && (
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1857 (c2 == '\x6e') \|\| // Locking shift two
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1858 (c2 == '\x6f') \|\| // Locking shift three
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1859 (c2 == '\x4e') \|\| // Single shift two (alt)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1860 (c2 == '\x4f') \|\| // Single shift three (alt)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1861 (c2 == '\x7c') \|\| // Locking shift three right
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1862 (c2 == '\x7d') \|\| // Locking shift two right
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1863 (c2 == '\x7e') // Locking shift one right
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1864 );
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1865 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1866 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1867 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1868 return false;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1869 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1870 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1871
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1872 /**
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1873 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	1874 at index i
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1875 **/
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1876 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	1877 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1878 if (i + 2 < s.size())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1879 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1880 char c1 = s[i];
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1881 char c2 = s[i + 1];
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1882 char c3 = s[i + 2];
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1883 return ((c1 == '\x8e' && c2 == 0x1b && c3 == '\x4e') \|\|
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1884 (c1 == '\x8f' && c2 == 0x1b && c3 == '\x4f'));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1885 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1886 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1887 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1888 return false;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1889 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1890 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1891
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1892 /**
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1893 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	1894 - is valid
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1895 - contains the c character
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1896 This function returns false otherwise.
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1897 **/
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1898 static inline bool TestCharValue(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1899 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	1900 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1901 if (i < s.size())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1902 return s[i] == c;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1903 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1904 return false;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1905 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1906
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1907 /**
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1908 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	1909 - is valid
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1910 - 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	1911 This function returns false otherwise.
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1912 **/
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1913 static inline bool TestCharRange(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1914 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	1915 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1916 if (i < s.size())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1917 return (s[i] >= cMin) && (s[i] <= cMax);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1918 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1919 return false;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1920 }
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 /**
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1923 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	1924 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	1925 **/
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1926 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	1927 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1928 if (TestCharValue(s, i, 0x1b))
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1929 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1930 size_t j = i+1;
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 // 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	1933 while (TestCharRange(s, j, '\x20', '\x2f'))
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1934 ++j;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1935
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1936 // 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	1937 // 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	1938 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	1939 return j - i + 1;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1940 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1941 return 0;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1942 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1943 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1944 return 0;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1945 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1946 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1947
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1948
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1949
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1950 /**
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1951 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	1952 sequences.
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1953 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	1954 for a list of those.
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1955
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1956 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	1957 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	1958
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1959 However, in the case where the encoding is unique, then suppressing
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1960 the escape sequences allows to provide us with a clean string after
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1961 conversion to utf-8 with boost.
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 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	1964 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1965 // 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	1966 dest.clear();
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1967 if (dest.capacity() < src.size())
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1968 dest.reserve(src.size());
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1969
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1970 size_t i = 0;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1971
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1972 // uint8_t view to the string
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1973 while (i < src.size())
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 size_t j = i;
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 // 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	1978 // 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	1979 // next position to read
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1980 if (Iso2022::IsControlMessage1(src, i))
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1981 i += 1;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1982 else if (Iso2022::IsControlMessage2(src, i))
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1983 i += 2;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1984 else if (Iso2022::IsControlMessage3(src, i))
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1985 i += 3;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1986 else
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1987 i += Iso2022::GetEscapeSequenceLength(src, i);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1988
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1989 // 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	1990 // 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	1991 // 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	1992 if (j == i)
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 dest.push_back(src[i]);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1995 i++;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1996 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1997 }
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3203 diff changeset	1998 }
3322 b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	1999
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2000
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2001 void Toolbox::Utf8ToUnicodeCharacter(uint32_t& unicode,
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2002 size_t& length,
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2003 const std::string& utf8,
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2004 size_t position)
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2005 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2006 // https://en.wikipedia.org/wiki/UTF-8
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2007
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2008 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	2009 static const uint8_t TEST_IS_1_BYTE = 0x00;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2010
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2011 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	2012 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	2013
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2014 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	2015 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	2016
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2017 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	2018 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	2019
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2020 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	2021 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	2022
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2023 if (position >= utf8.size())
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2024 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2025 throw OrthancException(ErrorCode_ParameterOutOfRange);
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2026 }
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2027
3324 87396c571109 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 3322 diff changeset	2028 assert(sizeof(uint8_t) == sizeof(char));
87396c571109 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 3322 diff changeset	2029 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	2030
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2031 if ((buffer[0] & MASK_IS_1_BYTE) == TEST_IS_1_BYTE)
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2032 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2033 length = 1;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2034 unicode = buffer[0] & ~MASK_IS_1_BYTE;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2035 }
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2036 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	2037 position + 1 < utf8.size() &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2038 (buffer[1] & MASK_CONTINUATION) == TEST_CONTINUATION)
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2039 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2040 length = 2;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2041 uint32_t a = buffer[0] & ~MASK_IS_2_BYTES;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2042 uint32_t b = buffer[1] & ~MASK_CONTINUATION;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2043 unicode = (a << 6) \| b;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2044 }
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2045 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	2046 position + 2 < utf8.size() &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2047 (buffer[1] & MASK_CONTINUATION) == TEST_CONTINUATION &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2048 (buffer[2] & MASK_CONTINUATION) == TEST_CONTINUATION)
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2049 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2050 length = 3;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2051 uint32_t a = buffer[0] & ~MASK_IS_3_BYTES;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2052 uint32_t b = buffer[1] & ~MASK_CONTINUATION;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2053 uint32_t c = buffer[2] & ~MASK_CONTINUATION;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2054 unicode = (a << 12) \| (b << 6) \| c;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2055 }
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2056 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	2057 position + 3 < utf8.size() &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2058 (buffer[1] & MASK_CONTINUATION) == TEST_CONTINUATION &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2059 (buffer[2] & MASK_CONTINUATION) == TEST_CONTINUATION &&
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2060 (buffer[3] & MASK_CONTINUATION) == TEST_CONTINUATION)
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2061 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2062 length = 4;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2063 uint32_t a = buffer[0] & ~MASK_IS_4_BYTES;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2064 uint32_t b = buffer[1] & ~MASK_CONTINUATION;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2065 uint32_t c = buffer[2] & ~MASK_CONTINUATION;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2066 uint32_t d = buffer[3] & ~MASK_CONTINUATION;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2067 unicode = (a << 18) \| (b << 12) \| (c << 6) \| d;
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2068 }
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2069 else
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2070 {
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2071 // This is not a valid UTF-8 encoding
3324 87396c571109 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 3322 diff changeset	2072 throw OrthancException(ErrorCode_BadFileFormat, "Invalid UTF-8 string");
3322 b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2073 }
b32b7c44a223 Toolbox::Utf8ToUnicodeCharacter() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3230 diff changeset	2074 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2075 }
2513 97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2076
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2077
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2078
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2079 OrthancLinesIterator* OrthancLinesIterator_Create(const std::string& content)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2080 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2081 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	2082 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2083
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2084
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2085 bool OrthancLinesIterator_GetLine(std::string& target,
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2086 const OrthancLinesIterator* iterator)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2087 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2088 if (iterator != NULL)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2089 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2090 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	2091 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2092 else
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2093 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2094 return false;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2095 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2096 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2097
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2098
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2099 void OrthancLinesIterator_Next(OrthancLinesIterator* iterator)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2100 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2101 if (iterator != NULL)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2102 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2103 reinterpret_cast<Orthanc::Toolbox::LinesIterator*>(iterator)->Next();
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2104 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2105 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2106
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2107
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2108 void OrthancLinesIterator_Free(OrthancLinesIterator* iterator)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2109 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2110 if (iterator != NULL)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2111 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2112 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	2113 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	2114 }

Mercurial > hg > orthanc

annotate Core/Toolbox.cpp @ 3487:ce29644acd19