Author: echatellier Date: 2011-03-04 17:35:52 +0100 (Fri, 04 Mar 2011) New Revision: 745 Url: http://nuiton.org/repositories/revision/wikitty/745 Log: #1381 : Can't use same Search criteria twice Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2011-03-04 15:57:39 UTC (rev 744) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2011-03-04 16:35:52 UTC (rev 745) @@ -483,9 +483,10 @@ Restriction result; if (restrictions.isEmpty() && subSearchs.isEmpty()) { result = RestrictionHelper.rFalse(); - + } else if (restrictions.size() == 1 && subSearchs.isEmpty()) { - result = restrictions.remove(0); + // WARN , was restrictions.remove(0); but uncommented :( + result = restrictions.get(0); } else if (subSearchs.size() == 1 && restrictions.isEmpty()) { Search subSearch = subSearchs.get(0); Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java 2011-03-04 15:57:39 UTC (rev 744) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java 2011-03-04 16:35:52 UTC (rev 745) @@ -309,9 +309,7 @@ ws.delete(null, Collections.singleton(toDeleteWikitty.getId())); // try to look for it after deletion - Search query2 = Search.query(); - query2.eq(Element.ELT_ID, "wikkitytodelete"); - Assert.assertEquals(0, proxy.findAllByCriteria(query2.criteria()).getNumFound()); - Assert.assertEquals(0, ws.findAllByCriteria(null, query2.criteria()).getNumFound()); + Assert.assertEquals(0, proxy.findAllByCriteria(query.criteria()).getNumFound()); + Assert.assertEquals(0, ws.findAllByCriteria(null, query.criteria()).getNumFound()); } }