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

[search] '-' is not a delimiter in categories. We use it as a separator.

Browse source
This commit is contained in:
vng 2012-02-04 17:21:56 +03:00 • committed by Alex Zolotarev
parent 2ff43f26b7
commit f541b83d13
3 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
indexer/search_delimiters.cpp
View file

@ -60,4 +60,14 @@ bool Delimiters::operator()(strings::UniChar c) const
return false;
}
bool CategoryDelimiters::operator()(strings::UniChar c) const
{
// In categories.txt we use '-' as a delimeter.
// Do not skip this.
if (c == '-')
return false;
return Delimiters::operator()(c);
}
}

16
indexer/search_delimiters.hpp
View file

@ -4,11 +4,15 @@
namespace search
{
class Delimiters
{
public:
bool operator()(strings::UniChar c) const;
};
class Delimiters
{
public:
bool operator()(strings::UniChar c) const;
};
class CategoryDelimiters : public Delimiters
{
public:
bool operator()(strings::UniChar c) const;
};
}

2
search/search_engine.cpp
View file

@ -80,7 +80,7 @@ void Engine::InitializeCategoriesAndSuggestStrings(CategoriesHolder const & cate
score = name.m_prefixLengthToSuggest;
vector<strings::UniString> tokens;
SplitUniString(uniName, MakeBackInsertFunctor(tokens), Delimiters());
SplitUniString(uniName, MakeBackInsertFunctor(tokens), CategoryDelimiters());
for (size_t j = 0; j < tokens.size(); ++j)
for (size_t k = 0; k < it->m_types.size(); ++k)
m_pData->m_categories.insert(make_pair(tokens[j], it->m_types[k]));