From 2eaca7d7d8efc0f5eff856e4bf304b7abc8c7b00 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 3 Aug 2018 15:50:44 +0200 Subject: [PATCH] [Minor] Changed SearchBuilder to AND not OR query --- .../main/java/li/strolch/search/SearchBuilder.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/li.strolch.agent/src/main/java/li/strolch/search/SearchBuilder.java b/li.strolch.agent/src/main/java/li/strolch/search/SearchBuilder.java index 0a4dcf0dd..8d2c99326 100644 --- a/li.strolch.agent/src/main/java/li/strolch/search/SearchBuilder.java +++ b/li.strolch.agent/src/main/java/li/strolch/search/SearchBuilder.java @@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory; *
  • format param:<bagId>:<paramId>:<value> adds search expression for given * bag/param
    • *
  • otherwise search expression for id and name are added
    • - *
  • all added search expressions are ORed
    • + *
  • all added search expressions are ANDed
    • * */ public class SearchBuilder { @@ -87,18 +87,18 @@ public class SearchBuilder { if (!part.startsWith("param:")) { if (se == null) - se = (SearchExpression) id(containsIgnoreCase(part)).or(name(containsIgnoreCase(part))); + se = (SearchExpression) id(containsIgnoreCase(part)).and(name(containsIgnoreCase(part))); else - se = se.or(id(containsIgnoreCase(part))).or(name(containsIgnoreCase(part))); + se = se.and(id(containsIgnoreCase(part))).and(name(containsIgnoreCase(part))); } else { String[] paramParts = part.split(":"); if (paramParts.length != 4) { if (se == null) - se = (SearchExpression) id(containsIgnoreCase(part)).or(name(containsIgnoreCase(part))); + se = (SearchExpression) id(containsIgnoreCase(part)).and(name(containsIgnoreCase(part))); else - se = se.or(id(containsIgnoreCase(part))).or(name(containsIgnoreCase(part))); + se = se.and(id(containsIgnoreCase(part))).and(name(containsIgnoreCase(part))); } else { @@ -109,7 +109,7 @@ public class SearchBuilder { if (se == null) se = param(bagId, paramId, containsIgnoreCase(value)); else - se = se.or(param(bagId, paramId, containsIgnoreCase(value))); + se = se.and(param(bagId, paramId, containsIgnoreCase(value))); } } }