Merge remote-tracking branch 'upstream/master'

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

diff --git a/nominatim/clicmd/setup.py b/nominatim/clicmd/setup.py
index 49a9363d59c7c57eea6e4771652f6ead09e76daa..38a5a5b520470b0deff8a69365073f1830f93eb0 100644 (file)
--- a/nominatim/clicmd/setup.py
+++ b/nominatim/clicmd/setup.py
@@ -39,8 +39,7 @@ class SetupAll:
     """
 
     def add_args(self, parser: argparse.ArgumentParser) -> None:
     """
 
     def add_args(self, parser: argparse.ArgumentParser) -> None:

-        group_name = parser.add_argument_group('Required arguments')
-        group1 = group_name.add_argument_group()
+        group1 = parser.add_argument_group('Required arguments')

         group1.add_argument('--osm-file', metavar='FILE', action='append',
                            help='OSM file to be imported'
                                 ' (repeat for importing multiple files)',
         group1.add_argument('--osm-file', metavar='FILE', action='append',
                            help='OSM file to be imported'
                                 ' (repeat for importing multiple files)',


@@ -71,7 +70,7 @@ class SetupAll:
                             help='Create the database but do not import any data')
 
 
                             help='Create the database but do not import any data')
 
 

-    def run(self, args: NominatimArgs) -> int: # pylint: disable=too-many-statements
+    def run(self, args: NominatimArgs) -> int: # pylint: disable=too-many-statements, too-many-branches

         from ..data import country_info
         from ..tools import database_import, refresh, postcodes, freeze
         from ..indexer.indexer import Indexer
         from ..data import country_info
         from ..tools import database_import, refresh, postcodes, freeze
         from ..indexer.indexer import Indexer


@@ -80,8 +79,7 @@ class SetupAll:
 
         country_info.setup_country_config(args.config)
 
 
         country_info.setup_country_config(args.config)
 

-        # Check if osm-file or continue_at is set, if both are set, or none are set, throw an error
-        if args.osm_file is None and args.continue_at is None:
+        if args.osm_file is None and args.continue_at is None and not args.prepare_database:

             raise UsageError("No input files (use --osm-file).")
 
         if args.osm_file is not None and args.continue_at not in ('import-from-file', None):
             raise UsageError("No input files (use --osm-file).")
 
         if args.osm_file is not None and args.continue_at not in ('import-from-file', None):


@@ -93,20 +91,19 @@ class SetupAll:
             )
 
 
             )
 
 

+        if args.prepare_database or args.continue_at is None:
+            LOG.warning('Creating database')
+            database_import.setup_database_skeleton(args.config.get_libpq_dsn(),
+                                                        rouser=args.config.DATABASE_WEBUSER)
+            if args.prepare_database:
+                return 0

 
         if args.continue_at in (None, 'import-from-file'):
             files = args.get_osm_file_list()
 
         if args.continue_at in (None, 'import-from-file'):
             files = args.get_osm_file_list()

-            if not files and not args.prepare_database:
+            if not files:

                 raise UsageError("No input files (use --osm-file).")
 
                 raise UsageError("No input files (use --osm-file).")
 

-            if args.prepare_database:
-                LOG.warning('Creating database')
-                database_import.setup_database_skeleton(args.config.get_libpq_dsn(),
-                                                        rouser=args.config.DATABASE_WEBUSER)
-                return 0
-
-            if not args.prepare_database or \
-                    args.continue_at == 'import-from-file':
+            if args.continue_at in ('import-from-file', None):

                 # Check if the correct plugins are installed
                 database_import.check_existing_database_plugins(args.config.get_libpq_dsn())
                 LOG.warning('Setting up country tables')
                 # Check if the correct plugins are installed
                 database_import.check_existing_database_plugins(args.config.get_libpq_dsn())
                 LOG.warning('Setting up country tables')


@@ -171,7 +168,7 @@ class SetupAll:
         tokenizer.finalize_import(args.config)
 
         LOG.warning('Recompute word counts')
         tokenizer.finalize_import(args.config)
 
         LOG.warning('Recompute word counts')

-        tokenizer.update_statistics()
+        tokenizer.update_statistics(args.config)

 
         webdir = args.project_dir / 'website'
         LOG.warning('Setup website at %s', webdir)
 
         webdir = args.project_dir / 'website'
         LOG.warning('Setup website at %s', webdir)


@@ -210,7 +207,7 @@ class SetupAll:
         """
         from ..tokenizer import factory as tokenizer_factory
 
         """
         from ..tokenizer import factory as tokenizer_factory
 

-        if continue_at is None or continue_at == 'load-data':
+        if continue_at in ('import-from-file', 'load-data', None):

             # (re)initialise the tokenizer data
             return tokenizer_factory.create_tokenizer(config)
 
             # (re)initialise the tokenizer data
             return tokenizer_factory.create_tokenizer(config)