(no commit message)

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java
index 4ac52f4a3a02c302addcdeb81babf5f3d2535c82..f285630fe76c1507848ec15aed8124626231d93b 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java
@@ -11,7 +11,7 @@ public interface INameService extends IIdentifiableEntityService<TaxonNameBase>
 \r
        public abstract String saveTaxonName(TaxonNameBase taxonName);\r
 \r
-       public abstract List<TaxonNameBase> getAllNames(int limit);\r
+       public abstract List<TaxonNameBase> getAllNames(int limit, int start);\r
 \r
        public abstract List<TaxonNameBase> getNamesByName(String name);\r
 \r

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
index a075a05263760c596eb8eab09adc4e08bbc167ec..97beb01e37130f8f02597c8f86597f0aadf96203 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
@@ -40,8 +40,8 @@ public class NameServiceImpl extends ServiceBase<TaxonNameBase> implements IName
                return super.saveCdmObject(taxonName);\r
        }\r
 \r
-       public List getAllNames(int limit){\r
-               return dao.list(limit);\r
+       public List getAllNames(int limit, int start){\r
+               return dao.list(limit, start);\r
        }\r
 \r
 }\r

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/ServiceBase.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/ServiceBase.java
index d074a7d9da13d562e4fcc419f792cb0e40358f6a..4136cd967ef2c3213e978c018a5e8bfa35fed303 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/ServiceBase.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/ServiceBase.java
@@ -39,8 +39,8 @@ public abstract class ServiceBase<T extends IdentifiableEntity> implements IIden
                return dao.find(title);\r
        }\r
 \r
-       protected List<T> list(Integer limit) {\r
-               return dao.list(limit);\r
+       protected List<T> list(int limit, int start) {\r
+               return dao.list(limit, start);\r
        }\r
 \r
 }\r

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/DaoBase.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/DaoBase.java
index 2bec97a05f8d7a2671fcf88080c053bf30a5f3f0..91d78cf9711f9f229ce172103d3bbaf26e340afe 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/DaoBase.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/DaoBase.java
@@ -7,6 +7,8 @@ import java.io.Serializable;
 import java.util.List;\r
 \r
 import org.apache.log4j.Logger;\r
+import org.hibernate.Criteria;\r
+import org.hibernate.Query;\r
 import org.hibernate.Session;\r
 import org.hibernate.SessionFactory;\r
 import org.springframework.beans.factory.annotation.Autowired;\r
@@ -74,14 +76,24 @@ public abstract class DaoBase<T extends VersionableEntity> implements IDao<T> {
                return true;\r
        }\r
 \r
-       public List<T> list(Integer limit) {\r
-               // TODO Auto-generated method stub\r
-               return null;\r
+       public List<T> list(int limit, int start) {\r
+               Session s = getSession();\r
+               Criteria crit = s.createCriteria(type); \r
+               crit.setFirstResult(start);\r
+               crit.setMaxResults(limit);\r
+               List<T> entities = crit.list(); \r
+               return entities; \r
        }\r
 \r
+       public List<CdmBase> executeHsql(String hsql){\r
+               Query q = getSession().createQuery(hsql);\r
+               return q.list();\r
+       }\r
 \r
+       \r
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.persistence.dao.IDao#find(java.lang.String)\r
         */\r
        public abstract List<T> find(String queryString);\r
+       \r
 }\r

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/IDao.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/IDao.java
index 96f48a88ac201fa062ed4254e843daf18e2f0eb2..3d198db60edba01ce3a86c9971d3d53a2a256530 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/IDao.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/persistence/dao/IDao.java
@@ -55,17 +55,10 @@ public interface IDao<T extends VersionableEntity> {
        
        public Boolean exists(String uuid);
 
-//********************************************//       
-       
-       
-       /**
-        * @param queryString
-        * @return List<T extends CdmBase>
-        * list object by searching on their title/lable.
-        * common.Identifyable.getTitleCache if existing
-        */
        public List<T> find(String queryString);
 
-       public List<T> list(Integer limit);
+       public List<CdmBase> executeHsql(String hsql);
+
+       public List<T> list(int limit, int start);
 
 }