diff --git a/config/datatypes_conf.xml.sample b/config/datatypes_conf.xml.sample index 908575724fc..6859e892924 100644 --- a/config/datatypes_conf.xml.sample +++ b/config/datatypes_conf.xml.sample @@ -15,6 +15,7 @@ + @@ -247,6 +248,7 @@ + diff --git a/config/tool_data_table_conf.xml.sample b/config/tool_data_table_conf.xml.sample index 84221da268b..3c437562c4c 100644 --- a/config/tool_data_table_conf.xml.sample +++ b/config/tool_data_table_conf.xml.sample @@ -75,4 +75,14 @@ dbkey, name, value + + + value, name, url + +
+ + + value, name, url + +
diff --git a/display_applications/iobio/bam.xml b/display_applications/iobio/bam.xml new file mode 100644 index 00000000000..69cdabf6b42 --- /dev/null +++ b/display_applications/iobio/bam.xml @@ -0,0 +1,8 @@ + + + + ${url}?bam=${bam_file.qp} + + + + diff --git a/display_applications/iobio/vcf.xml b/display_applications/iobio/vcf.xml new file mode 100644 index 00000000000..60be251d0ad --- /dev/null +++ b/display_applications/iobio/vcf.xml @@ -0,0 +1,8 @@ + + + + ${url}?vcf=${bgzip_file.qp} + + + + diff --git a/lib/galaxy/datatypes/display_applications/application.py b/lib/galaxy/datatypes/display_applications/application.py index 65308d59a88..a8e75e9e76e 100644 --- a/lib/galaxy/datatypes/display_applications/application.py +++ b/lib/galaxy/datatypes/display_applications/application.py @@ -142,7 +142,7 @@ class DynamicDisplayApplicationBuilder( object ): max_col = max( id_col, name_col ) dynamic_params = {} if data_table is not None: - max_col = max( [ max_col ] + data_table.columns.values() ) + max_col = max( [ max_col ] + data_table.columns.values() ) for key, value in data_table.columns.items(): dynamic_params[key] = { 'column': value, 'split': False, 'separator': ',' } for dynamic_param in elem.findall( 'dynamic_param' ): diff --git a/tool-data/bam_iobio.loc.sample b/tool-data/bam_iobio.loc.sample new file mode 100644 index 00000000000..36bea1c20a2 --- /dev/null +++ b/tool-data/bam_iobio.loc.sample @@ -0,0 +1,3 @@ +# Table used for listing bam.iobio servers +# +bam_iobio bam.iobio.io http://bam.iobio.io/ diff --git a/tool-data/vcf_iobio.loc.sample b/tool-data/vcf_iobio.loc.sample new file mode 100644 index 00000000000..72d217311b3 --- /dev/null +++ b/tool-data/vcf_iobio.loc.sample @@ -0,0 +1,3 @@ +# Table used for listing vcf.iobio servers +# +vcf_iobio vcf.iobio.io http://vcf.iobio.io/