bugfix for countTaxonDescriptionMedia

[cdmlib.git] / cdmlib-persistence / src / main / java / eu / etaxonomy / cdm / persistence / dao / hibernate / description / DescriptionDaoImpl.java

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 b1ab49585a80b218af47a17afe64a0664b77259f..5edbff1558cfd97af3587226f656d49fa78d2f48 100644 (file)
--- 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;\r
 \r
 import eu.etaxonomy.cdm.model.common.LSID;\r
-import eu.etaxonomy.cdm.model.common.Marker;\r
 import eu.etaxonomy.cdm.model.common.MarkerType;\r
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;\r
 import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
@@ -678,7 +677,11 @@ public class DescriptionDaoImpl extends IdentifiableDaoBase<DescriptionBase> imp
                    String queryString = " SELECT media " +\r
                                        getTaxonDescriptionMediaQueryString(\r
                                                taxonUuid, limitToGalleries,  markerTypes);\r
-\r
+                   queryString += \r
+                               " GROUP BY media " \r
+//                                                     " ORDER BY index(media) "  //not functional\r
+                               ;\r
+                   \r
                    Query query = getSession().createQuery(queryString);\r
 \r
                    setTaxonDescriptionMediaParameters(query, taxonUuid, limitToGalleries, markerTypes);\r
@@ -763,13 +766,7 @@ public class DescriptionDaoImpl extends IdentifiableDaoBase<DescriptionBase> imp
                        whereQueryString += ") ";\r
                }\r
                \r
-               String byQueryString = \r
-                       " GROUP BY media " \r
-//                                             " ORDER BY index(media) "  //not functional\r
-                       ;\r
-               \r
-               \r
-               return fromQueryString + whereQueryString + byQueryString;\r
+               return fromQueryString + whereQueryString;\r
                \r
        }\r
        \r