Commit 23efeaa1 authored by Jan Kiene's avatar Jan Kiene
Browse files

fix automatic md collection and NULL default

parent 7d3d20c6

scripts/pyivastest/IvasModeRunner.py

+5 −1
Original line number Diff line number Diff line
@@ -646,8 +646,12 @@ class IvasModeRunner(IvasModeCollector.IvasModeCollector): 
                        default = os.path.join(in_dir, enc_dec_cmd["metadatafilenames"][0])

                        for i in range(len(md_files), nummetadata):

                            md_f = default.format(item=item_base_name, mdi=i + 1)

                            if not os.path.exists(md_f):

                                self.logger.warning(f"Can't find default md file {md_file} for item {item}. Default to NULL")

                                md_f = "NULL"

                            md_files.append(md_f)





                if "MASA" in in_format:

                    masa_md = self.global_masa_metadata

scripts/pyivastest/IvasScriptsCommon.py

+5 −1
Original line number Diff line number Diff line
@@ -673,7 +673,11 @@ def runner_setup(runner, args): 


    metadata_files = list()

    if args["ism_metadata_files"] != []:

        metadata_files.extend([os.path.abspath(f) for f in args["ism_metadata_files"]])

        for f in args["ism_metadata_files"]:

            md_f = f 

            if os.path.isfile(f):

                md_f = os.path.abspath(f)

            metadata_files.append(md_f)

        runner.global_ism_metadata = metadata_files

    if args["masa_metadata_file"] is not None:

        runner.global_masa_metadata = os.path.abspath(args["masa_metadata_file"])