orthanc: Core/Toolbox.cpp annotate

annotate Core/Toolbox.cpp @ 2387:a60a79929007

merge

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 30 Aug 2017 09:29:31 +0200
parents	68380777f9a6
children	cad393b41bc3

rev	line source
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1833 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	4 * Department, University Hospital of Liege, Belgium
2244 a3a65de1840f shared copyright with osimis Sebastien Jodogne <s.jodogne@gmail.com> parents: 2242 diff changeset	5 * Copyright (C) 2017 Osimis, 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
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	65
1111 929bf8c2123d Fixes for Visual Studio 2013 64bit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1103 diff changeset	66 #if defined(_MSC_VER) && (_MSC_VER < 1800)
929bf8c2123d Fixes for Visual Studio 2013 64bit Sebastien Jodogne <s.jodogne@gmail.com> parents: 1103 diff changeset	67 // Patch for the missing "_strtoll" symbol when compiling with Visual Studio < 2013
570 86c5bb651bfa fix jodogne parents: 568 diff changeset	68 extern "C"
86c5bb651bfa fix jodogne parents: 568 diff changeset	69 {
915 703bef350e89 Orthanc now relies entirely on boost::locale Sebastien Jodogne <s.jodogne@gmail.com> parents: 890 diff changeset	70 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	71 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	72 {
915 703bef350e89 Orthanc now relies entirely on boost::locale Sebastien Jodogne <s.jodogne@gmail.com> parents: 890 diff changeset	73 return _strtoi64(nptr, endptr, base);
703bef350e89 Orthanc now relies entirely on boost::locale Sebastien Jodogne <s.jodogne@gmail.com> parents: 890 diff changeset	74 }
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	75 }
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	76 #endif
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	77
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	78
2173 1c42860097fc fix windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	79 #if defined(_WIN32)
1c42860097fc fix windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	80 # include <windows.h> // For ::Sleep
1c42860097fc fix windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	81 #endif
1c42860097fc fix windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2172 diff changeset	82
2141 a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	83
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2129 diff changeset	84 #if ORTHANC_ENABLE_PUGIXML == 1
2143 fd5875662670 creation of namespace SystemToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2141 diff changeset	85 # include "ChunkedBuffer.h"
fd5875662670 creation of namespace SystemToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2141 diff changeset	86 # include <pugixml.hpp>
1045 0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	87 #endif
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	88
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	89
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	90 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	92 void Toolbox::ToUpperCase(std::string& s)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	93 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	94 std::transform(s.begin(), s.end(), s.begin(), toupper);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	95 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	96
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	97
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	98 void Toolbox::ToLowerCase(std::string& s)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	99 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	100 std::transform(s.begin(), s.end(), s.begin(), tolower);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	101 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	102
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	103
690 2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	104 void Toolbox::ToUpperCase(std::string& result,
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	105 const std::string& source)
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	106 {
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	107 result = source;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	108 ToUpperCase(result);
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	109 }
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	110
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	111 void Toolbox::ToLowerCase(std::string& result,
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	112 const std::string& source)
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	113 {
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	114 result = source;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	115 ToLowerCase(result);
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	116 }
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	117
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	118
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	119 void Toolbox::SplitUriComponents(UriComponents& components,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	120 const std::string& uri)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	121 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	122 static const char URI_SEPARATOR = '/';
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	123
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	124 components.clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	125
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	126 if (uri.size() == 0 \|\|
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	127 uri[0] != URI_SEPARATOR)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	128 {
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	129 throw OrthancException(ErrorCode_UriSyntax);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	130 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	131
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	132 // Count the number of slashes in the URI to make an assumption
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	133 // about the number of components in the URI
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	134 unsigned int estimatedSize = 0;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	135 for (unsigned int i = 0; i < uri.size(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	136 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	137 if (uri[i] == URI_SEPARATOR)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	138 estimatedSize++;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	139 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	140
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	141 components.reserve(estimatedSize - 1);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	142
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	143 unsigned int start = 1;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	144 unsigned int end = 1;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	145 while (end < uri.size())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	147 // This is the loop invariant
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	148 assert(uri[start - 1] == '/' && (end >= start));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	149
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	150 if (uri[end] == '/')
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	151 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	152 components.push_back(std::string(&uri[start], end - start));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	153 end++;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	154 start = end;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	155 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	156 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	157 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	158 end++;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	159 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	160 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	161
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	162 if (start < uri.size())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	163 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	164 components.push_back(std::string(&uri[start], end - start));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	165 }
207 7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	166
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	167 for (size_t i = 0; i < components.size(); i++)
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	168 {
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	169 if (components[i].size() == 0)
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	170 {
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	171 // Empty component, as in: "/coucou//e"
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	172 throw OrthancException(ErrorCode_UriSyntax);
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	173 }
7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	174 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	175 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	176
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	177
966 886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	178 void Toolbox::TruncateUri(UriComponents& target,
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	179 const UriComponents& source,
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	180 size_t fromLevel)
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	181 {
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	182 target.clear();
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	183
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	184 if (source.size() > fromLevel)
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	185 {
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	186 target.resize(source.size() - fromLevel);
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	187
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	188 size_t j = 0;
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	189 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	190 {
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	191 target[j] = source[i];
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	192 }
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	193
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	194 assert(j == target.size());
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	195 }
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	196 }
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	197
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	198
886652370ff2 accelerating REST API matching Sebastien Jodogne <s.jodogne@gmail.com> parents: 957 diff changeset	199
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	200 bool Toolbox::IsChildUri(const UriComponents& baseUri,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	201 const UriComponents& testedUri)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	202 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	203 if (testedUri.size() < baseUri.size())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	204 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	205 return false;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	206 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	207
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	208 for (size_t i = 0; i < baseUri.size(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	209 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	210 if (baseUri[i] != testedUri[i])
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	211 return false;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	212 }
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 return true;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	215 }
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
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	218 std::string Toolbox::AutodetectMimeType(const std::string& path)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	219 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	220 std::string contentType;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	221 size_t lastDot = path.rfind('.');
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	222 size_t lastSlash = path.rfind('/');
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	223
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	224 if (lastDot == std::string::npos \|\|
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	225 (lastSlash != std::string::npos && lastDot < lastSlash))
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 // No trailing dot, unable to detect the content type
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	228 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	230 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	231 const char* extension = &path[lastDot + 1];
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	232
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	233 // http://en.wikipedia.org/wiki/Mime_types
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	234 // Text types
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	235 if (!strcmp(extension, "txt"))
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	236 contentType = "text/plain";
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237 else if (!strcmp(extension, "html"))
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	238 contentType = "text/html";
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	239 else if (!strcmp(extension, "xml"))
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	240 contentType = "text/xml";
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	241 else if (!strcmp(extension, "css"))
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	242 contentType = "text/css";
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	243
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244 // Application types
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245 else if (!strcmp(extension, "js"))
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246 contentType = "application/javascript";
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	247 else if (!strcmp(extension, "json"))
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248 contentType = "application/json";
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249 else if (!strcmp(extension, "pdf"))
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250 contentType = "application/pdf";
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	251
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 // Images types
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253 else if (!strcmp(extension, "jpg") \|\| !strcmp(extension, "jpeg"))
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254 contentType = "image/jpeg";
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	255 else if (!strcmp(extension, "gif"))
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	256 contentType = "image/gif";
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	257 else if (!strcmp(extension, "png"))
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	258 contentType = "image/png";
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	259 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	260
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	261 return contentType;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	262 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	263
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	264
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	265 std::string Toolbox::FlattenUri(const UriComponents& components,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	266 size_t fromLevel)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	267 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	268 if (components.size() <= fromLevel)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	269 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	270 return "/";
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 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	273 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	274 std::string r;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	275
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	276 for (size_t i = fromLevel; i < components.size(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	277 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	278 r += "/" + components[i];
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	279 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	280
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	281 return r;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	282 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	283 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	284
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	285
2137 595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	286 #if ORTHANC_ENABLE_MD5 == 1
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	287 static char GetHexadecimalCharacter(uint8_t value)
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	288 {
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	289 assert(value < 16);
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	290
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	291 if (value < 10)
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	292 {
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	293 return value + '0';
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	294 }
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	295 else
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	296 {
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	297 return (value - 10) + 'a';
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	298 }
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	299 }
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	300
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 22 diff changeset	301
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	302 void Toolbox::ComputeMD5(std::string& result,
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	303 const std::string& data)
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	304 {
693 01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	305 if (data.size() > 0)
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	306 {
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	307 ComputeMD5(result, &data[0], data.size());
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	308 }
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	309 else
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	310 {
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	311 ComputeMD5(result, NULL, 0);
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	312 }
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	313 }
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	314
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	315
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	316 void Toolbox::ComputeMD5(std::string& result,
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	317 const void* data,
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	318 size_t size)
693 01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	319 {
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	320 md5_state_s state;
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	321 md5_init(&state);
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	322
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	323 if (size > 0)
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	324 {
693 01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	325 md5_append(&state,
01d8611c4a60 md5 for attached files Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	326 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	327 static_cast<int>(size));
22 1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	328 }
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	329
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	330 md5_byte_t actualHash[16];
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	331 md5_finish(&state, actualHash);
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	332
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	333 result.resize(32);
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	334 for (unsigned int i = 0; i < 16; i++)
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	335 {
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1648 diff changeset	336 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	337 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	338 }
1bc6327d1de3 MD5 sum Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	339 }
1479 8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	340 #endif
24 166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	341
166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	342
2137 595cf22b3e7e safety checks of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	343 #if ORTHANC_ENABLE_BASE64 == 1
809 8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	344 void Toolbox::EncodeBase64(std::string& result,
8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	345 const std::string& data)
24 166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	346 {
809 8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	347 result = base64_encode(data);
24 166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	348 }
166664f0f860 base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	349
809 8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	350 void Toolbox::DecodeBase64(std::string& result,
8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	351 const std::string& data)
365 cda6938a8c6f decode base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 337 diff changeset	352 {
1988 e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	353 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	354 {
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	355 if (!isalnum(data[i]) &&
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	356 data[i] != '+' &&
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	357 data[i] != '/' &&
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	358 data[i] != '=')
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	359 {
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	360 // 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	361 throw OrthancException(ErrorCode_BadFileFormat);
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	362 }
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	363 }
e29aea2349b9 test validity of base64 strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	364
809 8ce2f69436ca do not return strings with base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	365 result = base64_decode(data);
365 cda6938a8c6f decode base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 337 diff changeset	366 }
1648 a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	367
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	368
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	369 bool Toolbox::DecodeDataUriScheme(std::string& mime,
1648 a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	370 std::string& content,
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	371 const std::string& source)
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	372 {
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	373 boost::regex pattern("data:([^;]+);base64,([a-zA-Z0-9=+/]*)",
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	374 boost::regex::icase /* case insensitive search */);
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	375
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	376 boost::cmatch what;
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	377 if (regex_match(source.c_str(), what, pattern))
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	378 {
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	379 mime = what[1];
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	380 DecodeBase64(content, what[2]);
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	381 return true;
1648 a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	382 }
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	383 else
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	384 {
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1976 diff changeset	385 return false;
1648 a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	386 }
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	387 }
a0a4fa28624c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	388
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	389
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	390 void Toolbox::EncodeDataUriScheme(std::string& result,
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	391 const std::string& mime,
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	392 const std::string& content)
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	393 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	394 result = "data:" + mime + ";base64," + base64_encode(content);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	395 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1767 diff changeset	396
1479 8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	397 #endif
8f28a1cd2354 possibility to disable md5 and base64 support in the toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	398
365 cda6938a8c6f decode base64 Sebastien Jodogne <s.jodogne@gmail.com> parents: 337 diff changeset	399
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	400 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	401 {
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	402 switch (sourceEncoding)
766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	403 {
766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	404 case Encoding_Utf8:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	405 return "UTF-8";
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	406
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 950 diff changeset	407 case Encoding_Ascii:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	408 return "ASCII";
956 2fd5a163776d primitives for proper encoding handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 950 diff changeset	409
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	410 case Encoding_Latin1:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	411 return "ISO-8859-1";
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	412 break;
766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	413
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	414 case Encoding_Latin2:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	415 return "ISO-8859-2";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	416 break;
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	417
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	418 case Encoding_Latin3:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	419 return "ISO-8859-3";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	420 break;
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	421
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	422 case Encoding_Latin4:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	423 return "ISO-8859-4";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	424 break;
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	425
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	426 case Encoding_Latin5:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	427 return "ISO-8859-9";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	428 break;
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	429
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	430 case Encoding_Cyrillic:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	431 return "ISO-8859-5";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	432 break;
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	433
1347 60cc0ee61edb fix issue 32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1337 diff changeset	434 case Encoding_Windows1251:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	435 return "WINDOWS-1251";
1347 60cc0ee61edb fix issue 32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1337 diff changeset	436 break;
60cc0ee61edb fix issue 32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1337 diff changeset	437
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	438 case Encoding_Arabic:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	439 return "ISO-8859-6";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	440 break;
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	441
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	442 case Encoding_Greek:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	443 return "ISO-8859-7";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	444 break;
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	445
e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	446 case Encoding_Hebrew:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	447 return "ISO-8859-8";
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	448 break;
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	449
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	450 case Encoding_Japanese:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	451 return "SHIFT-JIS";
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	452 break;
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	453
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	454 case Encoding_Chinese:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	455 return "GB18030";
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	456 break;
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	457
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	458 case Encoding_Thai:
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	459 return "TIS620.2533-0";
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1087 diff changeset	460 break;
1087 e07b90fb00eb more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1050 diff changeset	461
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	462 default:
957 63973b76a51f detection of encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	463 throw OrthancException(ErrorCode_NotImplemented);
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	464 }
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	465 }
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	466
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	467
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	468 #if ORTHANC_ENABLE_LOCALE == 1
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	469 std::string Toolbox::ConvertToUtf8(const std::string& source,
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	470 Encoding sourceEncoding)
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	471 {
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	472 if (sourceEncoding == Encoding_Utf8)
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	473 {
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	474 // Already in UTF-8: No conversion is required
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	475 return source;
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	476 }
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	477
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	478 if (sourceEncoding == Encoding_Ascii)
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	479 {
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	480 return ConvertToAscii(source);
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	481 }
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	482
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	483 const char* encoding = GetBoostLocaleEncoding(sourceEncoding);
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	484
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	485 try
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	486 {
949 766a57997121 enumeration for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	487 return boost::locale::conv::to_utf<char>(source, encoding);
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	488 }
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	489 catch (std::runtime_error&)
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	490 {
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	491 // Bad input string or bad encoding
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	492 return ConvertToAscii(source);
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	493 }
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	494 }
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	495 #endif
2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	496
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	497
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	498 #if ORTHANC_ENABLE_LOCALE == 1
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	499 std::string Toolbox::ConvertFromUtf8(const std::string& source,
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	500 Encoding targetEncoding)
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	501 {
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	502 if (targetEncoding == Encoding_Utf8)
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	503 {
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	504 // Already in UTF-8: No conversion is required
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	505 return source;
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	506 }
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	507
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	508 if (targetEncoding == Encoding_Ascii)
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	509 {
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	510 return ConvertToAscii(source);
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	511 }
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	512
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	513 const char* encoding = GetBoostLocaleEncoding(targetEncoding);
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	514
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	515 try
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 return boost::locale::conv::from_utf<char>(source, encoding);
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	518 }
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	519 catch (std::runtime_error&)
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	520 {
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	521 // Bad input string or bad encoding
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	522 return ConvertToAscii(source);
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	523 }
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	524 }
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	525 #endif
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	526
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	527
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	528 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	529 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	530 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	531 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	532
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	533 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	534 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	535 if (p > 127 \|\| (p != 0 && iscntrl(*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	536 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	537 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	538 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	539 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	540
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	541 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	542 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	543
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2087 diff changeset	544
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	545 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	546 {
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	547 std::string result;
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	548
942 b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 930 diff changeset	549 result.reserve(source.size() + 1);
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	550 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	551 {
1334 7f0aa3c0f659 code improvements Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	552 if (source[i] <= 127 && source[i] >= 0 && !iscntrl(source[i]))
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	553 {
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	554 result.push_back(source[i]);
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	555 }
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	556 }
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	557
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	558 return result;
3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	559 }
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	560
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	561
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	562 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	563 const void* data,
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	564 size_t size)
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	565 {
560 69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	566 boost::uuids::detail::sha1 sha1;
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	567
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	568 if (size > 0)
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	569 {
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	570 sha1.process_bytes(data, size);
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	571 }
81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	572
560 69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	573 unsigned int digest[5];
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	574
81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	575 // 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	576 assert(sizeof(unsigned int) == 4 && sizeof(digest) == (160 / 8));
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	577
560 69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	578 sha1.get_digest(digest);
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	579
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	580 result.resize(8 * 5 + 4);
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	581 sprintf(&result[0], "%08x-%08x-%08x-%08x-%08x",
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	582 digest[0],
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	583 digest[1],
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	584 digest[2],
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	585 digest[3],
69c024f9c06b fix of Debian bug #724947 Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	586 digest[4]);
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	587 }
81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	588
1833 47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	589 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	590 const std::string& data)
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	591 {
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	592 if (data.size() > 0)
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	593 {
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	594 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	595 }
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	596 else
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	597 {
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	598 ComputeSHA1(result, NULL, 0);
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	599 }
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	600 }
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	601
47d032c48818 "OrthancPluginComputeMd5()" and "OrthancPluginComputeSha1()" to compute MD5/SHA-1 hash Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	602
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	603 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	604 size_t size)
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	605 {
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	606 if (size == 0)
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	607 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	608 return false;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	609 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	610
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	611 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	612 const char* end = str + size;
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	613
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	614 // Trim the beginning of the string
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	615 while (start < end)
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	616 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	617 if (*start == '\0' \|\|
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	618 isspace(*start))
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	619 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	620 start++;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	621 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	622 else
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	623 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	624 break;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	625 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	626 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	627
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	628 // Trim the trailing of the string
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	629 while (start < end)
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	630 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	631 if (*(end - 1) == '\0' \|\|
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	632 isspace(*(end - 1)))
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	633 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	634 end--;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	635 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	636 else
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	637 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	638 break;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	639 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	640 }
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	641
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	642 if (end - start != 44)
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	643 {
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	644 return false;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	645 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	646
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	647 for (unsigned int i = 0; i < 44; i++)
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	648 {
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	649 if (i == 8 \|\|
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	650 i == 17 \|\|
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	651 i == 26 \|\|
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	652 i == 35)
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	653 {
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	654 if (start[i] != '-')
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	655 return false;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	656 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	657 else
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	658 {
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1424 diff changeset	659 if (!isalnum(start[i]))
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	660 return false;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	661 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	662 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	663
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	664 return true;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	665 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	666
1397 704de8c30ff5 modularization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	667
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	668 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	669 {
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	670 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	671 {
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	672 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	673 }
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	674 else
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	675 {
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	676 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	677 }
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	678 }
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	679
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	680
247 c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	681 std::string Toolbox::StripSpaces(const std::string& source)
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	682 {
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	683 size_t first = 0;
177 81b6f3013738 sha1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	684
247 c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	685 while (first < source.length() &&
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	686 isspace(source[first]))
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	687 {
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	688 first++;
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	689 }
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	690
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	691 if (first == source.length())
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	692 {
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	693 // String containing only spaces
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	694 return "";
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	695 }
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	696
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	697 size_t last = source.length();
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	698 while (last > first &&
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	699 isspace(source[last - 1]))
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	700 {
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	701 last--;
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	702 }
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	703
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	704 assert(first <= last);
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	705 return source.substr(first, last - first);
c9b3ba0fd140 path management in zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	706 }
336 3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	707
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	708
337 26218c4de7e0 test added Sebastien Jodogne <s.jodogne@gmail.com> parents: 336 diff changeset	709 static char Hex2Dec(char c)
336 3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	710 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	711 return ((c >= '0' && c <= '9') ? c - '0' :
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	712 ((c >= 'a' && c <= 'f') ? c - 'a' + 10 : c - 'A' + 10));
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	713 }
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	714
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	715 void Toolbox::UrlDecode(std::string& s)
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	716 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	717 // http://en.wikipedia.org/wiki/Percent-encoding
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	718 // http://www.w3schools.com/tags/ref_urlencode.asp
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	719 // http://stackoverflow.com/questions/154536/encode-decode-urls-in-c
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	720
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	721 if (s.size() == 0)
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	722 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	723 return;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	724 }
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	725
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	726 size_t source = 0;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	727 size_t target = 0;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	728
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	729 while (source < s.size())
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	730 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	731 if (s[source] == '%' &&
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	732 source + 2 < s.size() &&
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	733 isalnum(s[source + 1]) &&
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	734 isalnum(s[source + 2]))
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	735 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	736 s[target] = (Hex2Dec(s[source + 1]) << 4) \| Hex2Dec(s[source + 2]);
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	737 source += 3;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	738 target += 1;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	739 }
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	740 else
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	741 {
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	742 if (s[source] == '+')
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	743 s[target] = ' ';
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	744 else
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	745 s[target] = s[source];
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	746
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	747 source++;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	748 target++;
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	749 }
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	750 }
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	751
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	752 s.resize(target);
3c291753231f url decode Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	753 }
453 30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	754
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	755
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	756 Endianness Toolbox::DetectEndianness()
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	757 {
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	758 // http://sourceforge.net/p/predef/wiki/Endianness/
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	759
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	760 uint8_t buffer[4];
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	761
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	762 buffer[0] = 0x00;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	763 buffer[1] = 0x01;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	764 buffer[2] = 0x02;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	765 buffer[3] = 0x03;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	766
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	767 switch (((uint32_t )buffer))
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	768 {
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	769 case 0x00010203:
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	770 return Endianness_Big;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	771
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	772 case 0x03020100:
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	773 return Endianness_Little;
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	774
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	775 default:
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	776 throw OrthancException(ErrorCode_NotImplemented);
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	777 }
30086c1aca30 endianness Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	778 }
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	779
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	780
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	781 std::string Toolbox::WildcardToRegularExpression(const std::string& source)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	782 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	783 // TODO - Speed up this with a regular expression
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	784
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	785 std::string result = source;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	786
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	787 // Escape all special characters
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	788 boost::replace_all(result, "\\", "\\\\");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	789 boost::replace_all(result, "^", "\\^");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	790 boost::replace_all(result, ".", "\\.");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	791 boost::replace_all(result, "$", "\\$");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	792 boost::replace_all(result, "\|", "\\\|");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	793 boost::replace_all(result, "(", "\\(");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	794 boost::replace_all(result, ")", "\\)");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	795 boost::replace_all(result, "[", "\\[");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	796 boost::replace_all(result, "]", "\\]");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	797 boost::replace_all(result, "+", "\\+");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	798 boost::replace_all(result, "/", "\\/");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	799 boost::replace_all(result, "{", "\\{");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	800 boost::replace_all(result, "}", "\\}");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	801
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	802 // Convert wildcards '*' and '?' to their regex equivalents
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	803 boost::replace_all(result, "?", ".");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	804 boost::replace_all(result, "", ".");
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	805
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	806 return result;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	807 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	808
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	809
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	810 void Toolbox::TokenizeString(std::vector<std::string>& result,
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	811 const std::string& value,
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	812 char separator)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	813 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	814 result.clear();
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	815
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	816 std::string currentItem;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	817
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	818 for (size_t i = 0; i < value.size(); i++)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	819 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	820 if (value[i] == separator)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	821 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	822 result.push_back(currentItem);
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	823 currentItem.clear();
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	824 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	825 else
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	826 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	827 currentItem.push_back(value[i]);
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	828 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	829 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	830
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	831 result.push_back(currentItem);
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 577 diff changeset	832 }
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	833
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 707 diff changeset	834
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2129 diff changeset	835 #if ORTHANC_ENABLE_PUGIXML == 1
1045 0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	836 class ChunkedBufferWriter : public pugi::xml_writer
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	837 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	838 private:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	839 ChunkedBuffer buffer_;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	840
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	841 public:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	842 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	843 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	844 if (size > 0)
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	845 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	846 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	847 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	848 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	849
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	850 void Flatten(std::string& s)
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	851 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	852 buffer_.Flatten(s);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	853 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	854 };
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	855
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	856
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	857 static void JsonToXmlInternal(pugi::xml_node& target,
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	858 const Json::Value& source,
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	859 const std::string& arrayElement)
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	860 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	861 // 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	862
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	863 switch (source.type())
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	864 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	865 case Json::nullValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	866 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	867 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	868 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	869 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	870
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	871 case Json::intValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	872 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	873 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	874 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	875 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	876 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	877
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	878 case Json::uintValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	879 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	880 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	881 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	882 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	883 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	884
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	885 case Json::realValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	886 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	887 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	888 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	889 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	890 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	891
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	892 case Json::stringValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	893 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	894 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	895 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	896 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	897
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	898 case Json::booleanValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	899 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	900 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	901 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	902 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	903
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	904 case Json::arrayValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	905 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	906 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	907 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	908 pugi::xml_node node = target.append_child();
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	909 node.set_name(arrayElement.c_str());
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	910 JsonToXmlInternal(node, source[i], arrayElement);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	911 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	912 break;
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
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	915 case Json::objectValue:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	916 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	917 Json::Value::Members members = source.getMemberNames();
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 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	920 {
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	921 pugi::xml_node node = target.append_child();
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	922 node.set_name(members[i].c_str());
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	923 JsonToXmlInternal(node, source[members[i]], arrayElement);
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 break;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	927 }
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	928
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	929 default:
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	930 throw OrthancException(ErrorCode_NotImplemented);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	931 }
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
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 void Toolbox::JsonToXml(std::string& target,
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	936 const Json::Value& source,
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	937 const std::string& rootElement,
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	938 const std::string& arrayElement)
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 pugi::xml_document doc;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	941
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	942 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	943 JsonToXmlInternal(n, source, arrayElement);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	944
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	945 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	946 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	947 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	948
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	949 ChunkedBufferWriter writer;
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	950 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	951 writer.Flatten(target);
0bfeeb6d340f json to xml conversion with pugixml Sebastien Jodogne <s.jodogne@gmail.com> parents: 971 diff changeset	952 }
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 #endif
1050 64f1842aae2e Toolbox::ExecuteSystemCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 1045 diff changeset	955
64f1842aae2e Toolbox::ExecuteSystemCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 1045 diff changeset	956
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	957
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	958 bool Toolbox::IsInteger(const std::string& str)
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	959 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	960 std::string s = StripSpaces(str);
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	961
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	962 if (s.size() == 0)
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	963 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	964 return false;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	965 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	966
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	967 size_t pos = 0;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	968 if (s[0] == '-')
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	969 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	970 if (s.size() == 1)
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	971 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	972 return false;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	973 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	974
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	975 pos = 1;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	976 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	977
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	978 while (pos < s.size())
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	979 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	980 if (!isdigit(s[pos]))
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	981 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	982 return false;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	983 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	984
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	985 pos++;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	986 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	987
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	988 return true;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1101 diff changeset	989 }
1424 fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	990
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	991
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	992 void Toolbox::CopyJsonWithoutComments(Json::Value& target,
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	993 const Json::Value& source)
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	994 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	995 switch (source.type())
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	996 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	997 case Json::nullValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	998 target = Json::nullValue;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	999 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1000
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1001 case Json::intValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1002 target = source.asInt64();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1003 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1004
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1005 case Json::uintValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1006 target = source.asUInt64();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1007 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1008
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1009 case Json::realValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1010 target = source.asDouble();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1011 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1012
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1013 case Json::stringValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1014 target = source.asString();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1015 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1016
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1017 case Json::booleanValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1018 target = source.asBool();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1019 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1020
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1021 case Json::arrayValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1022 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1023 target = Json::arrayValue;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1024 for (Json::Value::ArrayIndex i = 0; i < source.size(); i++)
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1025 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1026 Json::Value& item = target.append(Json::nullValue);
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1027 CopyJsonWithoutComments(item, source[i]);
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1028 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1029
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1030 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1031 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1032
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1033 case Json::objectValue:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1034 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1035 target = Json::objectValue;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1036 Json::Value::Members members = source.getMemberNames();
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1037 for (Json::Value::ArrayIndex i = 0; i < members.size(); i++)
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1038 {
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1039 const std::string item = members[i];
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1040 CopyJsonWithoutComments(target[item], source[item]);
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1041 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1042
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1043 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1044 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1045
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1046 default:
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1047 break;
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1048 }
fe384a9d3b51 OrthancPluginGetConfiguration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1397 diff changeset	1049 }
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1050
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1051
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1052 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	1053 const std::string& prefix)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1054 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1055 if (str.size() < prefix.size())
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1056 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1057 return false;
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1058 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1059 else
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1060 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1061 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	1062 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	1063 }
2043 35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1064
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1065
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1066 static bool IsUnreservedCharacter(char c)
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1067 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1068 // This function checks whether "c" is an unserved character
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1069 // wrt. an URI percent-encoding
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1070 // 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	1071
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1072 return ((c >= 'A' && c <= 'Z') \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1073 (c >= 'a' && c <= 'z') \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1074 (c >= '0' && c <= '9') \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1075 c == '-' \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1076 c == '_' \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1077 c == '.' \|\|
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1078 c == '~');
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1079 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1080
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1081 void Toolbox::UriEncode(std::string& target,
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1082 const std::string& source)
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1083 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1084 // Estimate the length of the percent-encoded URI
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1085 size_t length = 0;
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1086
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1087 for (size_t i = 0; i < source.size(); i++)
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1088 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1089 if (IsUnreservedCharacter(source[i]))
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1090 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1091 length += 1;
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1092 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1093 else
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1094 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1095 // This character must be percent-encoded
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1096 length += 3;
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1097 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1098 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1099
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1100 target.clear();
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1101 target.reserve(length);
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1102
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1103 for (size_t i = 0; i < source.size(); i++)
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1104 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1105 if (IsUnreservedCharacter(source[i]))
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1106 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1107 target.push_back(source[i]);
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1108 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1109 else
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1110 {
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1111 // This character must be percent-encoded
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1112 uint8_t byte = static_cast<uint8_t>(source[i]);
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1113 uint8_t a = byte >> 4;
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1114 uint8_t b = byte & 0x0f;
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1115
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1116 target.push_back('%');
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1117 target.push_back(a < 10 ? a + '0' : a - 10 + 'A');
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1118 target.push_back(b < 10 ? b + '0' : b - 10 + 'A');
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1119 }
35ccba7adae9 Toolbox::UriEncode Sebastien Jodogne <s.jodogne@gmail.com> parents: 2017 diff changeset	1120 }
2071 27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1121 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1122
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1123
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1124 static bool HasField(const Json::Value& json,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1125 const std::string& key,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1126 Json::ValueType expectedType)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1127 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1128 if (json.type() != Json::objectValue \|\|
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1129 !json.isMember(key))
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1130 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1131 return false;
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1132 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1133 else if (json[key].type() == expectedType)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1134 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1135 return true;
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1136 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1137 else
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1138 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1139 throw OrthancException(ErrorCode_BadParameterType);
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1140 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1141 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1142
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1143
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1144 std::string Toolbox::GetJsonStringField(const Json::Value& json,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1145 const std::string& key,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1146 const std::string& defaultValue)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1147 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1148 if (HasField(json, key, Json::stringValue))
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1149 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1150 return json[key].asString();
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1151 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1152 else
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1153 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1154 return defaultValue;
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1155 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1156 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1157
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1158
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1159 bool Toolbox::GetJsonBooleanField(const ::Json::Value& json,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1160 const std::string& key,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1161 bool defaultValue)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1162 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1163 if (HasField(json, key, Json::booleanValue))
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1164 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1165 return json[key].asBool();
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1166 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1167 else
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1168 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1169 return defaultValue;
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1170 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1171 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1172
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1173
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1174 int Toolbox::GetJsonIntegerField(const ::Json::Value& json,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1175 const std::string& key,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1176 int defaultValue)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1177 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1178 if (HasField(json, key, Json::intValue))
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1179 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1180 return json[key].asInt();
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1181 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1182 else
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1183 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1184 return defaultValue;
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1185 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1186 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1187
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1188
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1189 unsigned int Toolbox::GetJsonUnsignedIntegerField(const ::Json::Value& json,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1190 const std::string& key,
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1191 unsigned int defaultValue)
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 int v = GetJsonIntegerField(json, key, defaultValue);
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1194
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1195 if (v < 0)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1196 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1197 throw OrthancException(ErrorCode_ParameterOutOfRange);
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1198 }
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2065 diff changeset	1199 else
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 static_cast<unsigned int>(v);
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 }
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2137 diff changeset	1204
aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2137 diff changeset	1205
2141 a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1206 bool Toolbox::IsUuid(const std::string& str)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1207 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1208 if (str.size() != 36)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1209 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1210 return false;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1211 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1212
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1213 for (size_t i = 0; i < str.length(); i++)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1214 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1215 if (i == 8 \|\| i == 13 \|\| i == 18 \|\| i == 23)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1216 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1217 if (str[i] != '-')
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1218 return false;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1219 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1220 else
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1221 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1222 if (!isalnum(str[i]))
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1223 return false;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1224 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1225 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1226
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1227 return true;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1228 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1229
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1230
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1231 bool Toolbox::StartsWithUuid(const std::string& str)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1232 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1233 if (str.size() < 36)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1234 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1235 return false;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1236 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1237
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1238 if (str.size() == 36)
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1239 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1240 return IsUuid(str);
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1241 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1242
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1243 assert(str.size() > 36);
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1244 if (!isspace(str[36]))
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1245 {
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1246 return false;
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1247 }
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1248
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1249 return IsUuid(str.substr(0, 36));
a260a8ad83f1 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	1250 }
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1251
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1252
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2351 diff changeset	1253 #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	1254 static std::auto_ptr<std::locale> globalLocale_;
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1255
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1256 static bool SetGlobalLocale(const char* locale)
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1257 {
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1258 globalLocale_.reset(NULL);
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1259
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1260 try
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1261 {
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1262 if (locale == NULL)
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1263 {
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1264 LOG(WARNING) << "Falling back to system-wide default locale";
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1265 globalLocale_.reset(new std::locale());
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1266 }
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1267 else
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1268 {
2351 56504f89d4ac log info Sebastien Jodogne <s.jodogne@gmail.com> parents: 2334 diff changeset	1269 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	1270 globalLocale_.reset(new std::locale(locale));
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1271 }
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1272 }
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1273 catch (std::runtime_error&)
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1274 {
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1275 }
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1276
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1277 return (globalLocale_.get() != NULL);
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1278 }
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1279
2330 9c7a80c87ae9 "Locale" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	1280 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	1281 {
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1282 // Make Orthanc use English, United States locale
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1283 // Linux: use "en_US.UTF-8"
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1284 // Windows: use ""
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1285 // Wine: use NULL
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1286
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1287 #if defined(__MINGW32__)
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1288 // Visibly, there is no support of locales in MinGW yet
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1289 // 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	1290 static const char* DEFAULT_LOCALE = NULL;
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1291 #elif defined(_WIN32)
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1292 // For Windows: use default locale (using "en_US" does not work)
2333 6677cdbfbafd fix default locale for Windows jodogne parents: 2330 diff changeset	1293 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	1294 #else
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1295 // For Linux & cie
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1296 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	1297 #endif
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1298
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1299 bool ok;
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1300
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1301 if (locale == NULL)
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1302 {
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1303 ok = SetGlobalLocale(DEFAULT_LOCALE);
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1304
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1305 #if defined(__MINGW32__)
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1306 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	1307 << "strings with accents will not work outside of Wine";
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1308 #endif
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1309 }
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1310 else
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1311 {
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1312 ok = SetGlobalLocale(locale);
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1313 }
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1314
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1315 if (!ok &&
dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1316 !SetGlobalLocale(NULL))
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1317 {
2330 9c7a80c87ae9 "Locale" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	1318 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	1319 throw OrthancException(ErrorCode_InternalError);
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1320 }
2334 dd26536454a0 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 2333 diff changeset	1321
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1322 }
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1323
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1324
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1325 void Toolbox::FinalizeGlobalLocale()
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1326 {
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1327 globalLocale_.reset();
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1328 }
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1329
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1330
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1331 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	1332 {
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1333 if (globalLocale_.get() == NULL)
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1334 {
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1335 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	1336 throw OrthancException(ErrorCode_BadSequenceOfCalls);
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1337 }
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1338
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1339 /**
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1340 * 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	1341 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1342 * (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	1343 * 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	1344 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1345 * 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	1346 * 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	1347 * 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	1348 * 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	1349 * 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	1350 * would use:
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 * boost::locale::generator gen;
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1353 * 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	1354 * 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	1355 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1356 * (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	1357 * 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	1358 * global variable "globalLocale_".
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1359 *
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1360 * (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	1361 * 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	1362 * 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	1363 * "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	1364 **/
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1365
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1366 std::wstring w = boost::locale::conv::utf_to_utf<wchar_t>(source);
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1367 w = boost::algorithm::to_upper_copy<std::wstring>(w, *globalLocale_);
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1368 return boost::locale::conv::utf_to_utf<char>(w);
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1369 }
2373 68380777f9a6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2367 diff changeset	1370 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1371 }

Mercurial > hg > orthanc

annotate Core/Toolbox.cpp @ 2387:a60a79929007