X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/3206bf59df0213d24bd3e11df7dd2abaebf89911..cf98cff2a166eb35ed2c946e03f1610069bdd1d4:/nominatim/clicmd/refresh.py diff --git a/nominatim/clicmd/refresh.py b/nominatim/clicmd/refresh.py index e696e7b6..969998ad 100644 --- a/nominatim/clicmd/refresh.py +++ b/nominatim/clicmd/refresh.py @@ -19,6 +19,8 @@ class UpdateRefresh: These functions must not be run in parallel with other update commands. """ + def __init__(self): + self.tokenizer = None @staticmethod def add_args(parser): @@ -43,21 +45,24 @@ class UpdateRefresh: group.add_argument('--enable-debug-statements', action='store_true', help='Enable debug warning statements in functions') - @staticmethod - def run(args): + + def run(self, args): from ..tools import refresh, postcodes - from ..tokenizer import factory as tokenizer_factory from ..indexer.indexer import Indexer - tokenizer = tokenizer_factory.get_tokenizer_for_db(args.config) if args.postcodes: - LOG.warning("Update postcodes centroid") - postcodes.update_postcodes(args.config.get_libpq_dsn(), - args.project_dir, tokenizer) - indexer = Indexer(args.config.get_libpq_dsn(), tokenizer, - args.threads or 1) - indexer.index_postcodes() + if postcodes.can_compute(args.config.get_libpq_dsn()): + LOG.warning("Update postcodes centroid") + tokenizer = self._get_tokenizer(args.config) + postcodes.update_postcodes(args.config.get_libpq_dsn(), + args.project_dir, tokenizer) + indexer = Indexer(args.config.get_libpq_dsn(), tokenizer, + args.threads or 1) + indexer.index_postcodes() + else: + LOG.error("The place table doesn't exist. " + "Postcode updates on a frozen database is not possible.") if args.word_counts: LOG.warning('Recompute frequency of full-word search terms') @@ -74,7 +79,7 @@ class UpdateRefresh: with connect(args.config.get_libpq_dsn()) as conn: refresh.create_functions(conn, args.config, 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: data_path = Path(args.config.WIKIPEDIA_DATA_PATH @@ -96,4 +101,14 @@ class UpdateRefresh: LOG.warning('Setting up website directory at %s', webdir) with connect(args.config.get_libpq_dsn()) as conn: refresh.setup_website(webdir, args.config, conn) + 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