X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/4315debff588a5aa67840eda07bcc85d265f923b..a7a920a9a5b55bf4290b184f05898a8589c95b40:/nominatim/clicmd/refresh.py diff --git a/nominatim/clicmd/refresh.py b/nominatim/clicmd/refresh.py index 343fe48d..5eac53da 100644 --- a/nominatim/clicmd/refresh.py +++ b/nominatim/clicmd/refresh.py @@ -89,6 +89,7 @@ class UpdateRefresh: from ..tools import refresh, postcodes from ..indexer.indexer import Indexer + need_function_refresh = args.functions if args.postcodes: if postcodes.can_compute(args.config.get_libpq_dsn()): @@ -131,13 +132,7 @@ class UpdateRefresh: args.project_dir) > 0: LOG.fatal('FATAL: Cannot update secondary importance raster data') return 1 - - if args.functions: - LOG.warning('Create functions') - with connect(args.config.get_libpq_dsn()) as conn: - refresh.create_functions(conn, args.config, - args.diffs, args.enable_debug_statements) - self._get_tokenizer(args.config).update_sql_functions(args.config) + need_function_refresh = True if args.wiki_data: data_path = Path(args.config.WIKIPEDIA_DATA_PATH @@ -147,8 +142,16 @@ class UpdateRefresh: data_path) > 0: LOG.fatal('FATAL: Wikipedia importance file not found in %s', data_path) return 1 + need_function_refresh = True + + if need_function_refresh: + LOG.warning('Create functions') + with connect(args.config.get_libpq_dsn()) as conn: + refresh.create_functions(conn, args.config, + args.diffs, args.enable_debug_statements) + self._get_tokenizer(args.config).update_sql_functions(args.config) - # Attention: importance MUST come after wiki data import. + # Attention: importance MUST come after wiki data import and after functions. if args.importance: LOG.warning('Update importance values for database') with connect(args.config.get_libpq_dsn()) as conn: