Revision 363387d2
Added by Andreas Müller about 8 years ago
| cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java | ||
|---|---|---|
| 227 | 227 |
} |
| 228 | 228 |
|
| 229 | 229 |
|
| 230 |
|
|
| 231 | 230 |
@Override |
| 232 | 231 |
public Pager<Media> getMedia(DescriptionElementBase descriptionElement, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
|
| 233 | 232 |
Integer numberOfResults = descriptionElementDao.countMedia(descriptionElement); |
| ... | ... | |
| 252 | 251 |
return listTaxonDescriptions(taxon, scopes, geographicalScope, markerTypes, pageSize, pageNumber, propertyPaths); |
| 253 | 252 |
} |
| 254 | 253 |
|
| 255 |
|
|
| 256 |
/* (non-Javadoc) |
|
| 257 |
* @see eu.etaxonomy.cdm.api.service.IDescriptionService#pageMarkedTaxonDescriptions(eu.etaxonomy.cdm.model.taxon.Taxon, java.util.Set, java.util.Set, java.util.Set, java.lang.Integer, java.lang.Integer, java.util.List) |
|
| 258 |
*/ |
|
| 259 | 254 |
@Override |
| 260 | 255 |
public Pager<TaxonDescription> pageTaxonDescriptions(Taxon taxon, Set<DefinedTerm> scopes, Set<NamedArea> geographicalScope, Set<MarkerType> markerTypes, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
|
| 261 | 256 |
Integer numberOfResults = dao.countTaxonDescriptions(taxon, scopes, geographicalScope, markerTypes); |
| ... | ... | |
| 275 | 270 |
} |
| 276 | 271 |
|
| 277 | 272 |
|
| 278 |
/* (non-Javadoc) |
|
| 279 |
* @see eu.etaxonomy.cdm.api.service.IDescriptionService#listTaxonDescriptionMedia(UUID, boolean, Set, Integer, Integer, List) |
|
| 280 |
*/ |
|
| 281 | 273 |
@Override |
| 282 | 274 |
public List<Media> listTaxonDescriptionMedia(UUID taxonUuid, boolean limitToGalleries, Set<MarkerType> markerTypes, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
|
| 283 | 275 |
return this.dao.listTaxonDescriptionMedia(taxonUuid, limitToGalleries, markerTypes, pageSize, pageNumber, propertyPaths); |
| 284 | 276 |
} |
| 285 | 277 |
|
| 286 |
/* |
|
| 287 |
* @see IDescriptionService#countTaxonDescriptionMedia(UUID, boolean, Set) |
|
| 288 |
*/ |
|
| 289 | 278 |
@Override |
| 290 | 279 |
public int countTaxonDescriptionMedia(UUID taxonUuid, boolean limitToGalleries, Set<MarkerType> markerTypes){
|
| 291 | 280 |
return this.dao.countTaxonDescriptionMedia(taxonUuid, limitToGalleries, markerTypes); |
| 292 | 281 |
} |
| 293 | 282 |
|
| 294 |
|
|
| 295 |
/* (non-Javadoc) |
|
| 296 |
* @see eu.etaxonomy.cdm.api.service.IDescriptionService#getOrderedDistributions(java.util.Set, boolean, boolean, java.util.Set, java.util.List) |
|
| 297 |
*/ |
|
| 298 | 283 |
@Override |
| 299 | 284 |
@Deprecated |
| 300 | 285 |
public DistributionTree getOrderedDistributions( |
| ... | ... | |
| 351 | 336 |
distList.clear(); |
| 352 | 337 |
distList.addAll(filteredDistributions); |
| 353 | 338 |
|
| 354 |
return DescriptionUtility.orderDistributions(definedTermDao, omitLevels, distList, hiddenAreaMarkerTypes); |
|
| 339 |
return DescriptionUtility.orderDistributions(definedTermDao, omitLevels, distList, hiddenAreaMarkerTypes, null);
|
|
| 355 | 340 |
} |
| 356 | 341 |
|
| 357 | 342 |
|
| ... | ... | |
| 819 | 804 |
|
| 820 | 805 |
} |
| 821 | 806 |
|
| 822 |
|
|
| 823 |
|
|
| 824 | 807 |
} |
Also available in: Unified diff
Implement natural ordering for distributions in data portal #5677