Revision e66d9d39
Added by Katja Luther about 13 years ago
| cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java | ||
|---|---|---|
| 33 | 33 |
import eu.etaxonomy.cdm.model.common.UuidAndTitleCache; |
| 34 | 34 |
import eu.etaxonomy.cdm.model.description.DescriptionElementBase; |
| 35 | 35 |
import eu.etaxonomy.cdm.model.description.TaxonDescription; |
| 36 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
|
| 36 | 37 |
import eu.etaxonomy.cdm.model.media.Media; |
| 37 | 38 |
import eu.etaxonomy.cdm.model.media.MediaRepresentation; |
| 38 | 39 |
import eu.etaxonomy.cdm.model.media.MediaUtils; |
| ... | ... | |
| 376 | 377 |
return heterotypicSynonymyGroups; |
| 377 | 378 |
} |
| 378 | 379 |
|
| 380 |
public List<UuidAndTitleCache<TaxonBase>> findTaxaAndNamesForEditor(ITaxonServiceConfigurator configurator){
|
|
| 381 |
|
|
| 382 |
List<UuidAndTitleCache<TaxonBase>> result = new ArrayList<UuidAndTitleCache<TaxonBase>>(); |
|
| 383 |
Class<? extends TaxonBase> clazz = null; |
|
| 384 |
if ((configurator.isDoTaxa() && configurator.isDoSynonyms())) {
|
|
| 385 |
clazz = TaxonBase.class; |
|
| 386 |
//propertyPath.addAll(configurator.getTaxonPropertyPath()); |
|
| 387 |
//propertyPath.addAll(configurator.getSynonymPropertyPath()); |
|
| 388 |
} else if(configurator.isDoTaxa()) {
|
|
| 389 |
clazz = Taxon.class; |
|
| 390 |
//propertyPath = configurator.getTaxonPropertyPath(); |
|
| 391 |
} else if (configurator.isDoSynonyms()) {
|
|
| 392 |
clazz = Synonym.class; |
|
| 393 |
//propertyPath = configurator.getSynonymPropertyPath(); |
|
| 394 |
} |
|
| 395 |
|
|
| 396 |
result = dao.getTaxaByNameForEditor(clazz, configurator.getSearchString(), configurator.getClassification(), configurator.getMatchMode(), configurator.getNamedAreas(), configurator.getTaxonPropertyPath()); |
|
| 397 |
return result; |
|
| 398 |
} |
|
| 379 | 399 |
/* (non-Javadoc) |
| 380 | 400 |
* @see eu.etaxonomy.cdm.api.service.ITaxonService#findTaxaAndNames(eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator) |
| 381 | 401 |
*/ |
| ... | ... | |
| 412 | 432 |
configurator.getSearchString(), configurator.getClassification(), configurator.getMatchMode(), |
| 413 | 433 |
configurator.getNamedAreas()); |
| 414 | 434 |
} |
| 435 |
|
|
| 415 | 436 |
if(configurator.getPageSize() == null || numberTaxaResults > configurator.getPageSize() * configurator.getPageNumber()){ // no point checking again if less results
|
| 416 | 437 |
taxa = dao.getTaxaByName(clazz, |
| 417 | 438 |
configurator.getSearchString(), configurator.getClassification(), configurator.getMatchMode(), |
Also available in: Unified diff
replace deprecated methods with new ones #2176