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 8cbdebf7e5d5c8e6614dea460a739e59328158d1..7aae8cca07721df4cc8a40b819e75eab2d743995 100644 (file)
--- 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;
        }