orthanc: Core/Toolbox.cpp annotate

annotate Core/Toolbox.cpp @ 2686:fb2d89acc2d1 jobs

fix

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 28 Jun 2018 12:15:21 +0200
parents	e0476e8cb73d
children	49b152059472

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

Mercurial > hg > orthanc

annotate Core/Toolbox.cpp @ 2686:fb2d89acc2d1 jobs