From 99b798f1418a0be3d247de7223b8566744240ce8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Tue, 24 Jul 2012 22:01:29 +0000 Subject: [PATCH 1/1] bugfix for countTaxonDescriptionMedia --- .../hibernate/description/DescriptionDaoImpl.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoImpl.java index b1ab49585a..5edbff1558 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoImpl.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoImpl.java @@ -27,7 +27,6 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Repository; import eu.etaxonomy.cdm.model.common.LSID; -import eu.etaxonomy.cdm.model.common.Marker; import eu.etaxonomy.cdm.model.common.MarkerType; import eu.etaxonomy.cdm.model.description.CommonTaxonName; import eu.etaxonomy.cdm.model.description.DescriptionBase; @@ -678,7 +677,11 @@ public class DescriptionDaoImpl extends IdentifiableDaoBase imp String queryString = " SELECT media " + getTaxonDescriptionMediaQueryString( taxonUuid, limitToGalleries, markerTypes); - + queryString += + " GROUP BY media " +// " ORDER BY index(media) " //not functional + ; + Query query = getSession().createQuery(queryString); setTaxonDescriptionMediaParameters(query, taxonUuid, limitToGalleries, markerTypes); @@ -763,13 +766,7 @@ public class DescriptionDaoImpl extends IdentifiableDaoBase imp whereQueryString += ") "; } - String byQueryString = - " GROUP BY media " -// " ORDER BY index(media) " //not functional - ; - - - return fromQueryString + whereQueryString + byQueryString; + return fromQueryString + whereQueryString; } -- 2.34.1