Project

General

Profile

« Previous | Next » 

Revision a48144fa

Added by Andreas Müller about 13 years ago

minor changes

View differences:

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
352 352
		String selectWhat;
353 353
		if (doForEditor){
354 354
			selectWhat = "t.uuid, t.titleCache ";
355
		}else selectWhat = (doCount ? "count(t)": "t");
355
		}else {
356
			selectWhat = (doCount ? "count(t)": "t");
357
		}
356 358
		
357 359
		String hql = "";
358 360
		Set<NamedArea> areasExpanded = new HashSet<NamedArea>();
......
865 867
		Query query = prepareTaxaByName(clazz, "nameCache", queryString, classification, matchMode, namedAreas, null, null, doCount);
866 868
		if (query != null) {
867 869
			return (Long)query.uniqueResult();
870
		}else{
871
			return 0;
868 872
		}
869
		return 0;
870
		
871 873
	}
872 874

  
873 875
	/**
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java
419 419
		assertEquals(numberOfTaxa, 3);
420 420
		numberOfTaxa = taxonDao.countTaxaByName(TaxonBase.class, "A*", null, MatchMode.BEGINNING, null);
421 421
		assertEquals(numberOfTaxa, 12);
422
		numberOfTaxa = taxonDao.countTaxaByName(TaxonBase.class, "Aasfwerfwf fffe", null, MatchMode.BEGINNING, null);
423
		assertEquals(numberOfTaxa, 0);
422 424
//	FIXME implement test for search in specific classification 		
423 425
//		Reference reference = referenceDao.findByUuid(UUID.fromString("596b1325-be50-4b0a-9aa2-3ecd610215f2"));
424 426
//		numberOfTaxa = taxonDao.countTaxaByName("A*", MatchMode.BEGINNING, SelectMode.ALL, null, null);

Also available in: Unified diff