Merge remote-tracking branch 'upstream/master'

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

diff --git a/nominatim/clicmd/special_phrases.py b/nominatim/clicmd/special_phrases.py
index 99e825925ad63443b305543624cde60572740fee..002960feb2049b9d850ea54aeebc7b1644ba4dd1 100644 (file)
--- a/nominatim/clicmd/special_phrases.py
+++ b/nominatim/clicmd/special_phrases.py
@@ -2,13 +2,15 @@
     Implementation of the 'special-phrases' command.
 """
 import logging
     Implementation of the 'special-phrases' command.
 """
 import logging

-from nominatim.tools.special_phrases import SpecialPhrasesImporter
+from nominatim.tools import SpecialPhrasesImporter

 from nominatim.db.connection import connect
 
 LOG = logging.getLogger()
 
 # Do not repeat documentation of subcommand classes.
 # pylint: disable=C0111
 from nominatim.db.connection import connect
 
 LOG = logging.getLogger()
 
 # Do not repeat documentation of subcommand classes.
 # pylint: disable=C0111

+# Using non-top-level imports to avoid eventually unused imports.
+# pylint: disable=E0012,C0415

 
 class ImportSpecialPhrases:
     """\
 
 class ImportSpecialPhrases:
     """\


@@ -22,10 +24,13 @@ class ImportSpecialPhrases:
 
     @staticmethod
     def run(args):
 
     @staticmethod
     def run(args):

+        from ..tokenizer import factory as tokenizer_factory
+

         if args.import_from_wiki:
             LOG.warning('Special phrases importation starting')
         if args.import_from_wiki:
             LOG.warning('Special phrases importation starting')

+            tokenizer = tokenizer_factory.get_tokenizer_for_db(args.config)

             with connect(args.config.get_libpq_dsn()) as db_connection:
                 SpecialPhrasesImporter(
                     args.config, args.phplib_dir, db_connection
             with connect(args.config.get_libpq_dsn()) as db_connection:
                 SpecialPhrasesImporter(
                     args.config, args.phplib_dir, db_connection

-                ).import_from_wiki()
+                ).import_from_wiki(tokenizer)

         return 0
         return 0