X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7212fa863009747fad6fc86acccfed6043294e18..a2edbbf78a9612193d7751806d310de385549dee:/nominatim/tools/refresh.py diff --git a/nominatim/tools/refresh.py b/nominatim/tools/refresh.py index 581c69e8..25a97127 100644 --- a/nominatim/tools/refresh.py +++ b/nominatim/tools/refresh.py @@ -7,18 +7,12 @@ from textwrap import dedent from psycopg2.extras import execute_values -from ..db.utils import execute_file -from ..db.sql_preprocessor import SQLPreprocessor -from ..version import NOMINATIM_VERSION +from nominatim.db.utils import execute_file +from nominatim.db.sql_preprocessor import SQLPreprocessor +from nominatim.version import NOMINATIM_VERSION LOG = logging.getLogger() -def update_postcodes(dsn, sql_dir): - """ Recalculate postcode centroids and add, remove and update entries in the - location_postcode table. `conn` is an opne connection to the database. - """ - execute_file(dsn, sql_dir / 'update-postcodes.sql') - def recompute_word_counts(dsn, sql_dir): """ Compute the frequency of full-word search terms. @@ -77,11 +71,10 @@ def load_address_levels_from_file(conn, config_file): load_address_levels(conn, 'address_levels', json.load(fdesc)) -def create_functions(conn, config, sqllib_dir, - enable_diff_updates=True, enable_debug=False): +def create_functions(conn, config, enable_diff_updates=True, enable_debug=False): """ (Re)create the PL/pgSQL functions. """ - sql = SQLPreprocessor(conn, config, sqllib_dir) + sql = SQLPreprocessor(conn, config) sql.run_sql_file(conn, 'functions.sql', disable_diff_updates=not enable_diff_updates, @@ -105,14 +98,11 @@ PHP_CONST_DEFS = ( ('Default_Language', 'DEFAULT_LANGUAGE', str), ('Log_DB', 'LOG_DB', bool), ('Log_File', 'LOG_FILE', str), - ('Max_Word_Frequency', 'MAX_WORD_FREQUENCY', int), ('NoAccessControl', 'CORS_NOACCESSCONTROL', bool), ('Places_Max_ID_count', 'LOOKUP_MAX_COUNT', int), ('PolygonOutput_MaximumTypes', 'POLYGON_OUTPUT_MAX_TYPES', int), ('Search_BatchMode', 'SEARCH_BATCH_MODE', bool), ('Search_NameOnlySearchFrequencyThreshold', 'SEARCH_NAME_ONLY_THRESHOLD', str), - ('Term_Normalization_Rules', 'TERM_NORMALIZATION', str), - ('Use_Aux_Location_data', 'USE_AUX_LOCATION_DATA', bool), ('Use_US_Tiger_Data', 'USE_US_TIGER_DATA', bool), ('MapIcon_URL', 'MAPICON_URL', str), ) @@ -165,7 +155,7 @@ def recompute_importance(conn): conn.commit() -def setup_website(basedir, phplib_dir, config): +def setup_website(basedir, config, conn): """ Create the website script stubs. """ if not basedir.exists(): @@ -177,9 +167,11 @@ def setup_website(basedir, phplib_dir, config): @define('CONST_Debug', $_GET['debug'] ?? false); @define('CONST_LibDir', '{0}'); + @define('CONST_TokenizerDir', '{2}'); @define('CONST_NominatimVersion', '{1[0]}.{1[1]}.{1[2]}-{1[3]}'); - """.format(phplib_dir, NOMINATIM_VERSION)) + """.format(config.lib_dir.php, NOMINATIM_VERSION, + config.project_dir / 'tokenizer')) for php_name, conf_name, var_type in PHP_CONST_DEFS: if var_type == bool: @@ -193,7 +185,12 @@ def setup_website(basedir, phplib_dir, config): template += "@define('CONST_{}', {});\n".format(php_name, varout) - template += "\nrequire_once('{}/website/{{}}');\n".format(phplib_dir) + template += "\nrequire_once('{}/website/{{}}');\n".format(config.lib_dir.php) + + search_name_table_exists = bool(conn and conn.table_exists('search_name')) for script in WEBSITE_SCRIPTS: - (basedir / script).write_text(template.format(script), 'utf-8') + if not search_name_table_exists and script == 'search.php': + (basedir / script).write_text(template.format('reverse-only-search.php'), 'utf-8') + else: + (basedir / script).write_text(template.format(script), 'utf-8')