From be3be903f1d3a02b72f0086fd96139aa78ea4f21 Mon Sep 17 00:00:00 2001 From: Yuri Gorshenin Date: Mon, 25 Apr 2016 12:15:04 +0300 Subject: [PATCH] [search] Removed ugly postcodes prefix. --- generator/search_index_builder.cpp | 2 +- indexer/search_string_utils.cpp | 6 ------ indexer/search_string_utils.hpp | 2 -- .../search_query_v2_test.cpp | 2 +- search/v2/geocoder.cpp | 15 ++------------- 5 files changed, 4 insertions(+), 23 deletions(-) diff --git a/generator/search_index_builder.cpp b/generator/search_index_builder.cpp index e4e32ed20b..c8324f3cd5 100644 --- a/generator/search_index_builder.cpp +++ b/generator/search_index_builder.cpp @@ -289,7 +289,7 @@ public: SplitUniString(NormalizeAndSimplifyString(postcode), MakeBackInsertFunctor(tokens), Delimiters()); for (auto const & token : tokens) - inserter.AddToken(kPostcodesLang, PostcodeToString(token)); + inserter.AddToken(kPostcodesLang, token); } // Skip types for features without names. diff --git a/indexer/search_string_utils.cpp b/indexer/search_string_utils.cpp index 0283191869..24aaaa3764 100644 --- a/indexer/search_string_utils.cpp +++ b/indexer/search_string_utils.cpp @@ -90,12 +90,6 @@ UniString FeatureTypeToString(uint32_t type) return UniString(s.begin(), s.end()); } -UniString PostcodeToString(strings::UniString const & postcode) -{ - static UniString const kPrefix = MakeUniString("!postcode:"); - return kPrefix + postcode; -} - namespace { char const * kStreetTokensSeparator = "\t -,."; diff --git a/indexer/search_string_utils.hpp b/indexer/search_string_utils.hpp index b319e67c2c..6734d33625 100644 --- a/indexer/search_string_utils.hpp +++ b/indexer/search_string_utils.hpp @@ -25,8 +25,6 @@ void NormalizeAndTokenizeString(string const & s, TCont & tokens, TDelims const strings::UniString FeatureTypeToString(uint32_t type); -strings::UniString PostcodeToString(strings::UniString const & postcode); - template bool TokenizeStringAndCheckIfLastTokenIsPrefix(strings::UniString const & s, ContainerT & tokens, diff --git a/search/search_integration_tests/search_query_v2_test.cpp b/search/search_integration_tests/search_query_v2_test.cpp index 615adb0981..6ffe1db56e 100644 --- a/search/search_integration_tests/search_query_v2_test.cpp +++ b/search/search_integration_tests/search_query_v2_test.cpp @@ -407,7 +407,7 @@ UNIT_CLASS_TEST(SearchQueryV2Test, TestPostcodes) SearchQueryParams params; params.m_tokens.emplace_back(); - params.m_tokens.back().push_back(PostcodeToString(strings::MakeUniString("141702"))); + params.m_tokens.back().push_back(strings::MakeUniString("141702")); auto * value = handle.GetValue(); auto features = v2::RetrievePostcodeFeatures(countryId, *value, cancellable, TokenSlice(params, 0, params.m_tokens.size())); diff --git a/search/v2/geocoder.cpp b/search/v2/geocoder.cpp index 7daca4e070..2e7568bc89 100644 --- a/search/v2/geocoder.cpp +++ b/search/v2/geocoder.cpp @@ -1031,19 +1031,8 @@ void Geocoder::WithPostcodes(TFn && fn) if (startToken == endToken) continue; - PrepareRetrievalParams(startToken, endToken); - for (auto & tokens : m_retrievalParams.m_tokens) - { - tokens.resize(1); - tokens[0] = PostcodeToString(tokens[0]); - } - if (!m_retrievalParams.m_prefixTokens.empty()) - { - m_retrievalParams.m_prefixTokens.resize(1); - m_retrievalParams.m_prefixTokens[0] = PostcodeToString(m_retrievalParams.m_prefixTokens[0]); - } - auto postcodes = RetrievePostcodeFeatures( - *m_context, TokenSlice(m_retrievalParams, 0, endToken - startToken)); + auto postcodes = + RetrievePostcodeFeatures(*m_context, TokenSlice(m_params, startToken, endToken)); if (!coding::CompressedBitVector::IsEmpty(postcodes)) { ScopedMarkTokens mark(m_usedTokens, startToken, endToken);