From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 25 Sep 2023 11:43:26 +0000 (+0200)
Subject: Make the where clause of basic search accessible
X-Git-Tag: v2.3.19~8
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=34c5b53472920a6fd7fa1ff98ca71319e64ad404;p=lgpl%2Fargeo-commons.git

Make the where clause of basic search accessible
---

diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/search/BasicSearch.java b/org.argeo.api.acr/src/org/argeo/api/acr/search/BasicSearch.java
index 8cbdebf7e..7aae8cca0 100644
--- a/org.argeo.api.acr/src/org/argeo/api/acr/search/BasicSearch.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/search/BasicSearch.java
@@ -57,11 +57,11 @@ public class BasicSearch {
 	}
 
 	public BasicSearch where(Consumer<AndFilter> and) {
-		if (where != null)
-			throw new IllegalStateException("A where clause is already set");
-		AndFilter subFilter = new AndFilter();
-		and.accept(subFilter);
-		where = subFilter;
+//		if (where != null)
+//			throw new IllegalStateException("A where clause is already set");
+//		AndFilter subFilter = new AndFilter();
+		and.accept((AndFilter) getWhere());
+//		where = subFilter;
 		return this;
 	}
 
@@ -74,6 +74,8 @@ public class BasicSearch {
 	}
 
 	public ContentFilter<? extends Composition> getWhere() {
+		if (where == null)
+			where = new AndFilter();
 		return where;
 	}