hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-13 14:24:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

move setup function to python

Browse Source 
There are still back-calls to PHP for some of the sub-steps.
These needs some larger refactoring to be moved to Python.
This commit is contained in:
Sarah Hoffmann
2021-02-26 15:02:39 +01:00
parent 3ee8d9fa75
commit 15b5906790
10 changed files with 342 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
nominatim/indexer/indexer.py
View File

@@ -119,6 +119,13 @@ class PostcodeRunner:
WHERE place_id IN ({})
""".format(','.join((str(i) for i in ids)))
def _analyse_db_if(conn, condition):
if condition:
with conn.cursor() as cur:
cur.execute('ANALYSE')
class Indexer:
""" Main indexing routine.
"""
@@ -142,7 +149,7 @@ class Indexer:
for thread in self.threads:
thread.close()
threads = []
self.threads = []
def index_full(self, analyse=True):
@@ -155,26 +162,22 @@ class Indexer:
try:
self.index_by_rank(0, 4)
self._analyse_db_if(conn, analyse)
_analyse_db_if(conn, analyse)
self.index_boundaries(0, 30)
self._analyse_db_if(conn, analyse)
_analyse_db_if(conn, analyse)
self.index_by_rank(5, 25)
self._analyse_db_if(conn, analyse)
_analyse_db_if(conn, analyse)
self.index_by_rank(26, 30)
self._analyse_db_if(conn, analyse)
_analyse_db_if(conn, analyse)
self.index_postcodes()
self._analyse_db_if(conn, analyse)
_analyse_db_if(conn, analyse)
finally:
conn.close()
def _analyse_db_if(self, conn, condition):
if condition:
with conn.cursor() as cur:
cur.execute('ANALYSE')
def index_boundaries(self, minrank, maxrank):
""" Index only administrative boundaries within the given rank range.