Merge remote-tracking branch 'upstream/master'

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

diff --git a/nominatim/clicmd/refresh.py b/nominatim/clicmd/refresh.py
index 5e1b044e734336bf305f1c69c649bf18fda0fddc..5eac53da14cebbaa7e44f81861b882c3c68e26f6 100644 (file)
--- a/nominatim/clicmd/refresh.py
+++ b/nominatim/clicmd/refresh.py
@@ -89,6 +89,7 @@ class UpdateRefresh:
         from ..tools import refresh, postcodes
         from ..indexer.indexer import Indexer
 
         from ..tools import refresh, postcodes
         from ..indexer.indexer import Indexer
 

+        need_function_refresh = args.functions

 
         if args.postcodes:
             if postcodes.can_compute(args.config.get_libpq_dsn()):
 
         if args.postcodes:
             if postcodes.can_compute(args.config.get_libpq_dsn()):


@@ -110,7 +111,8 @@ class UpdateRefresh:
 
         if args.word_counts:
             LOG.warning('Recompute word statistics')
 
         if args.word_counts:
             LOG.warning('Recompute word statistics')

-            self._get_tokenizer(args.config).update_statistics()
+            self._get_tokenizer(args.config).update_statistics(args.config,
+                                                               threads=args.threads or 1)

 
         if args.address_levels:
             LOG.warning('Updating address levels')
 
         if args.address_levels:
             LOG.warning('Updating address levels')


@@ -130,13 +132,7 @@ class UpdateRefresh:
                                                 args.project_dir) > 0:
                 LOG.fatal('FATAL: Cannot update secondary importance raster data')
                 return 1
                                                 args.project_dir) > 0:
                 LOG.fatal('FATAL: Cannot update secondary importance raster data')
                 return 1

-
-        if args.functions:
-            LOG.warning('Create functions')
-            with connect(args.config.get_libpq_dsn()) as conn:
-                refresh.create_functions(conn, args.config,
-                                         args.diffs, args.enable_debug_statements)
-                self._get_tokenizer(args.config).update_sql_functions(args.config)
+            need_function_refresh = True

 
         if args.wiki_data:
             data_path = Path(args.config.WIKIPEDIA_DATA_PATH
 
         if args.wiki_data:
             data_path = Path(args.config.WIKIPEDIA_DATA_PATH


@@ -146,8 +142,16 @@ class UpdateRefresh:
                                                  data_path) > 0:
                 LOG.fatal('FATAL: Wikipedia importance file not found in %s', data_path)
                 return 1
                                                  data_path) > 0:
                 LOG.fatal('FATAL: Wikipedia importance file not found in %s', data_path)
                 return 1

+            need_function_refresh = True
+
+        if need_function_refresh:
+            LOG.warning('Create functions')
+            with connect(args.config.get_libpq_dsn()) as conn:
+                refresh.create_functions(conn, args.config,
+                                         args.diffs, args.enable_debug_statements)
+                self._get_tokenizer(args.config).update_sql_functions(args.config)

 
 

-        # Attention: importance MUST come after wiki data import.
+        # Attention: importance MUST come after wiki data import and after functions.

         if args.importance:
             LOG.warning('Update importance values for database')
             with connect(args.config.get_libpq_dsn()) as conn:
         if args.importance:
             LOG.warning('Update importance values for database')
             with connect(args.config.get_libpq_dsn()) as conn: