safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

Removed _is_complete_import check

Browse Source
This commit is contained in:
Robbe Haesendonck
2023-09-27 09:21:56 +02:00
committed by Sarah Hoffmann
parent c74904d075
commit d231ff60ed
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nominatim/clicmd/setup.py
View File

@@ -99,17 +99,14 @@ class SetupAll:
if not files and not args.prepare_database: if not files and not args.prepare_database:
raise UsageError("No input files (use --osm-file).") 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') LOG.warning('Creating database')
database_import.setup_database_skeleton(args.config.get_libpq_dsn(), database_import.setup_database_skeleton(args.config.get_libpq_dsn(),
rouser=args.config.DATABASE_WEBUSER) rouser=args.config.DATABASE_WEBUSER)
return 0
if not self._is_complete_import(args):
return 0
if not args.prepare_database or \ if not args.prepare_database or \
args.continue_at == 'import-from-file' or \ args.continue_at == 'import-from-file':
self._is_complete_import(args):
# Check if the correct plugins are installed # Check if the correct plugins are installed
database_import.check_existing_database_plugins(args.config.get_libpq_dsn()) database_import.check_existing_database_plugins(args.config.get_libpq_dsn())
LOG.warning('Setting up country tables') LOG.warning('Setting up country tables')
@@ -139,7 +136,7 @@ class SetupAll:
self._setup_tables(args.config, args.reverse_only) 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') LOG.warning('Initialise tables')
with connect(args.config.get_libpq_dsn()) as conn: with connect(args.config.get_libpq_dsn()) as conn:
database_import.truncate_data_tables(conn) database_import.truncate_data_tables(conn)
@@ -185,11 +182,6 @@ class SetupAll:
return 0 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: def _setup_tables(self, config: Configuration, reverse_only: bool) -> None:
""" Set up the basic database layout: tables, indexes and functions. """ Set up the basic database layout: tables, indexes and functions.