*** c:/Documents and Settings/Benjamin/Workspaces/workspace-sts-2.1.0.SR01/filterpane-tests/plugins/filterpane-0.6.2/grails-app/services/com/zeddware/grails/plugins/filterpane/Copy of FilterService.groovy Tue Oct 27 11:25:41 2009 --- c:/Documents and Settings/Benjamin/Workspaces/workspace-sts-2.1.0.SR01/filterpane-tests/plugins/filterpane-0.6.2/grails-app/services/com/zeddware/grails/plugins/filterpane/FilterService.groovy Tue Oct 27 11:36:44 2009 *************** *** 15,27 **** private def filter(def params, Class filterClass, boolean doCount) { if (log.isDebugEnabled()) log.debug("filtering... params = ${params.toMapString()}") ! //def filterProperties = params?.filterProperties?.tokenize(',') def filterParams = params.filter ? params.filter : params def filterOpParams = filterParams.op def associationList = [] def domainClass = FilterUtils.resolveDomainClass(grailsApplication, filterClass) ! //if (filterProperties != null) { def c = filterClass.createCriteria() --- 15,27 ---- private def filter(def params, Class filterClass, boolean doCount) { if (log.isDebugEnabled()) log.debug("filtering... params = ${params.toMapString()}") ! def filterProperties = params?.filterProperties?.tokenize(',') def filterParams = params.filter ? params.filter : params def filterOpParams = filterParams.op def associationList = [] def domainClass = FilterUtils.resolveDomainClass(grailsApplication, filterClass) ! if (filterProperties != null) { def c = filterClass.createCriteria() *************** *** 132,143 **** results = 0I } return results ! // } else { ! // if (doCount) { ! // return 0I ! // } ! // return filterClass.list(params) ! // } } private def addCriterion(def criteria, def propertyName, def op, def value, def value2) { --- 132,143 ---- results = 0I } return results ! } else { ! if (doCount) { ! return 0I ! } ! return filterClass.list(params) ! } } private def addCriterion(def criteria, def propertyName, def op, def value, def value2) {