# HG changeset patch
# User tomnl
# Date 1525345155 14400
# Node ID c8db1946f37d594283991687daa7bc5e39f166ce
# Parent  ba45716d676d2680297b20eeb6bacffa93afb989
planemo upload for repository https://github.com/computational-metabolomics/dma-tools-galaxy commit 578fd07833b93847193666c11744ba0bca1aaf57-dirty

diff -r ba45716d676d -r c8db1946f37d cameradims.R
--- a/cameradims.R	Thu May 03 06:43:30 2018 -0400
+++ b/cameradims.R	Thu May 03 06:59:15 2018 -0400
@@ -81,12 +81,16 @@
 
 
 if (opt$rule_type=='extended_large'){
+
+   rule_sep=','
    opt$rule_type <- 'user'
    if(opt$polarity=='pos'){
-	opt$rule_path <-  read.csv(system.file("rules", "CAMERA_rules_PosFinal_PlusLi.csv", package = "cameraDIMS"),  header=TRUE)
+	opt$rule_path <-  system.file("rules", "CAMERA_rules_PosFinal_PlusLi.csv", package = "cameraDIMS")
    }else{
-	opt$rule_path <-  read.csv(system.file("rules", "CAMERA_rules_NegFinal_PlusLi.csv", package = "cameraDIMS"),  header=TRUE)
+	opt$rule_path <-  system.file("rules", "CAMERA_rules_NegFinal_PlusLi.csv", package = "cameraDIMS")
    }   
+}else{
+   rule_sep='\t'
 }
 
 cameraOut <- cameraDIMS(data=df,
@@ -94,7 +98,7 @@
                         params_adduct=paramadduct,
                         rule_type=opt$rule_type,
                         rule_pth=opt$rule_path,
-                        rule_sep='\t',
+                        rule_sep=rule_sep,
                         rule_export=rule_export)
 
 
diff -r ba45716d676d -r c8db1946f37d cameradims.xml
--- a/cameradims.xml	Thu May 03 06:43:30 2018 -0400
+++ b/cameradims.xml	Thu May 03 06:59:15 2018 -0400
@@ -1,4 +1,4 @@
-<tool id="cameradims" name="CAMERA_DIMS" version="0.1.16">
+<tool id="cameradims" name="CAMERA_DIMS" version="0.1.17">
     <description>Modification of the R package CAMERA to work on DIMS data</description>
     <requirements>
         <requirement type="package" version="3.4.1">R</requirement>