Author: tchemit Date: 2012-10-18 09:34:38 +0200 (Thu, 18 Oct 2012) New Revision: 738 Url: http://forge.codelutin.com/repositories/revision/echobase/738 Log: fixes #1607: Probl?\195?\168mes sur le filtre de recherche Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-10-18 07:27:32 UTC (rev 737) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-10-18 07:34:38 UTC (rev 738) @@ -23,6 +23,7 @@ */ package fr.ifremer.echobase.services; +import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -132,11 +133,12 @@ hql += " WHERE " + filterHql; } + Object[] params = paramsList.toArray(); + if (log.isInfoEnabled()) { - log.info("filterHql = " + hql); + log.info("filterHql = " + hql + "\n" + Joiner.on('\n').join(params)); } - Object[] params = paramsList.toArray(); long count = dao.countByQuery("SELECT COUNT(*) " + hql, params); @@ -367,7 +369,7 @@ data, filterParams); - ruleFilter = propertyName + " IN ( SELECT f FROM " + + ruleFilter = propertyName + " IN ( FROM " + columnMeta.getType().getName() + " " + fName + " WHERE " + subQuery + ")"; } else {