From 6afe5cec3f56ea60ad5e0554f7b3a281bc1f35da Mon Sep 17 00:00:00 2001
From: Gavin Rhys Lloyd <grlloyd@users.noreply.github.com>
Date: Thu, 27 Jun 2024 09:32:29 +0100
Subject: [PATCH] fix untarg import

---
 DESCRIPTION   | 2 +-
 NEWS          | 3 +++
 R/class_def.R | 8 ++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index c3d8af7..97b79c6 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: metabolomicsWorkbenchR
 Type: Package
 Title: Metabolomics Workbench in R
-Version: 1.14.0
+Version: 1.14.1
 Authors@R: c(
     person(
         c("Gavin","Rhys"),
diff --git a/NEWS b/NEWS
index a218b5f..93c946b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Changes in 1.15.1
++ fix untarg import
+
 Changes in 1.11.1
 + further vignette cache improvements
 
diff --git a/R/class_def.R b/R/class_def.R
index bd2834a..ec7aa1d 100644
--- a/R/class_def.R
+++ b/R/class_def.R
@@ -804,7 +804,7 @@ setMethod(f = 'do_query',
             return(out)
         } else if (input_item$name == 'analysis_id') {
             df = do_query(context$name,input_item$name,input_value,'datatable')
-            nf=attributes(df)$number_of_factors
+            nf = attributes(df)$number_of_factors
 
             X=as.data.frame(t(df))
 
@@ -869,10 +869,10 @@ setMethod(f = 'do_query',
         df = do_query(context$name,input_item$name,input_value,'untarg_data')
         fq = do_query('study','analysis_id',input_value,'untarg_factors')
 
-        fq=fq[,-1]
+        fq$count=NULL
 
-        SM=as.data.frame(df[,colnames(fq)])
-        df[,colnames(fq)]=NULL
+        SM=df[,colnames(fq),drop=FALSE]
+        df[,colnames(fq),drop=FALSE]=NULL
 
         df=as.data.frame(t(df))
         VM=data.frame(feature_id=rownames(df))