Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / tools / refresh.py

diff --git a/nominatim/tools/refresh.py b/nominatim/tools/refresh.py
index 6720465fd9220387781b8df939742a1aee482a0e..5aaee0c8d1d8417a5a88c4b7a317a2d2f37c4467 100644 (file)
--- a/nominatim/tools/refresh.py
+++ b/nominatim/tools/refresh.py
@@ -5,7 +5,7 @@ import json
 import logging
 from textwrap import dedent
 
 import logging
 from textwrap import dedent
 

-from psycopg2.extras import execute_values
+from psycopg2 import sql as pysql

 
 from nominatim.db.utils import execute_file
 from nominatim.db.sql_preprocessor import SQLPreprocessor
 
 from nominatim.db.utils import execute_file
 from nominatim.db.sql_preprocessor import SQLPreprocessor


@@ -13,12 +13,6 @@ from nominatim.version import NOMINATIM_VERSION
 
 LOG = logging.getLogger()
 
 
 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.
 
 def recompute_word_counts(dsn, sql_dir):
     """ Compute the frequency of full-word search terms.


@@ -55,7 +49,7 @@ def load_address_levels(conn, table, levels):
         _add_address_level_rows_from_entry(rows, entry)
 
     with conn.cursor() as cur:
         _add_address_level_rows_from_entry(rows, entry)
 
     with conn.cursor() as cur:

-        cur.execute('DROP TABLE IF EXISTS {}'.format(table))
+        cur.drop_table(table)

 
         cur.execute("""CREATE TABLE {} (country_code varchar(2),
                                         class TEXT,
 
         cur.execute("""CREATE TABLE {} (country_code varchar(2),
                                         class TEXT,


@@ -63,7 +57,8 @@ def load_address_levels(conn, table, levels):
                                         rank_search SMALLINT,
                                         rank_address SMALLINT)""".format(table))
 
                                         rank_search SMALLINT,
                                         rank_address SMALLINT)""".format(table))
 

-        execute_values(cur, "INSERT INTO {} VALUES %s".format(table), rows)
+        cur.execute_values(pysql.SQL("INSERT INTO {} VALUES %s")
+                           .format(pysql.Identifier(table)), rows)

 
         cur.execute('CREATE UNIQUE INDEX ON {} (country_code, class, type)'.format(table))
 
 
         cur.execute('CREATE UNIQUE INDEX ON {} (country_code, class, type)'.format(table))
 


@@ -161,7 +156,21 @@ def recompute_importance(conn):
     conn.commit()
 
 
     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():
     """ Create the website script stubs.
     """
     if not basedir.exists():


@@ -180,18 +189,16 @@ def setup_website(basedir, config):
                                  config.project_dir / 'tokenizer'))
 
     for php_name, conf_name, var_type in PHP_CONST_DEFS:
                                  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:
 
     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')