annotate OrthancFramework/Sources/Toolbox.cpp @ 5261:f66b8d70917e

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