--- a/VCF_to_VariantDB.xml	Wed May 08 04:34:30 2013 -0400
+++ b/VCF_to_VariantDB.xml	Wed Feb 19 06:45:32 2014 -0500
@@ -1,14 +1,17 @@
-<tool id="VCF_to_DB_rev" name="Send VCF file to the Database" version="0.1.1">
-  <description>Reverse processing (on VariantDB server)</description>
+<tool id="VCF_to_DB_rev" name="VCF to VariantDB" version="0.1.2">
+  <description></description>
+  <expand macro="requirements" />
+  <macros>
+    <import>VCF_to_VariantDB_macros.xml</import>
+  </macros>
   <command interpreter="perl">
-    VCF_to_VariantDB.pl
-      ## THE GALAXY HOST 
-      -H 'http://143.169.238.104/galaxy'
+    VCF_to_DB_reverse.pl
+      -H '@URL@'
       -R $__root_dir__
       ## input file
       -v $input1
       -V $__app__.security.encode_id( '%s' % $input1.id )
-      ## user email, for identification in VariantDB, accounts must match
+      ## user email, for identification in DataBase
       -u $__user_email__
       
       ## OUTPUT FILE 
@@ -64,7 +67,7 @@
 		<option value="other">Select a file to base the name on</option>
 	  </param>
  	  <when value="typed">
-		<param name="typedname" type="text" size="25" label="Sample Name for Report." />
+		<param name="typedname" type="text" size="25" label="Sample Name." />
 	  </when>
 	  <when value="other">
 		<param name="namefile" type="data" format="sam,bam,fastq,fasta,bed,fastqsanger,fastqillumina,txt,vcf" label="Select a file from the history to base the sample name upon" />
@@ -77,7 +80,6 @@
 	</param>
 	<param name="server" type="select" label="VariantDB-Server: " help="Specify the VariantDB server you wish to send the data to. You MUST have a valid account on the target server, identical to your account here.">
 		<option value="http://143.169.238.104/variantdb/">Main Server @ University of Antwerp</option>
-		<!-- Specify other VariantDB instances here -->
 	</param>
   </inputs>
   <outputs>
@@ -87,16 +89,14 @@
 
 **What it does**
 
-This tools sends the results from the GATK unified genotyper to a VariantDB server. From there, variants can be compared between samples, filtered on various annotations etc.  To add servers, specify them in the tool configuration XML file. Accounts must match between the chosen VariantDB and Galaxy user. 
-
-VariantDB is an flexible portal for filtering and annotating variants. 
+This tools sends the results from the GATK unified genotyper to a VariantDB server. From there, variants can be compared between samples, filtered on various annotations etc.  To add servers, specify them in the tool configuration XML file. 
 
 ------
 
 
 **Input file**
 
-VCF file from the GATK Unified Genotyper. Optional : BAM file for storage in VariantDB and subsequent visualisation in IGV.
+VCF file from the GATK Unified Genotyper.
 
 ------