X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/14f777da18df25e43685a7b1cd7b4e972c9fca39..930a5cd12a614afa48b06318d8227e6d11f2ce5b:/nominatim/tools/refresh.py diff --git a/nominatim/tools/refresh.py b/nominatim/tools/refresh.py index 5aaee0c8..95be4c0f 100644 --- a/nominatim/tools/refresh.py +++ b/nominatim/tools/refresh.py @@ -1,9 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# This file is part of Nominatim. (https://nominatim.org) +# +# Copyright (C) 2022 by the Nominatim developer community. +# For a full list of authors see the git log. """ Functions for bringing auxiliary data in the database up-to-date. """ -import json import logging from textwrap import dedent +from pathlib import Path from psycopg2 import sql as pysql @@ -14,12 +20,6 @@ from nominatim.version import NOMINATIM_VERSION LOG = logging.getLogger() -def recompute_word_counts(dsn, sql_dir): - """ Compute the frequency of full-word search terms. - """ - execute_file(dsn, sql_dir / 'words_from_search_name.sql') - - def _add_address_level_rows_from_entry(rows, entry): """ Converts a single entry from the JSON format for address rank descriptions into a flat format suitable for inserting into a @@ -64,12 +64,15 @@ def load_address_levels(conn, table, levels): conn.commit() -def load_address_levels_from_file(conn, config_file): - """ Replace the `address_levels` table with the contents of the config - file. + +def load_address_levels_from_config(conn, config): + """ Replace the `address_levels` table with the content as + defined in the given configuration. Uses the parameter + NOMINATIM_ADDRESS_LEVEL_CONFIG to determine the location of the + configuration file. """ - with config_file.open('r') as fdesc: - load_address_levels(conn, 'address_levels', json.load(fdesc)) + cfg = config.load_sub_configuration('', config='ADDRESS_LEVEL_CONFIG') + load_address_levels(conn, 'address_levels', cfg) def create_functions(conn, config, enable_diff_updates=True, enable_debug=False): @@ -98,7 +101,7 @@ PHP_CONST_DEFS = ( ('Database_DSN', 'DATABASE_DSN', str), ('Default_Language', 'DEFAULT_LANGUAGE', str), ('Log_DB', 'LOG_DB', bool), - ('Log_File', 'LOG_FILE', str), + ('Log_File', 'LOG_FILE', Path), ('NoAccessControl', 'CORS_NOACCESSCONTROL', bool), ('Places_Max_ID_count', 'LOOKUP_MAX_COUNT', int), ('PolygonOutput_MaximumTypes', 'POLYGON_OUTPUT_MAX_TYPES', int), @@ -166,7 +169,12 @@ def _quote_php_variable(var_type, config, conf_name): if not getattr(config, conf_name): return 'false' - quoted = getattr(config, conf_name).replace("'", "\\'") + if var_type == Path: + value = str(config.get_path(conf_name)) + else: + value = getattr(config, conf_name) + + quoted = value.replace("'", "\\'") return f"'{quoted}'"