X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/fb3353b854f40b8fd97ea942d3d9814e80e14779..3f73a363f42cb3cb6627ddcea371e3a22810daa6:/nominatim/cli.py diff --git a/nominatim/cli.py b/nominatim/cli.py index 9235055b..20a9c5f1 100644 --- a/nominatim/cli.py +++ b/nominatim/cli.py @@ -84,6 +84,11 @@ class CommandlineParser: args.config = Configuration(args.project_dir, args.config_dir, environ=kwargs.get('environ', os.environ)) + args.config.set_libdirs(module=args.module_dir, + osm2pgsql=args.osm2pgsql_path, + php=args.phplib_dir, + sql=args.sqllib_dir, + data=args.data_dir) log = logging.getLogger() log.warning('Using project directory: %s', str(args.project_dir)) @@ -116,7 +121,7 @@ class UpdateAddData: """\ Add additional data from a file or an online source. - Data is only imported, not indexed. You need to call `nominatim-update index` + Data is only imported, not indexed. You need to call `nominatim index` to complete the process. """ @@ -143,11 +148,8 @@ class UpdateAddData: @staticmethod def run(args): if args.tiger_data: - return tiger_data.add_tiger_data(args.config.get_libpq_dsn(), - args.tiger_data, - args.threads or 1, - args.config, - args.sqllib_dir) + return tiger_data.add_tiger_data(args.tiger_data, + args.config, args.threads or 1) params = ['update.php'] if args.file: @@ -273,8 +275,6 @@ def get_set_parser(**kwargs): else: parser.parser.epilog = 'php-cgi not found. Query commands not available.' - parser.add_subcommand('transition', clicmd.AdminTransition) - return parser