# HG changeset patch
# User bgruening
# Date 1423338566 18000
# Node ID e1326442d13febc301191db150d85ae06e477f5c
# Parent  e6ce730fbba6fee57e6f095aeccb53545f3b921d
Uploaded

diff -r e6ce730fbba6 -r e1326442d13f datatypes_conf.xml
--- a/datatypes_conf.xml	Sat Feb 07 14:32:02 2015 -0500
+++ b/datatypes_conf.xml	Sat Feb 07 14:49:26 2015 -0500
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <datatypes>
     <registration>
-        <datatype extension="diamond_database" type="galaxy.datatypes.binary:CompressedArchive" subclass="True" display_in_upload="False"/>
+        <datatype extension="diamond_database" type="galaxy.datatypes.binary:Binary" subclass="True" display_in_upload="False"/>
     </registration>
 </datatypes>
diff -r e6ce730fbba6 -r e1326442d13f diamand.xml
--- a/diamand.xml	Sat Feb 07 14:32:02 2015 -0500
+++ b/diamand.xml	Sat Feb 07 14:49:26 2015 -0500
@@ -67,7 +67,7 @@
             </param>
           </when>  <!-- build-in -->
           <when value="history">
-            <param name="reference_database" type="data" format="compressed_archive" label="Select the reference database" />
+            <param name="reference_database" type="data" format="diamond_database" label="Select the reference database" />
           </when>  <!-- history -->
         </conditional>
 
@@ -139,7 +139,7 @@
         <test>
             <param name="method" value="blastp"/>
             <param name="query" value="protein.fasta" ftype="fasta"/>
-            <param name="reference_database" value="diamond_makedb_result1.dmnd" ftype="compressed_archive"/>
+            <param name="reference_database" value="diamond_makedb_result1.dmnd" ftype="diamond_database"/>
             <param name="db_source" value="history"/>
             <output name="blast_output" file="diamond_result1.tabular" ftpye="tabular"/>
         </test>
diff -r e6ce730fbba6 -r e1326442d13f diamand_makedb.xml
--- a/diamand_makedb.xml	Sat Feb 07 14:32:02 2015 -0500
+++ b/diamand_makedb.xml	Sat Feb 07 14:49:26 2015 -0500
@@ -19,12 +19,12 @@
     </inputs>
 
     <outputs>
-        <data format="compressed_archive" name="outfile" label="Diamond database ${on_string}"/>
+        <data format="diamond_database" name="outfile" label="Diamond database ${on_string}"/>
     </outputs>
     <tests>
         <test>
             <param name="infile" value="protein.fasta" ftype="fasta"/>
-            <output name="outfile" file="diamond_makedb_result1.dmnd" ftpye="compressed_archive"/>
+            <output name="outfile" file="diamond_makedb_result1.dmnd" ftpye="diamond_database"/>
         </test>
     </tests>
     <help>