Mercurial > repos > gga > tripal_db_index
changeset 7:d55a39f12dda draft default tip
"planemo upload for repository https://github.com/galaxy-genome-annotation/galaxy-tools/tree/master/tools/tripal commit ea279e5b47cf3d5767328d17b0e40e57b0238ea1"
author | gga |
---|---|
date | Wed, 14 Aug 2019 10:06:34 -0400 |
parents | 468955e12255 |
children | |
files | db_index.xml macros.xml |
diffstat | 2 files changed, 14 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/db_index.xml Tue Mar 05 05:21:28 2019 -0500 +++ b/db_index.xml Wed Aug 14 10:06:34 2019 -0400 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tool id="db_index" profile="16.04" name="Index Tripal data" version="@WRAPPER_VERSION@.0"> +<tool id="db_index" profile="16.04" name="Index Tripal data" version="@WRAPPER_VERSION@.1"> <description>using Elasticsearch</description> <macros> <import>macros.xml</import> @@ -123,8 +123,8 @@ <param name="queues" label="Queues" argument="queues" type="integer" value="10" help="Number of indexing task queues" /> <conditional name="expose"> <param name="do_expose" type="select" label="Expose the index to other websites (read-only)"> - <option value="yes" selected="true">Yes</option> - <option value="no">No</option> + <option value="yes">Yes</option> + <option value="no" selected="true">No</option> </param> <when value="no"/> <when value="yes">
--- a/macros.xml Tue Mar 05 05:21:28 2019 -0500 +++ b/macros.xml Wed Aug 14 10:06:34 2019 -0400 @@ -41,13 +41,15 @@ <token name="@DATA_DIR@">\$GALAXY_TRIPAL_SHARED_DIR</token> <token name="@AUTH@"><![CDATA[ - echo "__default: local" > '.auth.yml' && - echo "local:" >> '.auth.yml' && - echo " tripal_url: \"\$GALAXY_TRIPAL_URL\"" >> '.auth.yml' && - echo " username: \"\$GALAXY_TRIPAL_USER\"" >> '.auth.yml' && - echo " password: \"\$GALAXY_TRIPAL_PASSWORD\"" >> '.auth.yml' && + if [ -z "\$TRIPAILLE_GLOBAL_CONFIG_PATH" ]; then + echo "__default: local" > '.auth.yml' && + echo "local:" >> '.auth.yml' && + echo " tripal_url: \"\$GALAXY_TRIPAL_URL\"" >> '.auth.yml' && + echo " username: \"\$GALAXY_TRIPAL_USER\"" >> '.auth.yml' && + echo " password: \"\$GALAXY_TRIPAL_PASSWORD\"" >> '.auth.yml' && - TRIPAILLE_GLOBAL_CONFIG_PATH='.auth.yml' + export TRIPAILLE_GLOBAL_CONFIG_PATH='.auth.yml' + ; fi && ]]></token> <xml name="wait_for"> @@ -155,7 +157,7 @@ <section name="matching" title="Feature matching" expanded="True"> <param name="query_type" type="text" - label="The feature type of the blast query" + label="The feature type of the query" help="It must be a valid Sequence Ontology term. e.g. 'contig', 'gene', 'mRNA', 'polypeptide'" /> <param name="query_uniquename" @@ -163,13 +165,13 @@ checked="false" truevalue="--query_uniquename" falsevalue="" - label="Find blast query features using their Unique name" + label="Find query features using their Unique name" help="Feature name will be used otherwise" /> <param name="query_re" type="text" optional="true" - label="Regular expression to extract the feature name from the blast query name" + label="Regular expression to extract the feature name from the query name" help="leave empty if the first word in query name is sufficient"> <expand macro="sanitized"/> </param>