X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/3cc357bffa4fdcdc32ed67aba35de06d1d6b419c..f59a072aa6805bfce9ca4cc097c550af0f64879e:/nominatim/tools/refresh.py diff --git a/nominatim/tools/refresh.py b/nominatim/tools/refresh.py index 5dd98c0e..c6df9982 100644 --- a/nominatim/tools/refresh.py +++ b/nominatim/tools/refresh.py @@ -217,7 +217,7 @@ def setup_website(basedir: Path, config: Configuration, conn: Connection) -> Non basedir.mkdir() assert config.project_dir is not None - template = dedent(f"""\ + basedata = dedent(f"""\ Non for php_name, conf_name, var_type in PHP_CONST_DEFS: varout = _quote_php_variable(var_type, config, conf_name) - template += f"@define('CONST_{php_name}', {varout});\n" + basedata += f"@define('CONST_{php_name}', {varout});\n" - template += f"\nrequire_once('{config.lib_dir.php}/website/{{}}');\n" + template = "\nrequire_once(CONST_LibDir.'/website/{}');\n" search_name_table_exists = bool(conn and conn.table_exists('search_name')) for script in WEBSITE_SCRIPTS: if not search_name_table_exists and script == 'search.php': - (basedir / script).write_text(template.format('reverse-only-search.php'), 'utf-8') + out = template.format('reverse-only-search.php') else: - (basedir / script).write_text(template.format(script), 'utf-8') + out = template.format(script) + + (basedir / script).write_text(basedata + out, 'utf-8') def invalidate_osm_object(osm_type: str, osm_id: int, conn: Connection,