annotate Core/Toolbox.cpp @ 2921:0a4428aad512

variable substitution with default value
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 07 Nov 2018 12:59:03 +0100
parents ad0e7def3338
children 0bcf46cea4e4
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
2447
878b59270859 upgrade to year 2018
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2442
diff changeset
5 * Copyright (C) 2017-2018 Osimis S.A., Belgium
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * modify it under the terms of the GNU General Public License as
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * published by the Free Software Foundation, either version 3 of the
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * License, or (at your option) any later version.
136
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 110
diff changeset
11 *
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 110
diff changeset
12 * In addition, as a special exception, the copyright holders of this
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 110
diff changeset
13 * program give permission to link the code of its release with the
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 110
diff changeset
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 110
diff changeset
15 * that use the same license as the "OpenSSL" library), and distribute
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 110
diff changeset
16 * the linked executables. You must obey the GNU General Public License
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 110
diff changeset
17 * in all respects for all of the code used other than "OpenSSL". If you
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 110
diff changeset
18 * modify file(s) with this exception, you may extend this exception to
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 110
diff changeset
19 * your version of the file(s), but you are not obligated to do so. If
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 110
diff changeset
20 * you do not wish to do so, delete this exception statement from your
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 110
diff changeset
21 * version. If you delete this exception statement from all source files
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 110
diff changeset
22 * in the program, then also delete it here.
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 *
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 * This program is distributed in the hope that it will be useful, but
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 * General Public License for more details.
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 *
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 * You should have received a copy of the GNU General Public License
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 **/
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33
824
a811bdf8b8eb precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 809
diff changeset
34 #include "PrecompiledHeaders.h"
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 #include "Toolbox.h"
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36
59
c996319e90bc renaming in Core
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
37 #include "OrthancException.h"
1486
f967bdf8534e refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1480
diff changeset
38 #include "Logging.h"
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39
2326
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
40 #include <boost/algorithm/string/case_conv.hpp>
2143
fd5875662670 creation of namespace SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2141
diff changeset
41 #include <boost/algorithm/string/replace.hpp>
fd5875662670 creation of namespace SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2141
diff changeset
42 #include <boost/lexical_cast.hpp>
2367
2aff870c2c58 refactoring of BoostConfiguration.cmake
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2351
diff changeset
43 #include <boost/regex.hpp>
2143
fd5875662670 creation of namespace SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2141
diff changeset
44 #include <boost/uuid/sha1.hpp>
2326
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
45
1397
704de8c30ff5 modularization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1347
diff changeset
46 #include <string>
453
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
47 #include <stdint.h>
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 #include <string.h>
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 #include <algorithm>
107
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
50 #include <ctype.h>
1397
704de8c30ff5 modularization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1347
diff changeset
51
915
703bef350e89 Orthanc now relies entirely on boost::locale
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 890
diff changeset
52
2137
595cf22b3e7e safety checks of macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2136
diff changeset
53 #if ORTHANC_ENABLE_MD5 == 1
595cf22b3e7e safety checks of macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2136
diff changeset
54 # 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
55 #endif
8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1446
diff changeset
56
2137
595cf22b3e7e safety checks of macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2136
diff changeset
57 #if ORTHANC_ENABLE_BASE64 == 1
595cf22b3e7e safety checks of macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2136
diff changeset
58 # 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
59 #endif
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60
2367
2aff870c2c58 refactoring of BoostConfiguration.cmake
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2351
diff changeset
61 #if ORTHANC_ENABLE_LOCALE == 1
2aff870c2c58 refactoring of BoostConfiguration.cmake
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2351
diff changeset
62 # include <boost/locale.hpp>
2aff870c2c58 refactoring of BoostConfiguration.cmake
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2351
diff changeset
63 #endif
2aff870c2c58 refactoring of BoostConfiguration.cmake
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2351
diff changeset
64
2677
0196d07a900f migrate OpenSSL initialization to Toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2513
diff changeset
65 #if ORTHANC_ENABLE_SSL == 1
0196d07a900f migrate OpenSSL initialization to Toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2513
diff changeset
66 // For OpenSSL initialization and finalization
0196d07a900f migrate OpenSSL initialization to Toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2513
diff changeset
67 # include <openssl/conf.h>
0196d07a900f migrate OpenSSL initialization to Toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2513
diff changeset
68 # include <openssl/engine.h>
0196d07a900f migrate OpenSSL initialization to Toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2513
diff changeset
69 # include <openssl/err.h>
0196d07a900f migrate OpenSSL initialization to Toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2513
diff changeset
70 # include <openssl/evp.h>
0196d07a900f migrate OpenSSL initialization to Toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2513
diff changeset
71 # include <openssl/ssl.h>
0196d07a900f migrate OpenSSL initialization to Toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2513
diff changeset
72 #endif
0196d07a900f migrate OpenSSL initialization to Toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2513
diff changeset
73
107
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
74
1111
929bf8c2123d Fixes for Visual Studio 2013 64bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1103
diff changeset
75 #if defined(_MSC_VER) && (_MSC_VER < 1800)
929bf8c2123d Fixes for Visual Studio 2013 64bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1103
diff changeset
76 // Patch for the missing "_strtoll" symbol when compiling with Visual Studio < 2013
570
jodogne
parents: 568
diff changeset
77 extern "C"
jodogne
parents: 568
diff changeset
78 {
915
703bef350e89 Orthanc now relies entirely on boost::locale
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 890
diff changeset
79 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
80 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
81 {
915
703bef350e89 Orthanc now relies entirely on boost::locale
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 890
diff changeset
82 return _strtoi64(nptr, endptr, base);
703bef350e89 Orthanc now relies entirely on boost::locale
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 890
diff changeset
83 }
107
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
84 }
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
85 #endif
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
86
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
87
2173
1c42860097fc fix windows build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2172
diff changeset
88 #if defined(_WIN32)
1c42860097fc fix windows build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2172
diff changeset
89 # include <windows.h> // For ::Sleep
1c42860097fc fix windows build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2172
diff changeset
90 #endif
1c42860097fc fix windows build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2172
diff changeset
91
2141
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
92
2136
dd609a99d39a uniformization of the macro naming
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2129
diff changeset
93 #if ORTHANC_ENABLE_PUGIXML == 1
2143
fd5875662670 creation of namespace SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2141
diff changeset
94 # include "ChunkedBuffer.h"
fd5875662670 creation of namespace SystemToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2141
diff changeset
95 # include <pugixml.hpp>
1045
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
96 #endif
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
97
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
98
2512
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
99 // Inclusions for UUID
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
100 // http://stackoverflow.com/a/1626302
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
101
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
102 extern "C"
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
103 {
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
104 #if defined(_WIN32)
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
105 # include <rpc.h>
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
106 #else
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
107 # include <uuid/uuid.h>
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
108 #endif
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
109 }
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
110
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
111
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
112
59
c996319e90bc renaming in Core
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
113 namespace Orthanc
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 {
2513
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
115 void Toolbox::LinesIterator::FindEndOfLine()
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
116 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
117 lineEnd_ = lineStart_;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
118
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
119 while (lineEnd_ < content_.size() &&
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
120 content_[lineEnd_] != '\n' &&
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
121 content_[lineEnd_] != '\r')
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
122 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
123 lineEnd_ += 1;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
124 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
125 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
126
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
127
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
128 Toolbox::LinesIterator::LinesIterator(const std::string& content) :
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
129 content_(content),
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
130 lineStart_(0)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
131 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
132 FindEndOfLine();
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
133 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
134
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
135
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
136 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
137 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
138 assert(lineStart_ <= content_.size() &&
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
139 lineEnd_ <= content_.size() &&
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
140 lineStart_ <= lineEnd_);
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
141
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
142 if (lineStart_ == content_.size())
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
143 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
144 return false;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
145 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
146 else
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
147 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
148 target = content_.substr(lineStart_, lineEnd_ - lineStart_);
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
149 return true;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
150 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
151 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
152
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
153
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
154 void Toolbox::LinesIterator::Next()
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
155 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
156 lineStart_ = lineEnd_;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
157
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
158 if (lineStart_ != content_.size())
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
159 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
160 assert(content_[lineStart_] == '\r' ||
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
161 content_[lineStart_] == '\n');
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
162
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
163 char second;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
164
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
165 if (content_[lineStart_] == '\r')
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
166 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
167 second = '\n';
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
168 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
169 else
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
170 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
171 second = '\r';
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
172 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
173
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
174 lineStart_ += 1;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
175
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
176 if (lineStart_ < content_.size() &&
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
177 content_[lineStart_] == second)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
178 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
179 lineStart_ += 1;
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
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
182 FindEndOfLine();
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
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187 void Toolbox::ToUpperCase(std::string& s)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189 std::transform(s.begin(), s.end(), s.begin(), toupper);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193 void Toolbox::ToLowerCase(std::string& s)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
194 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
195 std::transform(s.begin(), s.end(), s.begin(), tolower);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
196 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
197
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198
690
2e67366aab83 case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
199 void Toolbox::ToUpperCase(std::string& result,
2e67366aab83 case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
200 const std::string& source)
2e67366aab83 case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
201 {
2e67366aab83 case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
202 result = source;
2e67366aab83 case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
203 ToUpperCase(result);
2e67366aab83 case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
204 }
2e67366aab83 case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
205
2e67366aab83 case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
206 void Toolbox::ToLowerCase(std::string& result,
2e67366aab83 case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
207 const std::string& source)
2e67366aab83 case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
208 {
2e67366aab83 case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
209 result = source;
2e67366aab83 case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
210 ToLowerCase(result);
2e67366aab83 case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
211 }
2e67366aab83 case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
212
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
213
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
214 void Toolbox::SplitUriComponents(UriComponents& components,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
215 const std::string& uri)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
216 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
217 static const char URI_SEPARATOR = '/';
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
218
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
219 components.clear();
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
220
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
221 if (uri.size() == 0 ||
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
222 uri[0] != URI_SEPARATOR)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
223 {
59
c996319e90bc renaming in Core
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
224 throw OrthancException(ErrorCode_UriSyntax);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
225 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
226
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
227 // Count the number of slashes in the URI to make an assumption
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
228 // about the number of components in the URI
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
229 unsigned int estimatedSize = 0;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
230 for (unsigned int i = 0; i < uri.size(); i++)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
231 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
232 if (uri[i] == URI_SEPARATOR)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
233 estimatedSize++;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
234 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
235
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
236 components.reserve(estimatedSize - 1);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
237
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
238 unsigned int start = 1;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
239 unsigned int end = 1;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
240 while (end < uri.size())
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
241 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
242 // This is the loop invariant
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
243 assert(uri[start - 1] == '/' && (end >= start));
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
244
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
245 if (uri[end] == '/')
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 components.push_back(std::string(&uri[start], end - start));
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
248 end++;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
249 start = end;
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 else
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 end++;
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
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
257 if (start < uri.size())
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
258 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
259 components.push_back(std::string(&uri[start], end - start));
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
260 }
207
7f74209ea0f8 RestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
261
7f74209ea0f8 RestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
262 for (size_t i = 0; i < components.size(); i++)
7f74209ea0f8 RestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
263 {
7f74209ea0f8 RestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
264 if (components[i].size() == 0)
7f74209ea0f8 RestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
265 {
7f74209ea0f8 RestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
266 // Empty component, as in: "/coucou//e"
7f74209ea0f8 RestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
267 throw OrthancException(ErrorCode_UriSyntax);
7f74209ea0f8 RestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
268 }
7f74209ea0f8 RestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
269 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
270 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
271
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
272
966
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
273 void Toolbox::TruncateUri(UriComponents& target,
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
274 const UriComponents& source,
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
275 size_t fromLevel)
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
276 {
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
277 target.clear();
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
278
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
279 if (source.size() > fromLevel)
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
280 {
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
281 target.resize(source.size() - fromLevel);
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
282
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
283 size_t j = 0;
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
284 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
285 {
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
286 target[j] = source[i];
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
287 }
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
288
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
289 assert(j == target.size());
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
290 }
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
291 }
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
292
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
293
886652370ff2 accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 957
diff changeset
294
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
295 bool Toolbox::IsChildUri(const UriComponents& baseUri,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
296 const UriComponents& testedUri)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
297 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
298 if (testedUri.size() < baseUri.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 return false;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
301 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
302
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
303 for (size_t i = 0; i < baseUri.size(); i++)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
304 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
305 if (baseUri[i] != testedUri[i])
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
306 return false;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
307 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
308
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
309 return true;
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
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 std::string Toolbox::FlattenUri(const UriComponents& components,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
314 size_t fromLevel)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
315 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
316 if (components.size() <= fromLevel)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
317 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
318 return "/";
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
319 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
320 else
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
321 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
322 std::string r;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
323
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
324 for (size_t i = fromLevel; i < components.size(); i++)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
325 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
326 r += "/" + components[i];
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
327 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
328
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
329 return r;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
330 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
331 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
332
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
333
2137
595cf22b3e7e safety checks of macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2136
diff changeset
334 #if ORTHANC_ENABLE_MD5 == 1
22
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
335 static char GetHexadecimalCharacter(uint8_t value)
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
336 {
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
337 assert(value < 16);
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
338
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
339 if (value < 10)
1654
3727a09e7b53 fix some icc warnings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
340 {
22
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
341 return value + '0';
1654
3727a09e7b53 fix some icc warnings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
342 }
22
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
343 else
1654
3727a09e7b53 fix some icc warnings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
344 {
22
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
345 return (value - 10) + 'a';
1654
3727a09e7b53 fix some icc warnings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
346 }
22
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
347 }
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
348
23
62bd05fe4b7c support for ssl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 22
diff changeset
349
22
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
350 void Toolbox::ComputeMD5(std::string& result,
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
351 const std::string& data)
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
352 {
693
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 690
diff changeset
353 if (data.size() > 0)
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 690
diff changeset
354 {
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 690
diff changeset
355 ComputeMD5(result, &data[0], data.size());
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 690
diff changeset
356 }
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 690
diff changeset
357 else
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 690
diff changeset
358 {
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 690
diff changeset
359 ComputeMD5(result, NULL, 0);
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 690
diff changeset
360 }
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 690
diff changeset
361 }
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 690
diff changeset
362
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 690
diff changeset
363
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 690
diff changeset
364 void Toolbox::ComputeMD5(std::string& result,
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 690
diff changeset
365 const void* data,
1833
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1818
diff changeset
366 size_t size)
693
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 690
diff changeset
367 {
22
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
368 md5_state_s state;
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
369 md5_init(&state);
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
370
1833
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1818
diff changeset
371 if (size > 0)
22
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
372 {
693
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 690
diff changeset
373 md5_append(&state,
01d8611c4a60 md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 690
diff changeset
374 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
375 static_cast<int>(size));
22
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
376 }
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
377
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
378 md5_byte_t actualHash[16];
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
379 md5_finish(&state, actualHash);
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
380
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
381 result.resize(32);
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
382 for (unsigned int i = 0; i < 16; i++)
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
383 {
1654
3727a09e7b53 fix some icc warnings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
384 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
385 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
386 }
1bc6327d1de3 MD5 sum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
387 }
1479
8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1446
diff changeset
388 #endif
24
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
389
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
390
2137
595cf22b3e7e safety checks of macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2136
diff changeset
391 #if ORTHANC_ENABLE_BASE64 == 1
809
8ce2f69436ca do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 803
diff changeset
392 void Toolbox::EncodeBase64(std::string& result,
8ce2f69436ca do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 803
diff changeset
393 const std::string& data)
24
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
394 {
809
8ce2f69436ca do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 803
diff changeset
395 result = base64_encode(data);
24
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
396 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
397
809
8ce2f69436ca do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 803
diff changeset
398 void Toolbox::DecodeBase64(std::string& result,
8ce2f69436ca do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 803
diff changeset
399 const std::string& data)
365
cda6938a8c6f decode base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
400 {
1988
e29aea2349b9 test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1981
diff changeset
401 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
402 {
e29aea2349b9 test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1981
diff changeset
403 if (!isalnum(data[i]) &&
e29aea2349b9 test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1981
diff changeset
404 data[i] != '+' &&
e29aea2349b9 test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1981
diff changeset
405 data[i] != '/' &&
e29aea2349b9 test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1981
diff changeset
406 data[i] != '=')
e29aea2349b9 test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1981
diff changeset
407 {
e29aea2349b9 test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1981
diff changeset
408 // 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
409 throw OrthancException(ErrorCode_BadFileFormat);
e29aea2349b9 test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1981
diff changeset
410 }
e29aea2349b9 test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1981
diff changeset
411 }
e29aea2349b9 test validity of base64 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1981
diff changeset
412
809
8ce2f69436ca do not return strings with base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 803
diff changeset
413 result = base64_decode(data);
365
cda6938a8c6f decode base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
414 }
1648
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1641
diff changeset
415
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1641
diff changeset
416
1981
4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1976
diff changeset
417 bool Toolbox::DecodeDataUriScheme(std::string& mime,
1648
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1641
diff changeset
418 std::string& content,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1641
diff changeset
419 const std::string& source)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1641
diff changeset
420 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1641
diff changeset
421 boost::regex pattern("data:([^;]+);base64,([a-zA-Z0-9=+/]*)",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1641
diff changeset
422 boost::regex::icase /* case insensitive search */);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1641
diff changeset
423
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1641
diff changeset
424 boost::cmatch what;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1641
diff changeset
425 if (regex_match(source.c_str(), what, pattern))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1641
diff changeset
426 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1641
diff changeset
427 mime = what[1];
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1641
diff changeset
428 DecodeBase64(content, what[2]);
1981
4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1976
diff changeset
429 return true;
1648
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1641
diff changeset
430 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1641
diff changeset
431 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1641
diff changeset
432 {
1981
4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1976
diff changeset
433 return false;
1648
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1641
diff changeset
434 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1641
diff changeset
435 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1641
diff changeset
436
1818
1065401501fb ParsedDicomFile::CreateFromJson
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1767
diff changeset
437
1065401501fb ParsedDicomFile::CreateFromJson
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1767
diff changeset
438 void Toolbox::EncodeDataUriScheme(std::string& result,
1065401501fb ParsedDicomFile::CreateFromJson
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1767
diff changeset
439 const std::string& mime,
1065401501fb ParsedDicomFile::CreateFromJson
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1767
diff changeset
440 const std::string& content)
1065401501fb ParsedDicomFile::CreateFromJson
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1767
diff changeset
441 {
1065401501fb ParsedDicomFile::CreateFromJson
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1767
diff changeset
442 result = "data:" + mime + ";base64," + base64_encode(content);
1065401501fb ParsedDicomFile::CreateFromJson
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1767
diff changeset
443 }
1065401501fb ParsedDicomFile::CreateFromJson
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1767
diff changeset
444
1479
8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1446
diff changeset
445 #endif
8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1446
diff changeset
446
365
cda6938a8c6f decode base64
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
447
2412
cad393b41bc3 handy shortcuts in DicomMap
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2373
diff changeset
448 #if ORTHANC_ENABLE_LOCALE == 1
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
449 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
450 {
949
766a57997121 enumeration for encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 942
diff changeset
451 switch (sourceEncoding)
766a57997121 enumeration for encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 942
diff changeset
452 {
766a57997121 enumeration for encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 942
diff changeset
453 case Encoding_Utf8:
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
454 return "UTF-8";
949
766a57997121 enumeration for encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 942
diff changeset
455
956
2fd5a163776d primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 950
diff changeset
456 case Encoding_Ascii:
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
457 return "ASCII";
956
2fd5a163776d primitives for proper encoding handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 950
diff changeset
458
949
766a57997121 enumeration for encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 942
diff changeset
459 case Encoding_Latin1:
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
460 return "ISO-8859-1";
949
766a57997121 enumeration for encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 942
diff changeset
461 break;
766a57997121 enumeration for encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 942
diff changeset
462
1087
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
463 case Encoding_Latin2:
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
464 return "ISO-8859-2";
1087
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
465 break;
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
466
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
467 case Encoding_Latin3:
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
468 return "ISO-8859-3";
1087
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
469 break;
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
470
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
471 case Encoding_Latin4:
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
472 return "ISO-8859-4";
1087
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
473 break;
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
474
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
475 case Encoding_Latin5:
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
476 return "ISO-8859-9";
1087
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
477 break;
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
478
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
479 case Encoding_Cyrillic:
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
480 return "ISO-8859-5";
1087
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
481 break;
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
482
1347
60cc0ee61edb fix issue 32
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1337
diff changeset
483 case Encoding_Windows1251:
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
484 return "WINDOWS-1251";
1347
60cc0ee61edb fix issue 32
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1337
diff changeset
485 break;
60cc0ee61edb fix issue 32
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1337
diff changeset
486
1087
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
487 case Encoding_Arabic:
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
488 return "ISO-8859-6";
1087
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
489 break;
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
490
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
491 case Encoding_Greek:
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
492 return "ISO-8859-7";
1087
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
493 break;
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
494
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
495 case Encoding_Hebrew:
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
496 return "ISO-8859-8";
1087
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
497 break;
1090
e494ceb8d763 support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1087
diff changeset
498
e494ceb8d763 support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1087
diff changeset
499 case Encoding_Japanese:
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
500 return "SHIFT-JIS";
1090
e494ceb8d763 support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1087
diff changeset
501 break;
e494ceb8d763 support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1087
diff changeset
502
e494ceb8d763 support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1087
diff changeset
503 case Encoding_Chinese:
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
504 return "GB18030";
1090
e494ceb8d763 support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1087
diff changeset
505 break;
e494ceb8d763 support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1087
diff changeset
506
e494ceb8d763 support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1087
diff changeset
507 case Encoding_Thai:
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
508 return "TIS620.2533-0";
1090
e494ceb8d763 support more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1087
diff changeset
509 break;
1087
e07b90fb00eb more encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1050
diff changeset
510
949
766a57997121 enumeration for encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 942
diff changeset
511 default:
957
63973b76a51f detection of encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 956
diff changeset
512 throw OrthancException(ErrorCode_NotImplemented);
949
766a57997121 enumeration for encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 942
diff changeset
513 }
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
514 }
2412
cad393b41bc3 handy shortcuts in DicomMap
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2373
diff changeset
515 #endif
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
516
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
517
2367
2aff870c2c58 refactoring of BoostConfiguration.cmake
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2351
diff changeset
518 #if ORTHANC_ENABLE_LOCALE == 1
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
519 std::string Toolbox::ConvertToUtf8(const std::string& source,
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
520 Encoding sourceEncoding)
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
521 {
2907
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
522 // 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
523 // 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
524
107
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
525 try
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
526 {
2907
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
527 if (sourceEncoding == Encoding_Utf8)
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
528 {
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
529 // 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
530 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
531 }
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
532 else if (sourceEncoding == Encoding_Ascii)
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
533 {
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
534 return ConvertToAscii(source);
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
535 }
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
536 else
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
537 {
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
538 const char* encoding = GetBoostLocaleEncoding(sourceEncoding);
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
539 return boost::locale::conv::to_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
540 }
107
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
541 }
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
542 catch (std::runtime_error&)
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
543 {
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
544 // Bad input string or bad encoding
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
545 return ConvertToAscii(source);
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
546 }
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
547 }
2367
2aff870c2c58 refactoring of BoostConfiguration.cmake
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2351
diff changeset
548 #endif
2aff870c2c58 refactoring of BoostConfiguration.cmake
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2351
diff changeset
549
107
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
550
2367
2aff870c2c58 refactoring of BoostConfiguration.cmake
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2351
diff changeset
551 #if ORTHANC_ENABLE_LOCALE == 1
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
552 std::string Toolbox::ConvertFromUtf8(const std::string& source,
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
553 Encoding targetEncoding)
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
554 {
2907
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
555 // 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
556 // 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
557
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
558 try
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
559 {
2907
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
560 if (targetEncoding == Encoding_Utf8)
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
561 {
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
562 // 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
563 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
564 }
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
565 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
566 {
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
567 return ConvertToAscii(source);
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
568 }
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
569 else
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
570 {
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
571 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
572 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
573 }
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
574 }
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
575 catch (std::runtime_error&)
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
576 {
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
577 // Bad input string or bad encoding
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
578 return ConvertToAscii(source);
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
579 }
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
580 }
2367
2aff870c2c58 refactoring of BoostConfiguration.cmake
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2351
diff changeset
581 #endif
1557
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
582
ad1e127b4ed5 fix in encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
583
2900
668d5ad73c74 Font::Render()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2856
diff changeset
584 static bool IsAsciiCharacter(uint8_t c)
668d5ad73c74 Font::Render()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2856
diff changeset
585 {
668d5ad73c74 Font::Render()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2856
diff changeset
586 return (c != 0 &&
668d5ad73c74 Font::Render()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2856
diff changeset
587 c <= 127 &&
668d5ad73c74 Font::Render()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2856
diff changeset
588 (c == '\n' || !iscntrl(c)));
668d5ad73c74 Font::Render()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2856
diff changeset
589 }
668d5ad73c74 Font::Render()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2856
diff changeset
590
668d5ad73c74 Font::Render()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2856
diff changeset
591
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
592 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
593 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
594 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
595 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
596
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
597 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
598 {
2900
668d5ad73c74 Font::Render()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2856
diff changeset
599 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
600 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
601 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
602 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
603 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
604
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
605 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
606 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
607
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
608
2442
330349d712f9 fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2412
diff changeset
609 bool Toolbox::IsAsciiString(const std::string& s)
330349d712f9 fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2412
diff changeset
610 {
330349d712f9 fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2412
diff changeset
611 return IsAsciiString(s.c_str(), s.size());
330349d712f9 fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2412
diff changeset
612 }
330349d712f9 fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2412
diff changeset
613
330349d712f9 fix Toolbox::IsAsciiString
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2412
diff changeset
614
107
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
615 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
616 {
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
617 std::string result;
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
618
942
b3f6fb1130cd fixes thanks to cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 930
diff changeset
619 result.reserve(source.size() + 1);
107
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
620 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
621 {
2900
668d5ad73c74 Font::Render()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2856
diff changeset
622 if (IsAsciiCharacter(source[i]))
107
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
623 {
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
624 result.push_back(source[i]);
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
625 }
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
626 }
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
627
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
628 return result;
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
629 }
177
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
630
1833
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1818
diff changeset
631
177
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
632 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
633 const void* data,
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1818
diff changeset
634 size_t size)
177
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
635 {
560
69c024f9c06b fix of Debian bug #724947
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 483
diff changeset
636 boost::uuids::detail::sha1 sha1;
69c024f9c06b fix of Debian bug #724947
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 483
diff changeset
637
1833
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1818
diff changeset
638 if (size > 0)
177
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
639 {
1833
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1818
diff changeset
640 sha1.process_bytes(data, size);
177
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
641 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
642
560
69c024f9c06b fix of Debian bug #724947
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 483
diff changeset
643 unsigned int digest[5];
177
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
644
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
645 // 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
646 assert(sizeof(unsigned int) == 4 && sizeof(digest) == (160 / 8));
177
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
647
560
69c024f9c06b fix of Debian bug #724947
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 483
diff changeset
648 sha1.get_digest(digest);
69c024f9c06b fix of Debian bug #724947
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 483
diff changeset
649
69c024f9c06b fix of Debian bug #724947
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 483
diff changeset
650 result.resize(8 * 5 + 4);
69c024f9c06b fix of Debian bug #724947
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 483
diff changeset
651 sprintf(&result[0], "%08x-%08x-%08x-%08x-%08x",
69c024f9c06b fix of Debian bug #724947
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 483
diff changeset
652 digest[0],
69c024f9c06b fix of Debian bug #724947
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 483
diff changeset
653 digest[1],
69c024f9c06b fix of Debian bug #724947
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 483
diff changeset
654 digest[2],
69c024f9c06b fix of Debian bug #724947
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 483
diff changeset
655 digest[3],
69c024f9c06b fix of Debian bug #724947
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 483
diff changeset
656 digest[4]);
177
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
657 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
658
1833
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1818
diff changeset
659 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
660 const std::string& data)
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1818
diff changeset
661 {
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1818
diff changeset
662 if (data.size() > 0)
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1818
diff changeset
663 {
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1818
diff changeset
664 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
665 }
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1818
diff changeset
666 else
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1818
diff changeset
667 {
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1818
diff changeset
668 ComputeSHA1(result, NULL, 0);
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1818
diff changeset
669 }
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1818
diff changeset
670 }
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1818
diff changeset
671
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1818
diff changeset
672
1446
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
673 bool Toolbox::IsSHA1(const char* str,
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
674 size_t size)
402
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
675 {
1446
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
676 if (size == 0)
1428
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
677 {
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
678 return false;
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
679 }
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
680
1446
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
681 const char* start = str;
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
682 const char* end = str + size;
1428
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
683
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
684 // Trim the beginning of the string
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
685 while (start < end)
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
686 {
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
687 if (*start == '\0' ||
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
688 isspace(*start))
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
689 {
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
690 start++;
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
691 }
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
692 else
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
693 {
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
694 break;
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
695 }
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
696 }
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
697
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
698 // Trim the trailing of the string
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
699 while (start < end)
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
700 {
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
701 if (*(end - 1) == '\0' ||
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
702 isspace(*(end - 1)))
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
703 {
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
704 end--;
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
705 }
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
706 else
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
707 {
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
708 break;
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
709 }
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
710 }
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
711
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
712 if (end - start != 44)
402
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
713 {
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
714 return false;
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
715 }
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
716
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
717 for (unsigned int i = 0; i < 44; i++)
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
718 {
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
719 if (i == 8 ||
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
720 i == 17 ||
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
721 i == 26 ||
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
722 i == 35)
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
723 {
1428
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
724 if (start[i] != '-')
402
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
725 return false;
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
726 }
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
727 else
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
728 {
1428
0a355eeeb351 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1424
diff changeset
729 if (!isalnum(start[i]))
402
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
730 return false;
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
731 }
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
732 }
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
733
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
734 return true;
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
735 }
d2c69150a979 bulk storescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
736
1397
704de8c30ff5 modularization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1347
diff changeset
737
1446
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
738 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
739 {
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
740 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
741 {
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
742 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
743 }
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
744 else
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
745 {
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
746 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
747 }
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
748 }
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
749
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
750
247
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
751 std::string Toolbox::StripSpaces(const std::string& source)
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
752 {
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
753 size_t first = 0;
177
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
754
247
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
755 while (first < source.length() &&
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
756 isspace(source[first]))
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
757 {
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
758 first++;
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
759 }
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
760
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
761 if (first == source.length())
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
762 {
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
763 // String containing only spaces
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
764 return "";
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
765 }
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
766
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
767 size_t last = source.length();
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
768 while (last > first &&
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
769 isspace(source[last - 1]))
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
770 {
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
771 last--;
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
772 }
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
773
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
774 assert(first <= last);
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
775 return source.substr(first, last - first);
c9b3ba0fd140 path management in zip files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
776 }
336
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
777
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
778
337
26218c4de7e0 test added
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 336
diff changeset
779 static char Hex2Dec(char c)
336
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
780 {
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
781 return ((c >= '0' && c <= '9') ? c - '0' :
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
782 ((c >= 'a' && c <= 'f') ? c - 'a' + 10 : c - 'A' + 10));
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
783 }
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
784
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
785 void Toolbox::UrlDecode(std::string& s)
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
786 {
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
787 // http://en.wikipedia.org/wiki/Percent-encoding
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
788 // http://www.w3schools.com/tags/ref_urlencode.asp
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
789 // http://stackoverflow.com/questions/154536/encode-decode-urls-in-c
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
790
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
791 if (s.size() == 0)
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
792 {
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
793 return;
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
794 }
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
795
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
796 size_t source = 0;
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
797 size_t target = 0;
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
798
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
799 while (source < s.size())
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
800 {
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
801 if (s[source] == '%' &&
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
802 source + 2 < s.size() &&
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
803 isalnum(s[source + 1]) &&
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
804 isalnum(s[source + 2]))
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
805 {
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
806 s[target] = (Hex2Dec(s[source + 1]) << 4) | Hex2Dec(s[source + 2]);
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
807 source += 3;
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
808 target += 1;
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
809 }
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
810 else
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
811 {
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
812 if (s[source] == '+')
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
813 s[target] = ' ';
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
814 else
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
815 s[target] = s[source];
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
816
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
817 source++;
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
818 target++;
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
819 }
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
820 }
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
821
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
822 s.resize(target);
3c291753231f url decode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
823 }
453
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
824
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
825
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
826 Endianness Toolbox::DetectEndianness()
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
827 {
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
828 // http://sourceforge.net/p/predef/wiki/Endianness/
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
829
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
830 uint8_t buffer[4];
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
831
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
832 buffer[0] = 0x00;
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
833 buffer[1] = 0x01;
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
834 buffer[2] = 0x02;
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
835 buffer[3] = 0x03;
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
836
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
837 switch (*((uint32_t *)buffer))
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
838 {
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
839 case 0x00010203:
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
840 return Endianness_Big;
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
841
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
842 case 0x03020100:
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
843 return Endianness_Little;
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
844
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
845 default:
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
846 throw OrthancException(ErrorCode_NotImplemented);
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
847 }
30086c1aca30 endianness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
848 }
608
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
849
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
850
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
851 std::string Toolbox::WildcardToRegularExpression(const std::string& source)
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
852 {
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
853 // TODO - Speed up this with a regular expression
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
854
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
855 std::string result = source;
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
856
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
857 // Escape all special characters
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
858 boost::replace_all(result, "\\", "\\\\");
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
859 boost::replace_all(result, "^", "\\^");
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
860 boost::replace_all(result, ".", "\\.");
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
861 boost::replace_all(result, "$", "\\$");
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
862 boost::replace_all(result, "|", "\\|");
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
863 boost::replace_all(result, "(", "\\(");
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
864 boost::replace_all(result, ")", "\\)");
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
865 boost::replace_all(result, "[", "\\[");
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
866 boost::replace_all(result, "]", "\\]");
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
867 boost::replace_all(result, "+", "\\+");
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
868 boost::replace_all(result, "/", "\\/");
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
869 boost::replace_all(result, "{", "\\{");
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
870 boost::replace_all(result, "}", "\\}");
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
871
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
872 // Convert wildcards '*' and '?' to their regex equivalents
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
873 boost::replace_all(result, "?", ".");
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
874 boost::replace_all(result, "*", ".*");
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
875
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
876 return result;
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
877 }
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
878
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
879
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
880 void Toolbox::TokenizeString(std::vector<std::string>& result,
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
881 const std::string& value,
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
882 char separator)
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
883 {
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
884 result.clear();
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
885
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
886 std::string currentItem;
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
887
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
888 for (size_t i = 0; i < value.size(); i++)
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
889 {
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
890 if (value[i] == separator)
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
891 {
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
892 result.push_back(currentItem);
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
893 currentItem.clear();
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
894 }
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
895 else
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
896 {
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
897 currentItem.push_back(value[i]);
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
898 }
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
899 }
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
900
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
901 result.push_back(currentItem);
0bedf8ff9288 basic find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 577
diff changeset
902 }
800
ecedd89055db generation of DICOM images from PNG files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 707
diff changeset
903
ecedd89055db generation of DICOM images from PNG files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 707
diff changeset
904
2136
dd609a99d39a uniformization of the macro naming
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2129
diff changeset
905 #if ORTHANC_ENABLE_PUGIXML == 1
1045
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
906 class ChunkedBufferWriter : public pugi::xml_writer
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
907 {
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
908 private:
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
909 ChunkedBuffer buffer_;
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
910
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
911 public:
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
912 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
913 {
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
914 if (size > 0)
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
915 {
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
916 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
917 }
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
918 }
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
919
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
920 void Flatten(std::string& s)
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
921 {
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
922 buffer_.Flatten(s);
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
923 }
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
924 };
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
925
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
926
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
927 static void JsonToXmlInternal(pugi::xml_node& target,
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
928 const Json::Value& source,
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
929 const std::string& arrayElement)
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
930 {
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
931 // 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
932
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
933 switch (source.type())
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
934 {
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
935 case Json::nullValue:
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
936 {
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
937 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
938 break;
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
939 }
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
940
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
941 case Json::intValue:
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
942 {
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
943 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
944 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
945 break;
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
946 }
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
947
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
948 case Json::uintValue:
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
949 {
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
950 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
951 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
952 break;
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
953 }
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
954
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
955 case Json::realValue:
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
956 {
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
957 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
958 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
959 break;
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
960 }
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
961
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
962 case Json::stringValue:
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
963 {
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
964 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
965 break;
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
966 }
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
967
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
968 case Json::booleanValue:
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
969 {
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
970 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
971 break;
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
972 }
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
973
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
974 case Json::arrayValue:
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
975 {
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
976 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
977 {
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
978 pugi::xml_node node = target.append_child();
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
979 node.set_name(arrayElement.c_str());
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
980 JsonToXmlInternal(node, source[i], arrayElement);
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
981 }
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
982 break;
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
983 }
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
984
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
985 case Json::objectValue:
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
986 {
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
987 Json::Value::Members members = source.getMemberNames();
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
988
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
989 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
990 {
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
991 pugi::xml_node node = target.append_child();
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
992 node.set_name(members[i].c_str());
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
993 JsonToXmlInternal(node, source[members[i]], arrayElement);
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
994 }
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
995
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
996 break;
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
997 }
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
998
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
999 default:
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
1000 throw OrthancException(ErrorCode_NotImplemented);
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
1001 }
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
1002 }
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
1003
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
1004
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
1005 void Toolbox::JsonToXml(std::string& target,
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
1006 const Json::Value& source,
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
1007 const std::string& rootElement,
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
1008 const std::string& arrayElement)
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
1009 {
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
1010 pugi::xml_document doc;
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
1011
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
1012 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
1013 JsonToXmlInternal(n, source, arrayElement);
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
1014
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
1015 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
1016 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
1017 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
1018
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
1019 ChunkedBufferWriter writer;
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
1020 doc.save(writer, " ", pugi::format_default, pugi::encoding_utf8);
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
1021 writer.Flatten(target);
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
0bfeeb6d340f json to xml conversion with pugixml
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 971
diff changeset
1024 #endif
1050
64f1842aae2e Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1045
diff changeset
1025
64f1842aae2e Toolbox::ExecuteSystemCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1045
diff changeset
1026
1102
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1027
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1028 bool Toolbox::IsInteger(const std::string& str)
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1029 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1030 std::string s = StripSpaces(str);
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1031
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1032 if (s.size() == 0)
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1033 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1034 return false;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1035 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1036
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1037 size_t pos = 0;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1038 if (s[0] == '-')
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1039 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1040 if (s.size() == 1)
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1041 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1042 return false;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1043 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1044
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1045 pos = 1;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1046 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1047
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1048 while (pos < s.size())
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1049 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1050 if (!isdigit(s[pos]))
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1051 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1052 return false;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1053 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1054
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1055 pos++;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1056 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1057
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1058 return true;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1101
diff changeset
1059 }
1424
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1060
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1061
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1062 void Toolbox::CopyJsonWithoutComments(Json::Value& target,
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1063 const Json::Value& source)
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1064 {
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1065 switch (source.type())
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1066 {
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1067 case Json::nullValue:
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1068 target = Json::nullValue;
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1069 break;
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1070
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1071 case Json::intValue:
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1072 target = source.asInt64();
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1073 break;
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1074
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1075 case Json::uintValue:
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1076 target = source.asUInt64();
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1077 break;
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1078
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1079 case Json::realValue:
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1080 target = source.asDouble();
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1081 break;
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1082
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1083 case Json::stringValue:
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1084 target = source.asString();
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1085 break;
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1086
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1087 case Json::booleanValue:
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1088 target = source.asBool();
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1089 break;
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1090
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1091 case Json::arrayValue:
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1092 {
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1093 target = Json::arrayValue;
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1094 for (Json::Value::ArrayIndex i = 0; i < source.size(); i++)
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1095 {
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1096 Json::Value& item = target.append(Json::nullValue);
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1097 CopyJsonWithoutComments(item, source[i]);
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1098 }
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1099
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1100 break;
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1101 }
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1102
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1103 case Json::objectValue:
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1104 {
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1105 target = Json::objectValue;
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1106 Json::Value::Members members = source.getMemberNames();
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1107 for (Json::Value::ArrayIndex i = 0; i < members.size(); i++)
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1108 {
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1109 const std::string item = members[i];
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1110 CopyJsonWithoutComments(target[item], source[item]);
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1111 }
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1112
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1113 break;
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1114 }
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1115
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1116 default:
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1117 break;
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1118 }
fe384a9d3b51 OrthancPluginGetConfiguration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1397
diff changeset
1119 }
1430
ad94a3583b07 Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1428
diff changeset
1120
ad94a3583b07 Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1428
diff changeset
1121
ad94a3583b07 Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1428
diff changeset
1122 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
1123 const std::string& prefix)
ad94a3583b07 Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1428
diff changeset
1124 {
ad94a3583b07 Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1428
diff changeset
1125 if (str.size() < prefix.size())
ad94a3583b07 Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1428
diff changeset
1126 {
ad94a3583b07 Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1428
diff changeset
1127 return false;
ad94a3583b07 Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1428
diff changeset
1128 }
ad94a3583b07 Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1428
diff changeset
1129 else
ad94a3583b07 Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1428
diff changeset
1130 {
ad94a3583b07 Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1428
diff changeset
1131 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
1132 }
ad94a3583b07 Plugins can send answers as multipart messages
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1428
diff changeset
1133 }
2043
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1134
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1135
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1136 static bool IsUnreservedCharacter(char c)
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1137 {
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1138 // This function checks whether "c" is an unserved character
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1139 // wrt. an URI percent-encoding
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1140 // 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
1141
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1142 return ((c >= 'A' && c <= 'Z') ||
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1143 (c >= 'a' && c <= 'z') ||
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1144 (c >= '0' && c <= '9') ||
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1145 c == '-' ||
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1146 c == '_' ||
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1147 c == '.' ||
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1148 c == '~');
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1149 }
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1150
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1151 void Toolbox::UriEncode(std::string& target,
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1152 const std::string& source)
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1153 {
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1154 // Estimate the length of the percent-encoded URI
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1155 size_t length = 0;
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1156
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1157 for (size_t i = 0; i < source.size(); i++)
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1158 {
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1159 if (IsUnreservedCharacter(source[i]))
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1160 {
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1161 length += 1;
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1162 }
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1163 else
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1164 {
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1165 // This character must be percent-encoded
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1166 length += 3;
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1167 }
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1168 }
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1169
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1170 target.clear();
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1171 target.reserve(length);
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1172
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1173 for (size_t i = 0; i < source.size(); i++)
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1174 {
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1175 if (IsUnreservedCharacter(source[i]))
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1176 {
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1177 target.push_back(source[i]);
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1178 }
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1179 else
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1180 {
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1181 // This character must be percent-encoded
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1182 uint8_t byte = static_cast<uint8_t>(source[i]);
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1183 uint8_t a = byte >> 4;
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1184 uint8_t b = byte & 0x0f;
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1185
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1186 target.push_back('%');
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1187 target.push_back(a < 10 ? a + '0' : a - 10 + 'A');
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1188 target.push_back(b < 10 ? b + '0' : b - 10 + 'A');
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1189 }
35ccba7adae9 Toolbox::UriEncode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
1190 }
2071
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1191 }
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1192
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1193
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1194 static bool HasField(const Json::Value& json,
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1195 const std::string& key,
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1196 Json::ValueType expectedType)
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1197 {
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1198 if (json.type() != Json::objectValue ||
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1199 !json.isMember(key))
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1200 {
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1201 return false;
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1202 }
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1203 else if (json[key].type() == expectedType)
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1204 {
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1205 return true;
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1206 }
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1207 else
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1208 {
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1209 throw OrthancException(ErrorCode_BadParameterType);
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1210 }
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1211 }
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1212
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1213
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1214 std::string Toolbox::GetJsonStringField(const Json::Value& json,
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1215 const std::string& key,
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1216 const std::string& defaultValue)
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1217 {
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1218 if (HasField(json, key, Json::stringValue))
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1219 {
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1220 return json[key].asString();
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1221 }
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1222 else
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1223 {
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1224 return defaultValue;
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1225 }
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1226 }
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1227
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1228
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1229 bool Toolbox::GetJsonBooleanField(const ::Json::Value& json,
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1230 const std::string& key,
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1231 bool defaultValue)
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1232 {
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1233 if (HasField(json, key, Json::booleanValue))
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1234 {
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1235 return json[key].asBool();
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1236 }
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1237 else
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1238 {
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1239 return defaultValue;
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1240 }
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1241 }
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1242
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1243
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1244 int Toolbox::GetJsonIntegerField(const ::Json::Value& json,
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1245 const std::string& key,
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1246 int defaultValue)
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1247 {
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1248 if (HasField(json, key, Json::intValue))
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1249 {
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1250 return json[key].asInt();
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1251 }
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1252 else
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1253 {
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1254 return defaultValue;
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1255 }
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1256 }
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1257
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1258
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1259 unsigned int Toolbox::GetJsonUnsignedIntegerField(const ::Json::Value& json,
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1260 const std::string& key,
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1261 unsigned int defaultValue)
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1262 {
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1263 int v = GetJsonIntegerField(json, key, defaultValue);
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1264
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1265 if (v < 0)
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1266 {
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1267 throw OrthancException(ErrorCode_ParameterOutOfRange);
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1268 }
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1269 else
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1270 {
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1271 return static_cast<unsigned int>(v);
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1272 }
27fd34970c52 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2065
diff changeset
1273 }
2140
aa4b8895cd23 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2137
diff changeset
1274
aa4b8895cd23 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2137
diff changeset
1275
2141
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1276 bool Toolbox::IsUuid(const std::string& str)
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1277 {
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1278 if (str.size() != 36)
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1279 {
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1280 return false;
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1281 }
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1282
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1283 for (size_t i = 0; i < str.length(); i++)
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1284 {
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1285 if (i == 8 || i == 13 || i == 18 || i == 23)
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1286 {
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1287 if (str[i] != '-')
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1288 return false;
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1289 }
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1290 else
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1291 {
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1292 if (!isalnum(str[i]))
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1293 return false;
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1294 }
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1295 }
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1296
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1297 return true;
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1298 }
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1299
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1300
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1301 bool Toolbox::StartsWithUuid(const std::string& str)
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1302 {
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1303 if (str.size() < 36)
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1304 {
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1305 return false;
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1306 }
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1307
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1308 if (str.size() == 36)
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1309 {
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1310 return IsUuid(str);
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1311 }
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1312
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1313 assert(str.size() > 36);
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1314 if (!isspace(str[36]))
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1315 {
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1316 return false;
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1317 }
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1318
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1319 return IsUuid(str.substr(0, 36));
a260a8ad83f1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
1320 }
2326
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1321
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1322
2367
2aff870c2c58 refactoring of BoostConfiguration.cmake
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2351
diff changeset
1323 #if ORTHANC_ENABLE_LOCALE == 1
2326
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1324 static std::auto_ptr<std::locale> globalLocale_;
2334
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1325
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1326 static bool SetGlobalLocale(const char* locale)
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1327 {
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1328 globalLocale_.reset(NULL);
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1329
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1330 try
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1331 {
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1332 if (locale == NULL)
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1333 {
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1334 LOG(WARNING) << "Falling back to system-wide default locale";
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1335 globalLocale_.reset(new std::locale());
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1336 }
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1337 else
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1338 {
2351
56504f89d4ac log info
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2334
diff changeset
1339 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
1340 globalLocale_.reset(new std::locale(locale));
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1341 }
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1342 }
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1343 catch (std::runtime_error&)
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1344 {
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1345 }
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1346
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1347 return (globalLocale_.get() != NULL);
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1348 }
2326
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1349
2330
9c7a80c87ae9 "Locale" configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2326
diff changeset
1350 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
1351 {
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1352 // Make Orthanc use English, United States locale
2334
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1353 // Linux: use "en_US.UTF-8"
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1354 // Windows: use ""
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1355 // Wine: use NULL
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1356
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1357 #if defined(__MINGW32__)
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1358 // Visibly, there is no support of locales in MinGW yet
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1359 // 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
1360 static const char* DEFAULT_LOCALE = NULL;
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1361 #elif defined(_WIN32)
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1362 // For Windows: use default locale (using "en_US" does not work)
2333
6677cdbfbafd fix default locale for Windows
jodogne
parents: 2330
diff changeset
1363 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
1364 #else
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1365 // For Linux & cie
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1366 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
1367 #endif
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1368
2334
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1369 bool ok;
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1370
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1371 if (locale == NULL)
2326
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1372 {
2334
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1373 ok = SetGlobalLocale(DEFAULT_LOCALE);
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1374
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1375 #if defined(__MINGW32__)
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1376 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
1377 << "strings with accents will not work outside of Wine";
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1378 #endif
2326
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1379 }
2334
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1380 else
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1381 {
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1382 ok = SetGlobalLocale(locale);
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1383 }
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1384
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1385 if (!ok &&
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1386 !SetGlobalLocale(NULL))
2326
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1387 {
2330
9c7a80c87ae9 "Locale" configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2326
diff changeset
1388 LOG(ERROR) << "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
1389 throw OrthancException(ErrorCode_InternalError);
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1390 }
2334
dd26536454a0 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2333
diff changeset
1391
2326
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1392 }
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1393
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1394
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1395 void Toolbox::FinalizeGlobalLocale()
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1396 {
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1397 globalLocale_.reset();
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1398 }
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1399
2677
0196d07a900f migrate OpenSSL initialization to Toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2513
diff changeset
1400
2326
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1401 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
1402 {
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1403 if (globalLocale_.get() == NULL)
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1404 {
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1405 LOG(ERROR) << "No global locale was set, call Toolbox::InitializeGlobalLocale()";
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1406 throw OrthancException(ErrorCode_BadSequenceOfCalls);
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1407 }
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1408
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1409 /**
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1410 * 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
1411 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1412 * (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
1413 * 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
1414 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1415 * 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
1416 * 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
1417 * 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
1418 * 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
1419 * 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
1420 * would use:
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1421 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1422 * boost::locale::generator gen;
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1423 * 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
1424 * 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
1425 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1426 * (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
1427 * 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
1428 * global variable "globalLocale_".
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1429 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1430 * (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
1431 * 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
1432 * 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
1433 * "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
1434 **/
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
1435
2907
0204af4ece6a Remove invalid characters from badly-encoded UTF-8 strings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2906
diff changeset
1436 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
1437 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
1438 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
1439 }
2373
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2367
diff changeset
1440 #endif
2512
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1441
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1442
2678
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1443 void Toolbox::InitializeOpenSsl()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1444 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1445 #if ORTHANC_ENABLE_SSL == 1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1446 // https://wiki.openssl.org/index.php/Library_Initialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1447 SSL_library_init();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1448 SSL_load_error_strings();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1449 OpenSSL_add_all_algorithms();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1450 ERR_load_crypto_strings();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1451 #endif
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1452 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1453
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1454
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1455 void Toolbox::FinalizeOpenSsl()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1456 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1457 #if ORTHANC_ENABLE_SSL == 1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1458 // Finalize OpenSSL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1459 // https://wiki.openssl.org/index.php/Library_Initialization#Cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1460 #ifdef FIPS_mode_set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1461 FIPS_mode_set(0);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1462 #endif
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1463 ENGINE_cleanup();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1464 CONF_modules_unload(1);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1465 EVP_cleanup();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1466 CRYPTO_cleanup_all_ex_data();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1467 ERR_remove_state(0);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1468 ERR_free_strings();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1469 #endif
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1470 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1471
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2677
diff changeset
1472
2512
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1473 std::string Toolbox::GenerateUuid()
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1474 {
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1475 #ifdef WIN32
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1476 UUID uuid;
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1477 UuidCreate ( &uuid );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1478
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1479 unsigned char * str;
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1480 UuidToStringA ( &uuid, &str );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1481
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1482 std::string s( ( char* ) str );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1483
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1484 RpcStringFreeA ( &str );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1485 #else
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1486 uuid_t uuid;
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1487 uuid_generate_random ( uuid );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1488 char s[37];
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1489 uuid_unparse ( uuid, s );
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1490 #endif
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1491 return s;
4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
1492 }
2920
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1493
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1494
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1495 namespace
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1496 {
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1497 // Anonymous namespace to avoid clashes between compilation modules
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1498
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1499 class VariableFormatter
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1500 {
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1501 public:
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1502 typedef std::map<std::string, std::string> Dictionary;
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1503
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1504 private:
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1505 const Dictionary& dictionary_;
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1506
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1507 public:
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1508 VariableFormatter(const Dictionary& dictionary) :
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1509 dictionary_(dictionary)
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1510 {
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1511 }
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1512
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1513 template<typename Out>
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1514 Out operator()(const boost::smatch& what,
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1515 Out out) const
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1516 {
2921
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1517 if (!what[1].str().empty())
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1518 {
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1519 // Variable without a default value
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1520 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
1521
2921
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1522 if (found != dictionary_.end())
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1523 {
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1524 const std::string& value = found->second;
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1525 out = std::copy(value.begin(), value.end(), out);
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1526 }
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1527 }
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1528 else
2920
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1529 {
2921
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1530 // Variable with a default value
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1531 std::string key;
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1532 std::string defaultValue;
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1533
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1534 if (!what[2].str().empty())
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1535 {
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1536 key = what[2].str();
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1537 defaultValue = what[3].str();
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1538 }
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1539 else if (!what[4].str().empty())
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1540 {
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1541 key = what[4].str();
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1542 defaultValue = what[5].str();
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1543 }
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1544 else if (!what[6].str().empty())
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1545 {
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1546 key = what[6].str();
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1547 defaultValue = what[7].str();
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1548 }
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1549 else
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1550 {
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1551 throw OrthancException(ErrorCode_InternalError);
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1552 }
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1553
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1554 Dictionary::const_iterator found = dictionary_.find(key);
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1555
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1556 if (found == dictionary_.end())
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1557 {
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1558 out = std::copy(defaultValue.begin(), defaultValue.end(), out);
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1559 }
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1560 else
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1561 {
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1562 const std::string& value = found->second;
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1563 out = std::copy(value.begin(), value.end(), out);
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1564 }
2920
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1565 }
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1566
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1567 return out;
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1568 }
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1569 };
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1570 }
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1571
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1572
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1573 std::string Toolbox::SubstituteVariables(const std::string& source,
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1574 const std::map<std::string, std::string>& dictionary)
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1575 {
2921
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1576 const boost::regex pattern("\\${([^:]*?)}|" // ${what[1]}
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1577 "\\${([^:]*?):-([^'\"]*?)}|" // ${what[2]:-what[3]}
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1578 "\\${([^:]*?):-\"([^\"]*?)\"}|" // ${what[4]:-"what[5]"}
0a4428aad512 variable substitution with default value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2920
diff changeset
1579 "\\${([^:]*?):-'([^']*?)'}"); // ${what[6]:-'what[7]'}
2920
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1580
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1581 VariableFormatter formatter(dictionary);
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1582
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1583 return boost::regex_replace(source, pattern, formatter);
ad0e7def3338 Toolbox::SubstituteVariables and SystemToolbox::GetEnvironmentVariables
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2907
diff changeset
1584 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1585 }
2513
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1586
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1587
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1588
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1589 OrthancLinesIterator* OrthancLinesIterator_Create(const std::string& content)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1590 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1591 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
1592 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1593
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1594
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1595 bool OrthancLinesIterator_GetLine(std::string& target,
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1596 const OrthancLinesIterator* iterator)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1597 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1598 if (iterator != NULL)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1599 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1600 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
1601 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1602 else
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1603 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1604 return false;
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1605 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1606 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1607
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1608
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1609 void OrthancLinesIterator_Next(OrthancLinesIterator* iterator)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1610 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1611 if (iterator != NULL)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1612 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1613 reinterpret_cast<Orthanc::Toolbox::LinesIterator*>(iterator)->Next();
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1614 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1615 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1616
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1617
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1618 void OrthancLinesIterator_Free(OrthancLinesIterator* iterator)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1619 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1620 if (iterator != NULL)
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1621 {
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1622 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
1623 }
97a74f0eac7a loading DICOM dictionaries in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2512
diff changeset
1624 }