profile, wording macros

galaxyproteomics · Dec 10, 2024 · 7bbe64d · 7bbe64d
1 parent 7d56175
commit 7bbe64d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/tools/uniprotxml_downloader/macros.xml b/tools/uniprotxml_downloader/macros.xml
diff --git a/tools/uniprotxml_downloader/uniprotxml_downloader.xml b/tools/uniprotxml_downloader/uniprotxml_downloader.xml
@@ -1,7 +1,13 @@
-<tool id="uniprotxml_downloader" name="UniProt" version="2.4.0" profile="21.01">
+<tool id="uniprotxml_downloader" name="UniProt" version="2.4.0" profile="23.1">
     <description>download proteome as XML or fasta</description>
     <macros>
-        <import>macros.xml</import>
+        <xml name="query_field">
+            <param name="field" type="select" label="Field">
+                <option value="taxonomy_name">Taxonomy Name</option>
+                <option value="taxonomy_id">Taxonomy ID</option>
+                <option value="accession">Accession</option>
+            </param>
+        </xml>
     </macros>
     <requirements>
         <requirement type="package" version="2.25.1">requests</requirement>
@@ -36,8 +42,8 @@ python '$__tool_directory__/uniprotxml_downloader.py'
         <conditional name="input_method">
             <param name="input_choice" type="select" label="Select">
                 <option value="common">A Common Organism</option>
-                <option value="enter_ids">A manually entered list of Uniprot IDs</option>
-                <option value="history">A history dataset with a column containing Uniprot IDs</option>
+                <option value="enter_ids">A manually entered list of IDs</option>
+                <option value="history">A history dataset with a column containing IDs</option>
             </param>
             <when value="common">
                 <param name="organism" type="select" label="Common Organisms"