osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-11-27 10:43:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

only initialise tokenizer for refresh functions where needed

Browse Source 
Fixes #2347.
This commit is contained in:
Sarah Hoffmann 2021-05-25 19:16:22 +02:00
parent 29b02f9e56
commit a0e85cc17c
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nominatim/cli.py
View File

@ -263,7 +263,7 @@ def get_set_parser(**kwargs):
parser.add_subcommand('add-data', UpdateAddData) parser.add_subcommand('add-data', UpdateAddData)
parser.add_subcommand('index', clicmd.UpdateIndex) parser.add_subcommand('index', clicmd.UpdateIndex)
parser.add_subcommand('refresh', clicmd.UpdateRefresh) parser.add_subcommand('refresh', clicmd.UpdateRefresh())
parser.add_subcommand('admin', clicmd.AdminFuncs) parser.add_subcommand('admin', clicmd.AdminFuncs)

21
nominatim/clicmd/refresh.py
View File

@ -19,6 +19,8 @@ class UpdateRefresh:
These functions must not be run in parallel with other update commands. These functions must not be run in parallel with other update commands.
""" """
def __init__(self):
self.tokenizer = None
@staticmethod @staticmethod
def add_args(parser): def add_args(parser):
@ -43,16 +45,15 @@ class UpdateRefresh:
group.add_argument('--enable-debug-statements', action='store_true', group.add_argument('--enable-debug-statements', action='store_true',
help='Enable debug warning statements in functions') help='Enable debug warning statements in functions')
@staticmethod
def run(args): def run(self, args):
from ..tools import refresh, postcodes from ..tools import refresh, postcodes
from ..tokenizer import factory as tokenizer_factory
from ..indexer.indexer import Indexer from ..indexer.indexer import Indexer
tokenizer = tokenizer_factory.get_tokenizer_for_db(args.config)
if args.postcodes: if args.postcodes:
LOG.warning("Update postcodes centroid") LOG.warning("Update postcodes centroid")
tokenizer = self._get_tokenizer(args.config)
postcodes.update_postcodes(args.config.get_libpq_dsn(), postcodes.update_postcodes(args.config.get_libpq_dsn(),
args.project_dir, tokenizer) args.project_dir, tokenizer)
indexer = Indexer(args.config.get_libpq_dsn(), tokenizer, indexer = Indexer(args.config.get_libpq_dsn(), tokenizer,
@ -74,7 +75,7 @@ class UpdateRefresh:
with connect(args.config.get_libpq_dsn()) as conn: with connect(args.config.get_libpq_dsn()) as conn:
refresh.create_functions(conn, args.config, refresh.create_functions(conn, args.config,
args.diffs, args.enable_debug_statements) args.diffs, args.enable_debug_statements)
tokenizer.update_sql_functions(args.config) self._get_tokenizer(args.config).update_sql_functions(args.config)
if args.wiki_data: if args.wiki_data:
data_path = Path(args.config.WIKIPEDIA_DATA_PATH data_path = Path(args.config.WIKIPEDIA_DATA_PATH
@ -96,4 +97,14 @@ class UpdateRefresh:
LOG.warning('Setting up website directory at %s', webdir) LOG.warning('Setting up website directory at %s', webdir)
with connect(args.config.get_libpq_dsn()) as conn: with connect(args.config.get_libpq_dsn()) as conn:
refresh.setup_website(webdir, args.config, conn) refresh.setup_website(webdir, args.config, conn)
return 0 return 0
def _get_tokenizer(self, config):
if self.tokenizer is None:
from ..tokenizer import factory as tokenizer_factory
self.tokenizer = tokenizer_factory.get_tokenizer_for_db(config)
return self.tokenizer