Merge pull request #2087 from lonvia/only-one-link-per-node

[nominatim.git] / nominatim / nominatim.py

diff --git a/nominatim/nominatim.py b/nominatim/nominatim.py
index 0819bb11fa1891e2054f8ce3a349d27cad3a9c8b..b20673d2a0fbef3c71ff2f2d93af811f8df2062d 100755 (executable)
--- a/nominatim/nominatim.py
+++ b/nominatim/nominatim.py
@@ -135,19 +135,19 @@ class Indexer(object):
         for rank in range(max(1, self.minrank), self.maxrank):
             self.index(RankRunner(rank))
 
         for rank in range(max(1, self.minrank), self.maxrank):
             self.index(RankRunner(rank))
 

-

         if self.maxrank == 30:
             self.index(RankRunner(0))
             self.index(InterpolationRunner(), 20)
         if self.maxrank == 30:
             self.index(RankRunner(0))
             self.index(InterpolationRunner(), 20)

-
-        self.index(RankRunner(self.maxrank), 20)
+            self.index(RankRunner(self.maxrank), 20)
+        else:
+            self.index(RankRunner(self.maxrank))

 
     def index(self, obj, batch=1):
         """ Index a single rank or table. `obj` describes the SQL to use
             for indexing. `batch` describes the number of objects that
             should be processed with a single SQL statement
         """
 
     def index(self, obj, batch=1):
         """ Index a single rank or table. `obj` describes the SQL to use
             for indexing. `batch` describes the number of objects that
             should be processed with a single SQL statement
         """

-        log.warning("Starting {}".format(obj.name()))
+        log.warning("Starting %s (using batch size %s)", obj.name(), batch)

 
         cur = self.conn.cursor()
         cur.execute(obj.sql_count_objects())
 
         cur = self.conn.cursor()
         cur.execute(obj.sql_count_objects())