have ADDRESS_LEVEL_CONFIG use load_sub_configuration

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

diff --git a/nominatim/tools/refresh.py b/nominatim/tools/refresh.py
index 25a97127896076c08242cafac7a5365a7b5c520e..a6fe3d19ad808b5101e0f4ce702a75d9b8d8a2a0 100644 (file)
--- a/nominatim/tools/refresh.py
+++ b/nominatim/tools/refresh.py
@@ -1,11 +1,10 @@
 """
 Functions for bringing auxiliary data in the database up-to-date.
 """
 """
 Functions for bringing auxiliary data in the database up-to-date.
 """

-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


@@ -14,12 +13,6 @@ from nominatim.version import NOMINATIM_VERSION
 LOG = logging.getLogger()
 
 
 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
 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


@@ -49,7 +42,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,


@@ -57,18 +50,22 @@ 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))
 
     conn.commit()
 
 
         cur.execute('CREATE UNIQUE INDEX ON {} (country_code, class, type)'.format(table))
 
     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):
 
 
 def create_functions(conn, config, enable_diff_updates=True, enable_debug=False):


@@ -155,6 +152,20 @@ def recompute_importance(conn):
     conn.commit()
 
 
     conn.commit()
 
 

+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.
     """
 def setup_website(basedir, config, conn):
     """ Create the website script stubs.
     """


@@ -174,18 +185,11 @@ def setup_website(basedir, config, conn):
                                  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'))
 
 
     search_name_table_exists = bool(conn and conn.table_exists('search_name'))