From aec5e69f2cd3b673c31fe80b3f93d0ef694e89a8 Mon Sep 17 00:00:00 2001 From: Celine Mercier Date: Thu, 7 May 2020 17:08:07 +0200 Subject: [PATCH] C, views: no more automatic COUNT column if MERGED_sample column exists --- src/obiview.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/obiview.c b/src/obiview.c index 3a09e4c..d9c0166 100755 --- a/src/obiview.c +++ b/src/obiview.c @@ -1037,8 +1037,9 @@ static int finish_view(Obiview_p view) return -1; } - // Add count column if it's a NUC_SEQ_VIEW with no count column // TODO discuss - if ((!strcmp((view->infos)->view_type, VIEW_TYPE_NUC_SEQS)) && (!obi_view_column_exists(view, COUNT_COLUMN))) + // Add count column if it's a NUC_SEQ_VIEW with no count column (and there's no MERGED_sample column) // TODO discuss + if ((!strcmp((view->infos)->view_type, VIEW_TYPE_NUC_SEQS)) && (!obi_view_column_exists(view, COUNT_COLUMN)) + && (!obi_view_column_exists(view, "MERGED_sample"))) // TODO should eventually compute from merged samples? { if (obi_create_auto_count_column(view) < 0) {