From 63333fe72cdfddd51a9bdaaea15acc450a3e80d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Todor=20Kondi=C4=87?= <kontrapunkt@uclmail.net>
Date: Fri, 7 Apr 2023 08:07:54 +0200
Subject: [PATCH] Prevent generating tables with multiple identical cols by
`get_data_from_key'.
---
R/plotting.R | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/R/plotting.R b/R/plotting.R
index 2e0745e..69b0c50 100644
--- a/R/plotting.R
+++ b/R/plotting.R
@@ -208,7 +208,7 @@ get_data_from_key <- function(db,tab,kvals,outcols) {
## Get precids.
mztab = db$precursors[cattab,on="catid"]
- outnames = c(valid_names,outcols)
+ outnames = union(valid_names,outcols)
tab[mztab,on="precid"][,..outnames]
}
@@ -332,17 +332,11 @@ narrow_summ <- function(db,summ,kvals,labs,...) {
keys = names(kvals)
nms = union(names(kvals),
labs)
- nms = union(nms,c(...))
+ nms = union(union("precid",nms),c(...))
nsumm = get_data_from_key(db=db,
tab=summ,
kvals=kvals,
outcols=nms)
- ## ## keys <- keys[!is.na(keys)]
- ## needed <- setdiff(labs,keys)
- ## x <- as.list(c(needed,...))
-
- ## x <- c(list(db=db,tab=summ,kvals=kvals),x)
- ## do.call(get_rows_from_summ,x)
nsumm
}
--
GitLab