X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/995ba2c7c2dec248bfd6fb83f066d49d2428cd3e..8f63f9516b276af8391d71e285db44a7b7214803:/nominatim/tools/tiger_data.py diff --git a/nominatim/tools/tiger_data.py b/nominatim/tools/tiger_data.py index c1de3615..90789e79 100644 --- a/nominatim/tools/tiger_data.py +++ b/nominatim/tools/tiger_data.py @@ -76,17 +76,17 @@ def handle_unregister_connection_pool(sel, place_threads): conn.close() place_threads -= 1 -def add_tiger_data(dsn, data_dir, threads, config, sqllib_dir): - """ Import tiger data from directory or tar file +def add_tiger_data(data_dir, config, threads): + """ Import tiger data from directory or tar file `data dir`. """ - + dsn = config.get_libpq_dsn() sql_files, tar = handle_tarfile_or_directory(data_dir) if not sql_files: return with connect(dsn) as conn: - sql = SQLPreprocessor(conn, config, sqllib_dir) + sql = SQLPreprocessor(conn, config, config.lib_dir.sql) sql.run_sql_file(conn, 'tiger_import_start.sql') # Reading sql_files and then for each file line handling @@ -116,5 +116,5 @@ def add_tiger_data(dsn, data_dir, threads, config, sqllib_dir): print('\n') LOG.warning("Creating indexes on Tiger data") with connect(dsn) as conn: - sql = SQLPreprocessor(conn, config, sqllib_dir) + sql = SQLPreprocessor(conn, config, config.lib_dir.sql) sql.run_sql_file(conn, 'tiger_import_finish.sql')