X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/8c7140d92b7a679ae5ef5bb3655c69bd39b7dfeb..78c19bc006d5957f183968d086226be4b2b65fe3:/nominatim/clicmd/setup.py diff --git a/nominatim/clicmd/setup.py b/nominatim/clicmd/setup.py index 3d212ff9..ccd6bd78 100644 --- a/nominatim/clicmd/setup.py +++ b/nominatim/clicmd/setup.py @@ -39,8 +39,7 @@ class SetupAll: """ 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)', @@ -169,7 +168,7 @@ class SetupAll: tokenizer.finalize_import(args.config) LOG.warning('Recompute word counts') - tokenizer.update_statistics() + tokenizer.update_statistics(args.config, threads=num_threads) webdir = args.project_dir / 'website' LOG.warning('Setup website at %s', webdir) @@ -220,12 +219,11 @@ class SetupAll: """ Determine the database date and set the status accordingly. """ with connect(dsn) as conn: - if not offline: - try: - dbdate = status.compute_database_date(conn) - status.set_status(conn, dbdate) - LOG.info('Database is at %s.', dbdate) - except Exception as exc: # pylint: disable=broad-except - LOG.error('Cannot determine date of database: %s', exc) - properties.set_property(conn, 'database_version', str(NOMINATIM_VERSION)) + + try: + dbdate = status.compute_database_date(conn, offline) + status.set_status(conn, dbdate) + LOG.info('Database is at %s.', dbdate) + except Exception as exc: # pylint: disable=broad-except + LOG.error('Cannot determine date of database: %s', exc)