Mercurial > hg > orthanc
changeset 6683:765f1ac2baf1
added Toolbox::ToLowerCaseWithAccents()
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 10 Apr 2026 17:03:17 +0200 |
| parents | 299a925d3006 |
| children | 3289021b83db |
| files | OrthancFramework/Sources/Toolbox.cpp OrthancFramework/Sources/Toolbox.h OrthancFramework/UnitTestsSources/FrameworkTests.cpp |
| diffstat | 3 files changed, 33 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancFramework/Sources/Toolbox.cpp Wed Apr 08 11:26:46 2026 +0200 +++ b/OrthancFramework/Sources/Toolbox.cpp Fri Apr 10 17:03:17 2026 +0200 @@ -2065,8 +2065,7 @@ #endif } - - std::string Toolbox::ToUpperCaseWithAccents(const std::string& source) + static std::string ChangeCaseWithAccents(const std::string& source, bool toLowerCase) { bool error = (globalLocale_.get() == NULL); @@ -2115,9 +2114,29 @@ **/ std::wstring w = boost::locale::conv::utf_to_utf<wchar_t>(source, boost::locale::conv::skip); - w = boost::algorithm::to_upper_copy<std::wstring>(w, *globalLocale_); + if (toLowerCase) + { + w = boost::algorithm::to_lower_copy<std::wstring>(w, *globalLocale_); + } + else + { + w = boost::algorithm::to_upper_copy<std::wstring>(w, *globalLocale_); + } return boost::locale::conv::utf_to_utf<char>(w, boost::locale::conv::skip); } + + + std::string Toolbox::ToUpperCaseWithAccents(const std::string& source) + { + return ChangeCaseWithAccents(source, false); + } + + + std::string Toolbox::ToLowerCaseWithAccents(const std::string& source) + { + return ChangeCaseWithAccents(source, true); + } + #endif
--- a/OrthancFramework/Sources/Toolbox.h Wed Apr 08 11:26:46 2026 +0200 +++ b/OrthancFramework/Sources/Toolbox.h Fri Apr 10 17:03:17 2026 +0200 @@ -355,6 +355,8 @@ static void FinalizeGlobalLocale(); static std::string ToUpperCaseWithAccents(const std::string& source); + + static std::string ToLowerCaseWithAccents(const std::string& source); #endif static void InitializeOpenSsl();
--- a/OrthancFramework/UnitTestsSources/FrameworkTests.cpp Wed Apr 08 11:26:46 2026 +0200 +++ b/OrthancFramework/UnitTestsSources/FrameworkTests.cpp Fri Apr 10 17:03:17 2026 +0200 @@ -489,6 +489,15 @@ s = "CoU"; Toolbox::ToLowerCase(s); ASSERT_EQ("cou", s); + +#if ORTHANC_ENABLE_LOCALE == 1 + s = "éсйігдйомевінрие"; + s = Toolbox::ToUpperCaseWithAccents(s); + ASSERT_EQ("ÉСЙІГДЙОМЕВІНРИЕ", s); + + s = Toolbox::ToLowerCaseWithAccents(s); + ASSERT_EQ("éсйігдйомевінрие", s); +#endif }
