pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[search] Search suggestions for "en" language if no results for input language.

Browse source
This commit is contained in:
vng 2012-03-10 20:22:59 +03:00 • committed by Alex Zolotarev
parent 063f8e11e0
commit c797e254b2
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
search/search_query.cpp
View file

@ -803,20 +803,31 @@ void Query::SuggestStrings(Results & res)
}
}
void Query::MatchForSuggestions(strings::UniString const & token, Results & res)
bool Query::MatchForSuggestionsImpl(strings::UniString const & token, int8_t lang, Results & res)
{
bool ret = false;
StringsToSuggestVectorT::const_iterator it = m_pStringsToSuggest->begin();
for (; it != m_pStringsToSuggest->end(); ++it)
{
strings::UniString const & s = it->m_name;
if ((it->m_prefixLength <= token.size()) &&
(token != s) && // do not push suggestion if it already equals to token
(it->m_lang == m_inputLang) && // push suggestions only for input language
(token != s) && // do not push suggestion if it already equals to token
(it->m_lang == lang) && // push suggestions only for needed language
StartsWith(s.begin(), s.end(), token.begin(), token.end()))
{
res.AddResult(MakeResult(impl::PreResult2(strings::ToUtf8(s), it->m_prefixLength)));
ret = true;
}
}
return ret;
}
void Query::MatchForSuggestions(strings::UniString const & token, Results & res)
{
if (!MatchForSuggestionsImpl(token, m_inputLang, res))
MatchForSuggestionsImpl(token, StringUtf8Multilang::GetLangIndex("en"), res);
}
m2::RectD const & Query::GetViewport() const

1
search/search_query.hpp
View file

@ -126,6 +126,7 @@ private:
OffsetsVectorT const * offsets);
void SuggestStrings(Results & res);
bool MatchForSuggestionsImpl(strings::UniString const & token, int8_t lang, Results & res);
void MatchForSuggestions(strings::UniString const & token, Results & res);
void GetBestMatchName(FeatureType const & f, uint32_t & penalty, string & name);