Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / cli.py

diff --git a/nominatim/cli.py b/nominatim/cli.py
index 20a9c5f167c225c17d358d9a726e034e7a9618c1..533a920e07e5937d689be322e056167ca3135884 100644 (file)
--- a/nominatim/cli.py
+++ b/nominatim/cli.py
@@ -13,7 +13,6 @@ from nominatim.tools.exec_utils import run_legacy_script, run_php_server
 from nominatim.errors import UsageError
 from nominatim import clicmd
 from nominatim.clicmd.args import NominatimArgs
 from nominatim.errors import UsageError
 from nominatim import clicmd
 from nominatim.clicmd.args import NominatimArgs

-from nominatim.tools import tiger_data

 
 LOG = logging.getLogger()
 
 
 LOG = logging.getLogger()
 


@@ -147,9 +146,14 @@ class UpdateAddData:
 
     @staticmethod
     def run(args):
 
     @staticmethod
     def run(args):

+        from nominatim.tokenizer import factory as tokenizer_factory
+        from nominatim.tools import tiger_data
+

         if args.tiger_data:
         if args.tiger_data:

+            tokenizer = tokenizer_factory.get_tokenizer_for_db(args.config)

             return tiger_data.add_tiger_data(args.tiger_data,
             return tiger_data.add_tiger_data(args.tiger_data,

-                                             args.config, args.threads or 1)
+                                             args.config, args.threads or 1,
+                                             tokenizer)

 
         params = ['update.php']
         if args.file:
 
         params = ['update.php']
         if args.file:


@@ -259,7 +263,7 @@ def get_set_parser(**kwargs):
 
     parser.add_subcommand('add-data', UpdateAddData)
     parser.add_subcommand('index', clicmd.UpdateIndex)
 
     parser.add_subcommand('add-data', UpdateAddData)
     parser.add_subcommand('index', clicmd.UpdateIndex)

-    parser.add_subcommand('refresh', clicmd.UpdateRefresh)
+    parser.add_subcommand('refresh', clicmd.UpdateRefresh())

 
     parser.add_subcommand('admin', clicmd.AdminFuncs)
 
 
     parser.add_subcommand('admin', clicmd.AdminFuncs)