Add basic Collator::find() method.

diff --git a/src/lib/collator.cc b/src/lib/collator.cc
index 7bab36fa6be1f8136ae6f041a97d4df17adb3e5c..ba504fb6e62ba83dbfc6c449852c599816849cd4 100644 (file)
--- a/src/lib/collator.cc
+++ b/src/lib/collator.cc
@@ -25,6 +25,7 @@
 #include <unicode/ucol.h>
 #include <unicode/uiter.h>
 #include <unicode/utypes.h>
+#include <unicode/usearch.h>
 #include <unicode/ustring.h>
 #include <boost/scoped_array.hpp>
 #include <cstring>
@@ -79,3 +80,23 @@ Collator::compare (string const& utf8_a, string const& utf8_b) const
        }
 }
 
+
+bool
+Collator::find(string pattern, string text) const
+{
+       if (_collator) {
+               auto utf16_pattern = utf8_to_utf16(pattern);
+               auto utf16_text = utf8_to_utf16(text);
+               UErrorCode status = U_ZERO_ERROR;
+               auto search = usearch_openFromCollator(utf16_pattern.data(), -1, utf16_text.data(), -1, _collator, nullptr, &status);
+               DCPOMATIC_ASSERT(search);
+               auto const index = usearch_first(search, &status);
+               usearch_close(search);
+               return index != -1;
+       } else {
+               transform(pattern.begin(), pattern.end(), pattern.begin(), ::tolower);
+               transform(text.begin(), text.end(), text.begin(), ::tolower);
+               return pattern.find(text) != string::npos;
+       }
+}
+

diff --git a/src/lib/collator.h b/src/lib/collator.h
index d422781248b063bc0d9f0a54e7d12d3a76fda9d1..1768c43c09595d3ef880b79b67549343a7ea5c28 100644 (file)
--- a/src/lib/collator.h
+++ b/src/lib/collator.h
@@ -39,6 +39,7 @@ public:
        Collator& operator=(Collator const&) = delete;
 
        int compare(std::string const& utf8_a, std::string const& utf8_b) const;
+       bool find(std::string pattern, std::string text) const;
 
 private:
        UCollator* _collator = nullptr;

diff --git a/test/collator_test.cc b/test/collator_test.cc
index fadc5f063c34210ade8acfa03107d361b97b7509..e88d71b06d27a0510b0f534f8ee77746270feefe 100644 (file)
--- a/test/collator_test.cc
+++ b/test/collator_test.cc
@@ -30,3 +30,14 @@ BOOST_AUTO_TEST_CASE(collator_compare_works_and_ignores_case)
        BOOST_CHECK_EQUAL(collator.compare("So often YOU won't even notice", "SO OFTEN you won't even NOTiCE"), 0);
        BOOST_CHECK_EQUAL(collator.compare("So often YOU won't even notice", "SO OFTEN you won't even see"), -1);
 }
+
+
+
+BOOST_AUTO_TEST_CASE(collator_search_works_and_ignores_case)
+{
+       Collator collator;
+
+       BOOST_CHECK(collator.find("outh", "With filthy mouths, and bad attitudes"));
+       BOOST_CHECK(collator.find("with", "With filthy mouths, and bad attitudes"));
+       BOOST_CHECK(!collator.find("ostrabagalous", "With filthy mouths, and bad attitudes"));
+}