diff --git a/doc/schema_template.md b/doc/schema_template.md index 679d839d3f92..d08c7a4a0d06 100644 --- a/doc/schema_template.md +++ b/doc/schema_template.md @@ -82,7 +82,7 @@ $tag:tool|outputs|data|actions|action://complexType[@name='Action'] $tag:tool|outputs|data|actions|action|option://complexType[@name='ActionsOption'] $tag:tool|outputs|data|discover_datasets://complexType[@name='OutputDiscoverDatasets'] $tag:tool|outputs|collection://complexType[@name='OutputCollection'] -$tag:tool|outputs|collection|data://complexType[@name='OutputCollectionDataElement'] +$tag:tool|outputs|collection|data://complexType[@name='OutputCollectionData'] $tag:tool|outputs|collection|filter://complexType[@name='OutputFilter'] $tag:tool|outputs|collection|discover_datasets://complexType[@name='OutputCollectionDiscoverDatasets'] $tag:tool|tests://complexType[@name='Tests'] diff --git a/lib/galaxy/tool_util/xsd/galaxy.xsd b/lib/galaxy/tool_util/xsd/galaxy.xsd index 73558250251f..7c17312c4f0b 100644 --- a/lib/galaxy/tool_util/xsd/galaxy.xsd +++ b/lib/galaxy/tool_util/xsd/galaxy.xsd @@ -5827,15 +5827,24 @@ on Human (hg18)``. + + + + + + + + + - + - + - + @@ -6002,23 +6011,7 @@ Therefore a filter for such a variable looks like the following example. - - - - + Indicate that dataset filenames should simply be read from the provided metadata file (e.g. galaxy.json). If this is set - pattern and sort must not be set. @@ -6069,6 +6062,26 @@ More information can be found on Planemo's documentation for Indication if this dataset is visible in output history. This defaults to ``false``, but probably shouldn't - be sure to set to ``true`` if that is your intention. + + + + + + + Replace the primary dataset described by the parameter ``data`` parameter with the first output discovered. @@ -6092,51 +6105,7 @@ Galaxy, including: ]]> - - - Indicate that dataset filenames should simply be read from the provided metadata file (e.g. galaxy.json). If this is set - pattern and sort_by must not be set. - - - - - Regular expression used to find filenames and parse dynamic properties. - - - - - Directory (relative to working directory) to search for files. - - - - - Indicates that the specified directory should be searched recursively for matching files. - - - - - Indicates that the entire path of the discovered dataset relative to the specified directory should be available for matching patterns. - - - - - Format (or datatype) of discovered datasets (an alias with ``ext``). - - - - - Format (or datatype) of discovered datasets (an alias with ``format``). - - - - - A string `[reverse_][SORT_COMP_]SORTBY` describing the desired sort order of the collection elements. `SORTBY` can be `filename`, `name`, `designation`, `dbkey` and the optional `SORT_COMP` can be either `lexical` or `numeric`. Default is lexical sorting by filename. - - - - - Indication if this dataset is visible in the history. This defaults to ``false``, but probably shouldn't - be sure to set to ``true`` if that is your intention. - - + diff --git a/test/functional/tools/collection_creates_pair_format.xml b/test/functional/tools/collection_creates_pair_format.xml index 549f49cd7b84..f3dea456fd2d 100644 --- a/test/functional/tools/collection_creates_pair_format.xml +++ b/test/functional/tools/collection_creates_pair_format.xml @@ -7,16 +7,28 @@ + + + + - + + + + + - + + + + + @@ -48,5 +60,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/functional/tools/metadata_column_names.xml b/test/functional/tools/metadata_column_names.xml index c7edd8f32634..918042f52426 100644 --- a/test/functional/tools/metadata_column_names.xml +++ b/test/functional/tools/metadata_column_names.xml @@ -1,7 +1,9 @@ Tests whether metadata is being set correctly. @@ -12,6 +14,18 @@ + + + + + + + + + + + + @@ -19,6 +33,14 @@ + + + + + + + +