Revision 359c3906
Added by Andreas Kohlbecker over 5 years ago
src/main/java/eu/etaxonomy/cdm/service/CdmFilterablePagingProvider.java | ||
---|---|---|
12 | 12 |
import java.util.Arrays; |
13 | 13 |
import java.util.List; |
14 | 14 |
|
15 |
import org.apache.log4j.Level; |
|
15 | 16 |
import org.apache.log4j.Logger; |
16 | 17 |
import org.hibernate.criterion.Criterion; |
17 | 18 |
import org.vaadin.viritin.fields.LazyComboBox.FilterableCountProvider; |
... | ... | |
157 | 158 |
if(logger.isTraceEnabled()){ |
158 | 159 |
logger.trace("findEntities() - page: " + page.getCurrentIndex() + "/" + page.getPagesAvailable() + " totalRecords: " + page.getCount() + "\n" + page.getRecords()); |
159 | 160 |
} |
161 |
|
|
162 |
Logger.getLogger("org.hibernate.SQL").setLevel(Level.WARN); |
|
160 | 163 |
return page.getRecords(); |
161 | 164 |
} |
162 | 165 |
|
... | ... | |
171 | 174 |
|
172 | 175 |
Pager<V> page; |
173 | 176 |
if(!restrictions.isEmpty()){ |
177 |
|
|
178 |
Logger.getLogger("org.hibernate.SQL").setLevel(Level.TRACE); |
|
174 | 179 |
List<Restriction<?>> preparedRestrictions = prepareRestrictions(filter, matchMode); |
175 | 180 |
page = (Pager<V>) service.findByTitleWithRestrictions( |
176 | 181 |
type, |
src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationWorkingsetEditorPresenter.java | ||
---|---|---|
35 | 35 |
import eu.etaxonomy.cdm.model.occurrence.Collection; |
36 | 36 |
import eu.etaxonomy.cdm.model.reference.Reference; |
37 | 37 |
import eu.etaxonomy.cdm.persistence.dao.common.Restriction; |
38 |
import eu.etaxonomy.cdm.persistence.dao.common.Restriction.Operator; |
|
38 | 39 |
import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD; |
39 | 40 |
import eu.etaxonomy.cdm.persistence.query.MatchMode; |
40 | 41 |
import eu.etaxonomy.cdm.service.CdmFilterablePagingProvider; |
... | ... | |
184 | 185 |
|
185 | 186 |
popuEditorTypeDesignationSourceRows.clear(); |
186 | 187 |
CdmFilterablePagingProvider<Collection, Collection> collectionPagingProvider = new CdmFilterablePagingProvider<Collection, Collection>(getRepo().getCollectionService()); |
187 |
collectionPagingProvider.getRestrictions().add(new Restriction<>("institute.titleCache", MatchMode.ANYWHERE, "{filter}"));
|
|
188 |
collectionPagingProvider.getRestrictions().add(new Restriction<>("institute.titleCache", Operator.OR, MatchMode.ANYWHERE, CdmFilterablePagingProvider.QUERY_STRING_PLACEHOLDER));
|
|
188 | 189 |
|
189 | 190 |
CdmFilterablePagingProvider<Reference, Reference> referencePagingProvider = pagingProviderFactory.referencePagingProvider(); |
190 | 191 |
|
Also available in: Unified diff
ref #7572 two bug fixes