Unverified Commit 7d002020 authored by davelopez's avatar davelopez
Browse files

Fix export_remote include metadata flag 



We were passing 'false' to --export-metadata-files, but it was
considered True (non-zero length string), and the metadata was
always included in the export.

Co-authored-by: default avatarMarius van den Beek <m.vandenbeek@gmail.com>
parent dfea749b

tools/data_export/export_remote.py

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ def _parser(): 
    parser.add_argument("--directory-uri", type=str, help="directory target URI")

    parser.add_argument("--file-sources", type=str, help="file sources json")

    parser.add_argument("--files-to-export", type=str, help="files to export")

    parser.add_argument("--export-metadata-files", type=bool, help="export metadata files", default=True)

    parser.add_argument("--export-metadata-files", type=bool, help="export metadata files", default=False)

    return parser

tools/data_export/export_remote.xml

+8 −6
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@ python '$__tool_directory__/export_remote.py' 
    --file-sources '$file_sources'

    --directory-uri '$d_uri'

    --files-to-export '$files_to_export'

    #if $include_metadata_files:

        --export-metadata-files $include_metadata_files

    #end if

    > '$out'

    ]]></command>

    <configfiles>
@@ -51,7 +53,7 @@ $fileconfig 
                    <param type="data" format="data" name="infile" label="Input dataset"/>

                    <param type="text" name="name" label="Enter file name" help="To create a file named &quot;f1.txt&quot; in directory named &quot;dir1&quot; enter &quot;dir1/f1.txt&quot;">

                        <!-- 🔥 turn off sanitizer, so unicode strings can be used. Is sanitized in configfile -->

                        <sanitizer sanitize="false"></sanitizer>

                        <sanitizer sanitize="false"/>

                        <validator type="length" min="1" max="255"/>

                    </param>

                </repeat>