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 ddc00d497bbe786a944664fc64ca0f45e69a70f3..567c416bf8529de80ffbe10480489ce7a6ba678b 100644 (file)
--- a/nominatim/clicmd/refresh.py
+++ b/nominatim/clicmd/refresh.py
@@ -45,11 +45,19 @@ class UpdateRefresh:
 
     @staticmethod
     def run(args):
 
     @staticmethod
     def run(args):

-        from ..tools import refresh
+        from ..tools import refresh, postcodes
+        from ..tokenizer import factory as tokenizer_factory
+        from ..indexer.indexer import Indexer
+
+        tokenizer = tokenizer_factory.get_tokenizer_for_db(args.config)

 
         if args.postcodes:
             LOG.warning("Update postcodes centroid")
 
         if args.postcodes:
             LOG.warning("Update postcodes centroid")

-            refresh.update_postcodes(args.config.get_libpq_dsn(), args.sqllib_dir)
+            postcodes.update_postcodes(args.config.get_libpq_dsn(),
+                                       args.project_dir, tokenizer)
+            indexer = Indexer(args.config.get_libpq_dsn(), tokenizer,
+                              args.threads or 1)
+            indexer.index_postcodes()

 
         if args.word_counts:
             LOG.warning('Recompute frequency of full-word search terms')
 
         if args.word_counts:
             LOG.warning('Recompute frequency of full-word search terms')


@@ -66,6 +74,7 @@ class UpdateRefresh:
             with connect(args.config.get_libpq_dsn()) as conn:
                 refresh.create_functions(conn, args.config,
                                          args.diffs, args.enable_debug_statements)
             with connect(args.config.get_libpq_dsn()) as conn:
                 refresh.create_functions(conn, args.config,
                                          args.diffs, args.enable_debug_statements)

+                tokenizer.update_sql_functions(args.config)

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