Author: bbrossaud Date: 2010-08-16 12:16:48 +0200 (Mon, 16 Aug 2010) New Revision: 131 Url: http://chorem.org/repositories/revision/bonzoms/131 Log: the all search works well now Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java 2010-08-13 15:20:22 UTC (rev 130) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java 2010-08-16 10:16:48 UTC (rev 131) @@ -84,14 +84,19 @@ } protected Criteria getCriteriaBySearch(String str) { - Search search = Search.query().eq(Element.ELT_EXTENSION, Person.EXT_PERSON); - search = search.or().eq(Element.ELT_EXTENSION, Company.EXT_COMPANY); - search = search.eq(Element.ELT_EXTENSION, Employee.EXT_EMPLOYEE); - search = search.eq(Element.ELT_EXTENSION, Service.EXT_SERVICE); - search = search.eq(Element.ELT_EXTENSION, EmploymentContract.EXT_EMPLOYMENTCONTRACT); - search = search.eq(Element.ELT_EXTENSION, Address.EXT_ADDRESS); + Search search = Search.query(); + + Search searchOr = search.or(); + searchOr = searchOr.eq(Element.ELT_EXTENSION, Person.EXT_PERSON); + searchOr = searchOr.eq(Element.ELT_EXTENSION, Company.EXT_COMPANY); + searchOr = searchOr.eq(Element.ELT_EXTENSION, Employee.EXT_EMPLOYEE); + searchOr = searchOr.eq(Element.ELT_EXTENSION, Service.EXT_SERVICE); + searchOr = searchOr.eq(Element.ELT_EXTENSION, EmploymentContract.EXT_EMPLOYMENTCONTRACT); + searchOr = searchOr.eq(Element.ELT_EXTENSION, Address.EXT_ADDRESS); + if (str != null && !str.isEmpty()) { - search = search.and().keyword(str); + Search searchAnd = search.and(); + searchAnd.keyword(str); } Criteria criteria = search.criteria(); return criteria;