[rocpd] Fix rocpd convenience scripts to accept --automerge-limit parameter (#1926)
* remove double RocpdImportData calls from execute() in each module * formatting fix
This commit is contained in:
@@ -456,10 +456,6 @@ def add_args(parser):
|
||||
|
||||
def execute(input, args, config=None, **kwargs):
|
||||
|
||||
importData = RocpdImportData(
|
||||
input, automerge_limit=getattr(args, "automerge_limit", None)
|
||||
)
|
||||
|
||||
config = (
|
||||
output_config.output_config(**kwargs)
|
||||
if config is None
|
||||
@@ -470,11 +466,11 @@ def execute(input, args, config=None, **kwargs):
|
||||
# read script and execute statements
|
||||
with open(args.script, "r") as ifs:
|
||||
for itr in ifs.read().split(";"):
|
||||
importData.execute(f"{itr}")
|
||||
input.execute(f"{itr}")
|
||||
|
||||
# Prepare parameters for export
|
||||
query = args.query
|
||||
db = importData
|
||||
db = input
|
||||
export_format = args.format
|
||||
export_path = os.path.join(config.output_path, config.output_file)
|
||||
|
||||
@@ -541,7 +537,9 @@ def main(argv=None):
|
||||
|
||||
args = parser.parse_args(argv)
|
||||
|
||||
input = RocpdImportData(args.input)
|
||||
input = RocpdImportData(
|
||||
args.input, automerge_limit=getattr(args, "automerge_limit", None)
|
||||
)
|
||||
|
||||
out_cfg_args = process_out_config_args(input, args)
|
||||
generic_out_cfg_args = process_generic_args(input, args)
|
||||
|
||||
Reference in New Issue
Block a user