added id to uuidAndTitleCache #4799 (bugfix)

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 a10df713c2240cf8ec875741635dfac0078ab019..246a6638428ee0f938e6eab9eb6b49d8ce7c069c 100644 (file)
--- 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
@@ -283,15 +283,15 @@ public class TaxonDaoHibernateImpl extends IdentifiableDaoBase<TaxonBase> implem
                 // see FIXME in 'prepareQuery' for more details\r
                 if (doTaxa && doSynonyms){\r
                     if (result[2].equals("synonym")) {\r
-                        resultObjects.add( new UuidAndTitleCache(Synonym.class, (UUID) result[0], (Integer) result[1], (String)result[1], new Boolean(result[4].toString())));\r
+                        resultObjects.add( new UuidAndTitleCache(Synonym.class, (UUID) result[0], (Integer) result[1], (String)result[2], new Boolean(result[4].toString())));\r
                     }\r
                     else {\r
-                        resultObjects.add( new UuidAndTitleCache(Taxon.class, (UUID) result[0], (Integer) result[1], (String)result[1], new Boolean(result[4].toString())));\r
+                        resultObjects.add( new UuidAndTitleCache(Taxon.class, (UUID) result[0], (Integer) result[1], (String)result[2], new Boolean(result[4].toString())));\r
                     }\r
                 }else if (doTaxa){\r
-                        resultObjects.add( new UuidAndTitleCache(Taxon.class, (UUID) result[0], (Integer) result[1], (String)result[1], new Boolean(result[4].toString())));\r
+                        resultObjects.add( new UuidAndTitleCache(Taxon.class, (UUID) result[0], (Integer) result[1], (String)result[2], new Boolean(result[4].toString())));\r
                 }else if (doSynonyms){\r
-                    resultObjects.add( new UuidAndTitleCache(Synonym.class, (UUID) result[0], (Integer) result[1], (String)result[1], new Boolean(result[4].toString())));\r
+                    resultObjects.add( new UuidAndTitleCache(Synonym.class, (UUID) result[0], (Integer) result[1], (String)result[2], new Boolean(result[4].toString())));\r
                 }\r
             }\r
 \r
@@ -786,10 +786,7 @@ public class TaxonDaoHibernateImpl extends IdentifiableDaoBase<TaxonBase> implem
                 }\r
             }\r
 \r
-\r
             return query;\r
-\r
-\r
     }\r
 \r
 \r
@@ -892,30 +889,6 @@ public class TaxonDaoHibernateImpl extends IdentifiableDaoBase<TaxonBase> implem
         }\r
     }\r
 \r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonDao#countTaxaByName(java.lang.String, eu.etaxonomy.cdm.persistence.query.MatchMode, eu.etaxonomy.cdm.persistence.query.SelectMode)\r
-//      */\r
-//     public Integer countTaxaByName(String queryString, MatchMode matchMode, SelectMode selectMode) {\r
-//             return countTaxaByName(queryString, matchMode, selectMode, null);\r
-//     }\r
-\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonDao#countTaxaByName(java.lang.String, eu.etaxonomy.cdm.persistence.query.MatchMode, eu.etaxonomy.cdm.persistence.query.SelectMode, eu.etaxonomy.cdm.model.reference.Reference)\r
-//      */\r
-//     public Integer countTaxaByName(String queryString,\r
-//                     MatchMode matchMode, SelectMode selectMode, Reference sec) {\r
-//\r
-//             Long count = countTaxaByName(queryString, matchMode, selectMode, sec, null);\r
-//             return count.intValue();\r
-//\r
-//     }\r
-\r
-//     public Integer countTaxaByName(String queryString, MatchMode matchMode, Boolean accepted) {\r
-//\r
-//             SelectMode selectMode = (accepted ? SelectMode.TAXA : SelectMode.SYNONYMS);\r
-//             Long count = countTaxaByName(queryString, matchMode, selectMode, null, null);\r
-//             return count.intValue();\r
-//     }\r
 \r
     @Override\r
     public List<TaxonBase> getAllTaxonBases(Integer pagesize, Integer page) {\r
@@ -1704,10 +1677,7 @@ public class TaxonDaoHibernateImpl extends IdentifiableDaoBase<TaxonBase> implem
         return countAllRelationships(null);\r
     }\r
 \r
-    /*\r
-     * (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonDao#countAllRelationships()\r
-     */\r
+\r
     //FIXME add to interface or make private\r
     public int countAllRelationships(Class<? extends RelationshipBase> clazz) {\r
         if (clazz != null && ! TaxonRelationship.class.isAssignableFrom(clazz) && ! SynonymRelationship.class.isAssignableFrom(clazz) ){\r
@@ -2252,12 +2222,4 @@ public class TaxonDaoHibernateImpl extends IdentifiableDaoBase<TaxonBase> implem
         }\r
         return results;\r
        }\r
-\r
-\r
-       public static void main(String[] args){\r
-\r
-               System.out.println(String.format("%%", "Hallo"));\r
-       }\r
-\r
-\r
 }\r