From 0aa1e114cea0a9c67ed1af2638a784a44a3be65f Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Wed, 8 Jul 2015 20:07:24 +0300 Subject: [PATCH] Review fix --- generator/generator_tool/generator_tool.cpp | 12 ++++++++---- generator/polygonizer.hpp | 1 - 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp index ea3faa17ae..6c91972131 100644 --- a/generator/generator_tool/generator_tool.cpp +++ b/generator/generator_tool/generator_tool.cpp @@ -97,12 +97,16 @@ int main(int argc, char ** argv) } feature::GenerateInfo genInfo; - genInfo.m_intermediateDir = FLAGS_intermediate_data_path.empty() ? path : my::AddSlashIfNeeded(FLAGS_intermediate_data_path); + genInfo.m_intermediateDir = FLAGS_intermediate_data_path.empty() + ? path + : my::AddSlashIfNeeded(FLAGS_intermediate_data_path); genInfo.m_targetDir = genInfo.m_tmpDir = path; - if (!FLAGS_intermediate_data_path.empty()) { - genInfo.m_tmpDir = genInfo.m_intermediateDir + "tmp/"; - pl.MkDir(genInfo.m_tmpDir); + if (!FLAGS_intermediate_data_path.empty()) + { + string tmpPath = my::JoinFoldersToPath({genInfo.m_intermediateDir, "tmp"}, string()); + if (pl.MkDir(genInfo.m_tmpDir) == Platform::ERR_OK) + genInfo.m_tmpDir = tmpPath; } // load classificator only if necessary diff --git a/generator/polygonizer.hpp b/generator/polygonizer.hpp index d9ed46c551..5309788b07 100644 --- a/generator/polygonizer.hpp +++ b/generator/polygonizer.hpp @@ -153,7 +153,6 @@ namespace feature if (country->m_index == -1) { m_Names.push_back(country->m_name); - LOG(LINFO, ("Output country file:", m_prefix + country->m_name + m_suffix)); m_Buckets.push_back(new FeatureOutT(m_prefix + country->m_name + m_suffix)); country->m_index = m_Buckets.size()-1; }