orthanc: Core/Toolbox.cpp annotate

annotate Core/Toolbox.cpp @ 3757:a593c20bf79b Orthanc-1.5.4

closing branch Orthanc-1.5.4

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 16 Mar 2020 12:16:52 +0100
parents	810772486249
children	cf8cbeb35f33

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

Mercurial > hg > orthanc

annotate Core/Toolbox.cpp @ 3757:a593c20bf79b Orthanc-1.5.4