From 183068e02ff243aed11fbd32290255fd16bdede2 Mon Sep 17 00:00:00 2001
From: Carsten Kemena <c.kemena@uni-muenster.de>
Date: Mon, 2 Jul 2018 16:09:16 +0200
Subject: [PATCH] fixed problem where query was always collapsed

---
 CHANGELOG        | 3 +++
 CMakeLists.txt   | 2 +-
 src/DBAccess.cpp | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1f8d961..a2a8dcb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v. 2.3.1
+- fixed: query was always collapse independently of parameter
+
 v. 2.3.0
 - added option to display computed alignments
 - added option to collapse domain repeats
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2753319..ce60c8d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.6)
 project (RADS C CXX)
 SET(MAJOR_VERSION 2)
 SET(MINOR_VERSION 3)
-SET(PATCH_VERSION 0)
+SET(PATCH_VERSION 1)
 
 
 SET(CMAKE_CXX_FLAGS_COVERAGE
diff --git a/src/DBAccess.cpp b/src/DBAccess.cpp
index 4dfc14f..32150c9 100644
--- a/src/DBAccess.cpp
+++ b/src/DBAccess.cpp
@@ -90,7 +90,8 @@ DBAccess::search(BSDL::AlignmentMatrix<int, BSDL::DSM> &matrix, bool all, bool c
                  RadsQueryResult &results)
 {
 	auto &queryDA = results.queryDA;
-	queryDA.collapse(true);
+	if (collapse)
+		queryDA.collapse(true);
     string query = "Select position from domain where accession in ('"  + queryDA[0].accession() + "'";
 	size_t nDomains = queryDA.size();
 	for (size_t i=1; i<nDomains; ++i)
-- 
GitLab