From ffb06fde55e36c2845febb59a9501ee94f1db512 Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Wed, 17 Aug 2011 13:15:50 +0300
Subject: [PATCH] Fix search index generation for World.

---
 generator/generator_tool/generator_tool.cpp | 3 ++-
 indexer/index.hpp                           | 6 +-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp
index afdb9bcb7d..244e6fa93e 100644
--- a/generator/generator_tool/generator_tool.cpp
+++ b/generator/generator_tool/generator_tool.cpp
@@ -117,7 +117,8 @@ int main(int argc, char ** argv)
 
   // load classificator only if necessary
   if (FLAGS_generate_features || FLAGS_generate_geometry ||
-      FLAGS_generate_index || FLAGS_calc_statistics || FLAGS_dump_types)
+      FLAGS_generate_index || FLAGS_generate_search_index ||
+      FLAGS_calc_statistics || FLAGS_dump_types)
   {
     classificator::Read(pl.GetReader("drawing_rules.bin"),
                         pl.GetReader("classificator.txt"),
diff --git a/indexer/index.hpp b/indexer/index.hpp
index da58cca877..8bc3bad504 100644
--- a/indexer/index.hpp
+++ b/indexer/index.hpp
@@ -158,14 +158,10 @@ public:
 
     UpdateIndexes();
 
-    /// @todo Keep this until World.mwm has search index.
-    static bool isWorld = true;
-    //if (m_indexes.back()->IsWorldData())
-    if (isWorld)
+    if (m_indexes.back()->IsWorldData())
     {
       ASSERT ( !m_pWorldSearchInfo.get(), () );
       m_pWorldSearchInfo.reset(m_indexes.back()->GetSearchInfo());
-      isWorld = false;
     }
   }