Revision 71559ffe
Added by Katja Luther over 2 years ago
| cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/TermVocabularyDaoImpl.java | ||
|---|---|---|
| 34 | 34 |
import eu.etaxonomy.cdm.model.view.AuditEvent; |
| 35 | 35 |
import eu.etaxonomy.cdm.persistence.dao.hibernate.common.IdentifiableDaoBase; |
| 36 | 36 |
import eu.etaxonomy.cdm.persistence.dao.term.ITermVocabularyDao; |
| 37 |
import eu.etaxonomy.cdm.persistence.dto.CharacterDto; |
|
| 37 | 38 |
import eu.etaxonomy.cdm.persistence.dto.FeatureDto; |
| 38 | 39 |
import eu.etaxonomy.cdm.persistence.dto.TermCollectionDto; |
| 39 | 40 |
import eu.etaxonomy.cdm.persistence.dto.TermDto; |
| ... | ... | |
| 307 | 308 |
} |
| 308 | 309 |
|
| 309 | 310 |
@Override |
| 310 |
public Collection<TermDto> getTopLevelTerms(UUID vocabularyUuid, TermType type) {
|
|
| 311 |
public List<TermDto> getTopLevelTerms(UUID vocabularyUuid, TermType type) {
|
|
| 311 | 312 |
String queryString; |
| 312 | 313 |
if (type.equals(TermType.NamedArea)){
|
| 313 | 314 |
queryString = TermDto.getTermDtoSelectNamedArea(); |
| 314 | 315 |
}else if (type.equals(TermType.Feature) || type.isKindOf(TermType.Feature)){
|
| 315 |
queryString = FeatureDto.getTermDtoSelect(); |
|
| 316 |
if (type.equals(TermType.Character)){
|
|
| 317 |
queryString = CharacterDto.getTermDtoSelect(); |
|
| 318 |
}else{
|
|
| 319 |
queryString = FeatureDto.getTermDtoSelect(); |
|
| 320 |
} |
|
| 316 | 321 |
}else{
|
| 317 | 322 |
queryString = TermDto.getTermDtoSelect(); |
| 318 | 323 |
} |
| 319 | 324 |
queryString = queryString |
| 320 |
+ "where v.uuid = :vocabularyUuid "
|
|
| 321 |
+ "and a.partOf is null " |
|
| 322 |
+ "and a.kindOf is null"; |
|
| 325 |
+ " where v.uuid = :vocabularyUuid ";
|
|
| 326 |
// + "and a.partOf is null "
|
|
| 327 |
// + "and a.kindOf is null";
|
|
| 323 | 328 |
Query query = getSession().createQuery(queryString); |
| 324 | 329 |
query.setParameter("vocabularyUuid", vocabularyUuid);
|
| 325 | 330 |
|
| ... | ... | |
| 327 | 332 |
List<Object[]> result = query.list(); |
| 328 | 333 |
List<TermDto> list = null; |
| 329 | 334 |
if (type.equals(TermType.Feature)|| type.isKindOf(TermType.Feature)){
|
| 330 |
list = FeatureDto.termDtoListFrom(result); |
|
| 335 |
if (type.equals(TermType.Character)){
|
|
| 336 |
list = CharacterDto.termDtoListFrom(result); |
|
| 337 |
}else{
|
|
| 338 |
list = FeatureDto.termDtoListFrom(result); |
|
| 339 |
} |
|
| 331 | 340 |
}else{
|
| 332 | 341 |
list = TermDto.termDtoListFrom(result); |
| 333 | 342 |
} |
Also available in: Unified diff
ref #9710: switch to dtos for descriptive data set and descriptions for character matrix