Merge pull request #2321 from AntoJvlt/csv-import-special-phrases

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

diff --git a/nominatim/clicmd/refresh.py b/nominatim/clicmd/refresh.py
index 4d4570555f83916fbc119f1b70d7cb31881a1c50..e696e7b6291d5df03d3480609cff8d8a7d8a5532 100644 (file)
--- a/nominatim/clicmd/refresh.py
+++ b/nominatim/clicmd/refresh.py
@@ -47,6 +47,7 @@ class UpdateRefresh:
     def run(args):
         from ..tools import refresh, postcodes
         from ..tokenizer import factory as tokenizer_factory
     def run(args):
         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)
 
 
         tokenizer = tokenizer_factory.get_tokenizer_for_db(args.config)
 


@@ -54,6 +55,9 @@ class UpdateRefresh:
             LOG.warning("Update postcodes centroid")
             postcodes.update_postcodes(args.config.get_libpq_dsn(),
                                        args.project_dir, tokenizer)
             LOG.warning("Update postcodes centroid")
             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')


@@ -90,6 +94,6 @@ class UpdateRefresh:
         if args.website:
             webdir = args.project_dir / 'website'
             LOG.warning('Setting up website directory at %s', webdir)
         if args.website:
             webdir = args.project_dir / 'website'
             LOG.warning('Setting up website directory at %s', webdir)

-            refresh.setup_website(webdir, args.config)
-
+            with connect(args.config.get_libpq_dsn()) as conn:
+                refresh.setup_website(webdir, args.config, conn)

         return 0
         return 0