This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wikitty. See http://git.nuiton.org/wikitty.git commit 77e372e590c93a895d3cf5ca5e215dfecf6397b1 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Tue Jul 21 00:43:46 2015 +0200 fixes #3735: containsOne and containsAll with an empty collection returns all objects but no object should have been returned --- .../org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java | 4 ++-- .../java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java b/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java index cde2fdd..52b8e40 100644 --- a/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java +++ b/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java @@ -453,7 +453,7 @@ public class WikittyQueryVisitorToSolr extends WikittyQueryVisitor { public boolean visitEnter(ContainsAll o) { List<String> values = evalConditionValueAsList(o.getValues()); if (values.size() == 0) { - solrQuery += "( *:* - *:* )"; // false / rien + solrQuery += WikittySolrConstant.SOLR_FALSE; // false / rien } else { String element2solr = element2solr(o.getElement()); @@ -484,7 +484,7 @@ public class WikittyQueryVisitorToSolr extends WikittyQueryVisitor { public boolean visitEnter(ContainsOne o) { List<String> values = evalConditionValueAsList(o.getValues()); if (values.size() == 0) { - solrQuery += "( *:* - *:* )"; // false / rien + solrQuery += WikittySolrConstant.SOLR_FALSE; // false / rien } else { String element2solr = element2solr(o.getElement()); diff --git a/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java b/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java index 9e0c380..c31a473 100644 --- a/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java +++ b/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java @@ -92,4 +92,7 @@ public interface WikittySolrConstant { static final public String SUFFIX_STRING_LOWERCASE = SOLR_WIKITTY_SUFFIX + "c"; static final public String SUFFIX_STRING_FULLTEXT = SOLR_WIKITTY_SUFFIX + "t"; + + // expression always false. (#id:* -#id:*) /!\ no space between '-' and '#id' + static final public String SOLR_FALSE = "(" + SOLR_ID + ":* -" + SOLR_ID + ":*)"; } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.