annotate Core/Toolbox.cpp @ 3712:2a170a8f1faf

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