X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/63e35574d4998ea64c1b26b1680d14ff4fd14036..cf98cff2a166eb35ed2c946e03f1610069bdd1d4:/nominatim/tools/refresh.py diff --git a/nominatim/tools/refresh.py b/nominatim/tools/refresh.py index 805bd634..97e2e037 100644 --- a/nominatim/tools/refresh.py +++ b/nominatim/tools/refresh.py @@ -155,7 +155,21 @@ def recompute_importance(conn): conn.commit() -def setup_website(basedir, config): +def _quote_php_variable(var_type, config, conf_name): + if var_type == bool: + return 'true' if config.get_bool(conf_name) else 'false' + + if var_type == int: + return getattr(config, conf_name) + + if not getattr(config, conf_name): + return 'false' + + quoted = getattr(config, conf_name).replace("'", "\\'") + return f"'{quoted}'" + + +def setup_website(basedir, config, conn): """ Create the website script stubs. """ if not basedir.exists(): @@ -174,18 +188,16 @@ def setup_website(basedir, config): config.project_dir / 'tokenizer')) for php_name, conf_name, var_type in PHP_CONST_DEFS: - if var_type == bool: - varout = 'true' if config.get_bool(conf_name) else 'false' - elif var_type == int: - varout = getattr(config, conf_name) - elif not getattr(config, conf_name): - varout = 'false' - else: - varout = "'{}'".format(getattr(config, conf_name).replace("'", "\\'")) + varout = _quote_php_variable(var_type, config, conf_name) - template += "@define('CONST_{}', {});\n".format(php_name, varout) + template += f"@define('CONST_{php_name}', {varout});\n" - template += "\nrequire_once('{}/website/{{}}');\n".format(config.lib_dir.php) + template += f"\nrequire_once('{config.lib_dir.php}/website/{{}}');\n" + + 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')