From d231ff60ed94d2f9bd6cb6ebbad744a46ba56e8f Mon Sep 17 00:00:00 2001 From: Robbe Haesendonck Date: Wed, 27 Sep 2023 09:21:56 +0200 Subject: [PATCH] Removed _is_complete_import check --- nominatim/clicmd/setup.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/nominatim/clicmd/setup.py b/nominatim/clicmd/setup.py index 9ae812e8..49a9363d 100644 --- a/nominatim/clicmd/setup.py +++ b/nominatim/clicmd/setup.py @@ -99,17 +99,14 @@ class SetupAll: if not files and not args.prepare_database: raise UsageError("No input files (use --osm-file).") - if args.prepare_database or self._is_complete_import(args): + if args.prepare_database: LOG.warning('Creating database') database_import.setup_database_skeleton(args.config.get_libpq_dsn(), rouser=args.config.DATABASE_WEBUSER) - - if not self._is_complete_import(args): - return 0 + return 0 if not args.prepare_database or \ - args.continue_at == 'import-from-file' or \ - self._is_complete_import(args): + args.continue_at == 'import-from-file': # Check if the correct plugins are installed database_import.check_existing_database_plugins(args.config.get_libpq_dsn()) LOG.warning('Setting up country tables') @@ -139,7 +136,7 @@ class SetupAll: self._setup_tables(args.config, args.reverse_only) - if args.continue_at is None or args.continue_at in ('import-from-file', 'load-data'): + if args.continue_at in ('import-from-file', 'load-data', None): LOG.warning('Initialise tables') with connect(args.config.get_libpq_dsn()) as conn: database_import.truncate_data_tables(conn) @@ -185,11 +182,6 @@ class SetupAll: return 0 - def _is_complete_import(self, args: NominatimArgs) -> bool: - """ Determine if the import is complete or if only the database should be prepared. - """ - return args.continue_at is None and not args.prepare_database - def _setup_tables(self, config: Configuration, reverse_only: bool) -> None: """ Set up the basic database layout: tables, indexes and functions. -- 2.39.5