From 05323a829431802c6daa5b4684c3eece1e764204 Mon Sep 17 00:00:00 2001 From: "a.babadshanjan" Date: Wed, 22 Apr 2009 13:59:55 +0000 Subject: [PATCH] Add sec restriction back in getTaxaByName --- .../dao/hibernate/taxon/TaxonDaoHibernateImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java index 91d483ffb1..9eac2f416d 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java @@ -214,13 +214,12 @@ public class TaxonDaoHibernateImpl extends IdentifiableDaoBase implem criteria.setFetchMode( "name", FetchMode.JOIN ); criteria.createAlias("name", "name"); + if (sec != null && sec.getId() != 0) { + criteria.add(Restrictions.eq("sec", sec ) ); + } + // FIXME: sec restriction caused problems in cich image import: results was empty -// if (sec != null){ -// if(sec.getId() == 0){ -// getSession().save(sec); -// } -// criteria.add(Restrictions.eq("sec", sec ) ); -// } + if (queryString != null) { criteria.add(Restrictions.ilike("name.nameCache", queryString)); } -- 2.34.1