X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/d231ff60ed94d2f9bd6cb6ebbad744a46ba56e8f..53d2050dc5deb0a21fb25ede46ad4194ef5f410d:/nominatim/clicmd/setup.py

diff --git a/nominatim/clicmd/setup.py b/nominatim/clicmd/setup.py
index 49a9363d..ca3bf40e 100644
--- a/nominatim/clicmd/setup.py
+++ b/nominatim/clicmd/setup.py
@@ -71,7 +71,7 @@ class SetupAll:
                             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
@@ -80,8 +80,7 @@ class SetupAll:
 
         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):
@@ -93,20 +92,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 not files and not args.prepare_database:
                 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')
@@ -210,7 +208,7 @@ class SetupAll:
         """
         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)