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

Minor code style fixes.

Browse source
This commit is contained in:
vng 2011-07-01 22:15:19 +03:00 • committed by Alex Zolotarev
parent 233683d167
commit 09bb6f9411
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
words/sloynik_engine.cpp
View file

@ -13,11 +13,13 @@ sl::SloynikEngine::SloynikEngine(string const & dictionaryPath,
FileReader * pDicFileReader = new FileReader(dictionaryPath);
// m_pDictionary takes ownership of pDicFileReader.
m_pDictionary.reset(new sl::SlofDictionary(pDicFileReader));
vector<uint64_t> stamp;
stamp.push_back(strFn.m_PrimaryCompareId);
stamp.push_back(strFn.m_SecondaryCompareId);
stamp.push_back(m_pDictionary->KeyCount());
stamp.push_back(pDicFileReader->Size());
string const stampPath = indexPath + ".stamp";
bool needIndexBuild = false;
try
@ -33,11 +35,13 @@ sl::SloynikEngine::SloynikEngine(string const & dictionaryPath,
needIndexBuild = true;
}
}
catch (RootException &)
catch (RootException const &)
{
needIndexBuild = true;
}
LOG(LINFO, ("Started sloynik engine. Words in the dictionary:", m_pDictionary->KeyCount()));
// Uncomment to always rebuild the index: needIndexBuild = true;
if (needIndexBuild)
{

5
words/sloynik_index.cpp
View file

@ -1,12 +1,15 @@
#include "sloynik_index.hpp"
#include "dictionary.hpp"
#include "../coding/file_writer.hpp"
#include "../coding/timsort/timsort.hpp"
#include "../base/assert.hpp"
#include "../base/logging.hpp"
#include "../base/cache.hpp"
#include "../std/bind.hpp"
#include "../coding/timsort/timsort.hpp"
#define FILE_SORTER_LOG_BATCH_SIZE 11