# HG changeset patch
# User tomnl
# Date 1560509756 14400
# Node ID 054189c06bb171af9aba04069508fa0bdb3c5074
# Parent  a0340736713568ef206798a0a2340de3c348158e
planemo upload for repository https://github.com/computational-metabolomics/mspurity-galaxy commit d9efa3f24732a92c2bcef5987289179e86d5c50f-dirty

diff -r a03407367135 -r 054189c06bb1 createDatabase.R
--- a/createDatabase.R	Tue Jun 04 10:48:33 2019 -0400
+++ b/createDatabase.R	Fri Jun 14 06:55:56 2019 -0400
@@ -68,11 +68,25 @@
 print(opt)
 
 loadRData <- function(rdata_path, name){
-  #loads an RData file, and returns the named xset object if it is there
-  load(rdata_path)
-  return(get(ls()[ls() == name]))
+#loads an RData file, and returns the named xset object if it is there
+    load(rdata_path)
+    return(get(ls()[ls() %in% name]))
 }
 
+getxcmsSetObject <- function(xobject) {
+    # XCMS 1.x
+    if (class(xobject) == "xcmsSet")
+        return (xobject)
+    # XCMS 3.x
+    if (class(xobject) == "XCMSnExp") {
+        # Get the legacy xcmsSet object
+        suppressWarnings(xset <- as(xobject, 'xcmsSet'))
+        sampclass(xset) <- xset@phenoData$sample_group
+        return (xset)
+    }
+}
+
+
 print(paste('pa', opt$pa))
 print(opt$xset)
 
@@ -84,8 +98,11 @@
 print(pa@fileList)
 
 
+
 if (opt$xcms_camera_option=='xcms'){
-  xset <- loadRData(opt$xset, 'xset')
+  
+  xset <- loadRData(opt$xset, c('xset','xdata'))
+  xset <- getxcmsSetObject(xset)
   fix <- xset_pa_filename_fix(opt, pa, xset)  
   pa <- fix[[1]]
   xset <- fix[[2]]
@@ -111,9 +128,9 @@
 
 dbPth <- msPurity::createDatabase(pa,
                                    xset=xset,
-#                                   xsa=xa, 
+                                   xsa=xa, 
                                    outDir=opt$outDir,
-#                                   grpPeaklist=grpPeaklist,
+                                   grpPeaklist=grpPeaklist,
                                    dbName='createDatabase_output.sqlite'
 )