# HG changeset patch # User galaxyp # Date 1465415619 14400 # Node ID 7399b23db662608cc04fb4e1a5a74ed1377f20f7 # Parent c922df2f9c2aad77b404c38361d6c478a71c7c01 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tools/bumbershoot/data_manager_customProDB commit 98f3323d4b92a4a3668788b3e1bad1a6529fd6df-dirty diff -r c922df2f9c2a -r 7399b23db662 data_manager/customProDB_annotation.R --- a/data_manager/customProDB_annotation.R Tue May 31 13:02:29 2016 -0400 +++ b/data_manager/customProDB_annotation.R Wed Jun 08 15:53:39 2016 -0400 @@ -49,14 +49,18 @@ { dbsnp = NULL } - - if (length(cosmic) > 0 && cosmic && grepl("^hg", dbkey)) + + use_cosmic = NULL + if (length(cosmic) > 0) { - use_cosmic = TRUE - } - else - { - use_cosmic = NULL + if (grepl("^hg", dbkey)) + { + use_cosmic = TRUE + } + else + { + gstop("COSMIC annotation requested but dbkey does not indicate a human genome (e.g. hg19)") + } } suppressPackageStartupMessages(library(rjson))