From 60c02491849ce23f93adabb6d80ae11231ca65db Mon Sep 17 00:00:00 2001
From: vkovtun <viktor.kovtun@id.ethz.ch>
Date: Thu, 2 Mar 2023 17:05:00 +0100
Subject: [PATCH] SSDM-13449: Added back the support of quotation marks in the
global search.
---
.../server/dataaccess/db/HibernateSearchDAOV3Adaptor.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOV3Adaptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOV3Adaptor.java
index 91415f26c92..ee950a9ec56 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOV3Adaptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOV3Adaptor.java
@@ -113,7 +113,12 @@ public class HibernateSearchDAOV3Adaptor implements IHibernateSearchDAO {
// Obtain global criteria
GlobalSearchCriteria globalSearchCriteria = getCriteria(searchableEntity);
- globalSearchCriteria.withText().thatMatches(searchTerm);
+
+ if (searchTerm.startsWith("\"") && searchTerm.endsWith("\"")) {
+ globalSearchCriteria.withText().thatMatches(searchTerm.substring(1, searchTerm.length() - 1));
+ } else {
+ globalSearchCriteria.withText().thatMatches(searchTerm);
+ }
operationLog.info("ADAPTED [FULL TEXT SEARCH] : " + searchableEntity + " [" + searchTerm + "] " + useWildcardSearchMode);
--
GitLab