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

[search] Avoid copy-paste.

Browse source
This commit is contained in:
vng 2011-12-22 05:43:01 +03:00 • committed by Alex Zolotarev
parent 5a479c8739
commit 1e7d5aa36c
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
search/search_query.cpp
View file

@ -504,15 +504,10 @@ void Query::SuggestStrings()
{
if (m_pStringsToSuggest)
{
typedef StringsToSuggestVectorT::const_iterator ItT;
if (m_tokens.size() == 0 && !m_prefix.empty())
{
// Match prefix.
for (ItT it = m_pStringsToSuggest->begin(); it != m_pStringsToSuggest->end(); ++it)
if (it->second <= m_prefix.size() &&
StartsWith(it->first.begin(), it->first.end(), m_prefix.begin(), m_prefix.end()))
AddResult(ValueT(new impl::IntermediateResult(strings::ToUtf8(it->first), it->second)));
MatchForSuggestions(m_prefix);
}
else if (m_tokens.size() == 1)
{
@ -523,15 +518,21 @@ void Query::SuggestStrings()
tokenAndPrefix.push_back(' ');
tokenAndPrefix.append(m_prefix.begin(), m_prefix.end());
}
for (ItT it = m_pStringsToSuggest->begin(); it != m_pStringsToSuggest->end(); ++it)
{
strings::UniString const & s = it->first;
if (it->second <= tokenAndPrefix.size() &&
StartsWith(s.begin(), s.end(), tokenAndPrefix.begin(), tokenAndPrefix.end()))
AddResult(ValueT(new impl::IntermediateResult(strings::ToUtf8(it->first), it->second)));
}
MatchForSuggestions(tokenAndPrefix);
}
}
}
void Query::MatchForSuggestions(strings::UniString const & token)
{
StringsToSuggestVectorT::const_iterator it = m_pStringsToSuggest->begin();
for (; it != m_pStringsToSuggest->end(); ++it)
{
strings::UniString const & s = it->first;
if (it->second <= token.size() && StartsWith(s.begin(), s.end(), token.begin(), token.end()))
AddResult(ValueT(new impl::IntermediateResult(strings::ToUtf8(s), it->second)));
}
}
} // namespace search

2
search/search_query.hpp
View file

@ -68,7 +68,9 @@ private:
vector<MwmInfo> const & mwmInfo,
unordered_set<int8_t> const & langs,
bool onlyInViewport);
void SuggestStrings();
void MatchForSuggestions(strings::UniString const & token);
void GetBestMatchName(FeatureType const & f, uint32_t & penalty, string & name);
string GetRegionName(FeatureType const & f, string const & fName);