merge from trunk
[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / service / TaxonServiceImpl.java
index e976a48126b9ecc8e21824458a15a268c54091da..ca038d6cc97c6fa33d14ee686b76d5db304e3f8c 100644 (file)
@@ -33,13 +33,10 @@ import org.apache.lucene.search.DocIdSet;
 import org.apache.lucene.search.Query;\r
 import org.apache.lucene.search.QueryWrapperFilter;\r
 import org.apache.lucene.search.SortField;\r
-import org.hibernate.ObjectDeletedException;\r
 import org.springframework.beans.factory.annotation.Autowired;\r
-import org.springframework.dao.PermissionDeniedDataAccessException;\r
 import org.springframework.stereotype.Service;\r
 import org.springframework.transaction.annotation.Transactional;\r
 \r
-import eu.etaxonomy.cdm.api.service.DeleteResult.DeleteStatus;\r
 import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;\r
 import eu.etaxonomy.cdm.api.service.config.IFindTaxaAndNamesConfigurator;\r
 import eu.etaxonomy.cdm.api.service.config.IncludedTaxonConfiguration;\r
@@ -47,6 +44,7 @@ import eu.etaxonomy.cdm.api.service.config.MatchingTaxonConfigurator;
 import eu.etaxonomy.cdm.api.service.config.SynonymDeletionConfigurator;\r
 import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator;\r
 import eu.etaxonomy.cdm.api.service.config.TaxonNodeDeletionConfigurator.ChildHandling;\r
+import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;\r
 import eu.etaxonomy.cdm.api.service.dto.IncludedTaxaDTO;\r
 import eu.etaxonomy.cdm.api.service.exception.DataChangeNoRollbackException;\r
 import eu.etaxonomy.cdm.api.service.exception.HomotypicalGroupChangeException;\r
@@ -64,13 +62,13 @@ import eu.etaxonomy.cdm.api.service.search.SearchResult;
 import eu.etaxonomy.cdm.api.service.search.SearchResultBuilder;\r
 import eu.etaxonomy.cdm.api.service.util.TaxonRelationshipEdge;\r
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
-import eu.etaxonomy.cdm.database.PermissionDeniedException;\r
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;\r
 import eu.etaxonomy.cdm.hibernate.search.DefinedTermBaseClassBridge;\r
 import eu.etaxonomy.cdm.hibernate.search.GroupByTaxonClassBridge;\r
 import eu.etaxonomy.cdm.hibernate.search.MultilanguageTextFieldBridge;\r
 import eu.etaxonomy.cdm.model.CdmBaseType;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
+import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
@@ -86,7 +84,7 @@ import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.cdm.model.description.IIdentificationKey;\r
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;\r
-import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase;\r
+import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;\r
 import eu.etaxonomy.cdm.model.description.SpecimenDescription;\r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.cdm.model.description.TaxonInteraction;\r
@@ -95,7 +93,7 @@ import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.media.Media;\r
 import eu.etaxonomy.cdm.model.media.MediaRepresentation;\r
 import eu.etaxonomy.cdm.model.media.MediaUtils;\r
-import eu.etaxonomy.cdm.model.molecular.Amplification;\r
+import eu.etaxonomy.cdm.model.molecular.AmplificationResult;\r
 import eu.etaxonomy.cdm.model.molecular.DnaSample;\r
 import eu.etaxonomy.cdm.model.molecular.Sequence;\r
 import eu.etaxonomy.cdm.model.molecular.SingleRead;\r
@@ -417,9 +415,6 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
         this.dao = dao;\r
     }\r
 \r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.api.service.ITaxonService#findTaxaByName(java.lang.Class, java.lang.String, java.lang.String, java.lang.String, java.lang.String, eu.etaxonomy.cdm.model.name.Rank, java.lang.Integer, java.lang.Integer)\r
-     */\r
     @Override\r
     public Pager<TaxonBase> findTaxaByName(Class<? extends TaxonBase> clazz, String uninomial, String infragenericEpithet, String specificEpithet,     String infraspecificEpithet, Rank rank, Integer pageSize,Integer pageNumber) {\r
         Integer numberOfResults = dao.countTaxaByName(clazz, uninomial, infragenericEpithet, specificEpithet, infraspecificEpithet, rank);\r
@@ -432,9 +427,6 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
         return new DefaultPagerImpl<TaxonBase>(pageNumber, numberOfResults, pageSize, results);\r
     }\r
 \r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.api.service.ITaxonService#listTaxaByName(java.lang.Class, java.lang.String, java.lang.String, java.lang.String, java.lang.String, eu.etaxonomy.cdm.model.name.Rank, java.lang.Integer, java.lang.Integer)\r
-     */\r
     @Override\r
     public List<TaxonBase> listTaxaByName(Class<? extends TaxonBase> clazz, String uninomial,  String infragenericEpithet, String specificEpithet,     String infraspecificEpithet, Rank rank, Integer pageSize,Integer pageNumber) {\r
         Integer numberOfResults = dao.countTaxaByName(clazz, uninomial, infragenericEpithet, specificEpithet, infraspecificEpithet, rank);\r
@@ -447,9 +439,6 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
         return results;\r
     }\r
 \r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.api.service.ITaxonService#listToTaxonRelationships(eu.etaxonomy.cdm.model.taxon.Taxon, eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)\r
-     */\r
     @Override\r
     public List<TaxonRelationship> listToTaxonRelationships(Taxon taxon, TaxonRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths){\r
         Integer numberOfResults = dao.countTaxonRelationships(taxon, type, TaxonRelationship.Direction.relatedTo);\r
@@ -461,9 +450,6 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
         return results;\r
     }\r
 \r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.api.service.ITaxonService#pageToTaxonRelationships(eu.etaxonomy.cdm.model.taxon.Taxon, eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)\r
-     */\r
     @Override\r
     public Pager<TaxonRelationship> pageToTaxonRelationships(Taxon taxon, TaxonRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {\r
         Integer numberOfResults = dao.countTaxonRelationships(taxon, type, TaxonRelationship.Direction.relatedTo);\r
@@ -475,9 +461,6 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
         return new DefaultPagerImpl<TaxonRelationship>(pageNumber, numberOfResults, pageSize, results);\r
     }\r
 \r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.api.service.ITaxonService#listFromTaxonRelationships(eu.etaxonomy.cdm.model.taxon.Taxon, eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)\r
-     */\r
     @Override\r
     public List<TaxonRelationship> listFromTaxonRelationships(Taxon taxon, TaxonRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths){\r
         Integer numberOfResults = dao.countTaxonRelationships(taxon, type, TaxonRelationship.Direction.relatedFrom);\r
@@ -489,9 +472,6 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
         return results;\r
     }\r
 \r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.api.service.ITaxonService#pageFromTaxonRelationships(eu.etaxonomy.cdm.model.taxon.Taxon, eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)\r
-     */\r
     @Override\r
     public Pager<TaxonRelationship> pageFromTaxonRelationships(Taxon taxon, TaxonRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {\r
         Integer numberOfResults = dao.countTaxonRelationships(taxon, type, TaxonRelationship.Direction.relatedFrom);\r
@@ -547,15 +527,6 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
     }\r
 \r
 \r
-    /**\r
-     * @param taxon\r
-     * @param includeRelationships\r
-     * @param maxDepth\r
-     * @param limit\r
-     * @param starts\r
-     * @param propertyPaths\r
-     * @return an List which is not specifically ordered\r
-     */\r
     @Override\r
     public Set<Taxon> listRelatedTaxa(Taxon taxon, Set<TaxonRelationshipEdge> includeRelationships, Integer maxDepth,\r
             Integer limit, Integer start, List<String> propertyPaths) {\r
@@ -702,25 +673,24 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
     }\r
 \r
     @Override\r
-    public List<UuidAndTitleCache<TaxonBase>> findTaxaAndNamesForEditor(IFindTaxaAndNamesConfigurator configurator){\r
-\r
-        List<UuidAndTitleCache<TaxonBase>> result = new ArrayList<UuidAndTitleCache<TaxonBase>>();\r
-//        Class<? extends TaxonBase> clazz = null;\r
-//        if ((configurator.isDoTaxa() && configurator.isDoSynonyms())) {\r
-//            clazz = TaxonBase.class;\r
-//            //propertyPath.addAll(configurator.getTaxonPropertyPath());\r
-//            //propertyPath.addAll(configurator.getSynonymPropertyPath());\r
-//        } else if(configurator.isDoTaxa()) {\r
-//            clazz = Taxon.class;\r
-//            //propertyPath = configurator.getTaxonPropertyPath();\r
-//        } else if (configurator.isDoSynonyms()) {\r
-//            clazz = Synonym.class;\r
-//            //propertyPath = configurator.getSynonymPropertyPath();\r
-//        }\r
+    public List<UuidAndTitleCache<IdentifiableEntity>> findTaxaAndNamesForEditor(IFindTaxaAndNamesConfigurator configurator){\r
 \r
+        List<UuidAndTitleCache<IdentifiableEntity>> results = new ArrayList<UuidAndTitleCache<IdentifiableEntity>>();\r
 \r
-        result = dao.getTaxaByNameForEditor(configurator.isDoTaxa(), configurator.isDoSynonyms(), configurator.getTitleSearchStringSqlized(), configurator.getClassification(), configurator.getMatchMode(), configurator.getNamedAreas());\r
-        return result;\r
+\r
+        if (configurator.isDoSynonyms() || configurator.isDoTaxa() || configurator.isDoNamesWithoutTaxa()){\r
+               results = dao.getTaxaByNameForEditor(configurator.isDoTaxa(), configurator.isDoSynonyms(), configurator.isDoNamesWithoutTaxa(), configurator.isDoMisappliedNames(),configurator.getTitleSearchStringSqlized(), configurator.getClassification(), configurator.getMatchMode(), configurator.getNamedAreas());\r
+        }\r
+        if (configurator.isDoTaxaByCommonNames()) {\r
+\r
+            //if(configurator.getPageSize() == null ){\r
+                List<UuidAndTitleCache<IdentifiableEntity>> commonNameResults = dao.getTaxaByCommonNameForEditor(configurator.getTitleSearchStringSqlized(), configurator.getClassification(), configurator.getMatchMode(), configurator.getNamedAreas());\r
+                if(commonNameResults != null){\r
+                    results.addAll(commonNameResults);\r
+                }\r
+           // }\r
+        }\r
+        return results;\r
     }\r
 \r
     /* (non-Javadoc)\r
@@ -857,6 +827,7 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
 \r
         Set<Taxon> taxa = new HashSet<Taxon>();\r
         List<Media> taxonMedia = new ArrayList<Media>();\r
+        List<Media> nonImageGalleryImages = new ArrayList<Media>();\r
 \r
         if (limitToGalleries == null) {\r
             limitToGalleries = false;\r
@@ -881,11 +852,18 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
                 if (!limitToGalleries || taxonDescription.isImageGallery()) {\r
                     for (DescriptionElementBase element : taxonDescription.getElements()) {\r
                         for (Media media : element.getMedia()) {\r
-                            taxonMedia.add(media);\r
+                            if(taxonDescription.isImageGallery()){\r
+                                taxonMedia.add(media);\r
+                            }\r
+                            else{\r
+                                nonImageGalleryImages.add(media);\r
+                            }\r
                         }\r
                     }\r
                 }\r
             }\r
+            //put images from image gallery first (#3242)\r
+            taxonMedia.addAll(nonImageGalleryImages);\r
         }\r
 \r
 \r
@@ -931,7 +909,7 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
                     for (Sequence sequence : sequences) {\r
                         Set<Media> dnaRelatedMedia = new HashSet<Media>();\r
                         for (SingleRead singleRead : sequence.getSingleReads()){\r
-                            Amplification amplification = singleRead.getAmplification();\r
+                            AmplificationResult amplification = singleRead.getAmplificationResult();\r
                             dnaRelatedMedia.add(amplification.getGelPhoto());\r
                             dnaRelatedMedia.add(singleRead.getPherogram());\r
                             dnaRelatedMedia.remove(null);\r
@@ -1012,14 +990,14 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
      */\r
     @Override\r
     public DeleteResult deleteTaxon(Taxon taxon, TaxonDeletionConfigurator config, Classification classification)  {\r
-       DeleteResult result = new DeleteResult();\r
+\r
        if (config == null){\r
             config = new TaxonDeletionConfigurator();\r
         }\r
 \r
-        List<String> referencedObjects = isDeletable(taxon, config);\r
+        DeleteResult result = isDeletable(taxon, config);\r
 \r
-        if (referencedObjects.isEmpty()){\r
+        if (result.isOk()){\r
             // --- DeleteSynonymRelations\r
             if (config.isDeleteSynonymRelations()){\r
                 boolean removeSynonymNameFromHomotypicalGroup = false;\r
@@ -1095,12 +1073,14 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
                                 " which also describes specimens or abservations";\r
                         //throw new ReferencedObjectUndeletableException(message);\r
                     }\r
+\r
                     removeDescriptions.add(desc);\r
-                    descriptionService.delete(desc);\r
+\r
 \r
                 }\r
                 for (TaxonDescription desc: removeDescriptions){\r
                     taxon.removeDescription(desc);\r
+                    descriptionService.delete(desc);\r
                 }\r
             }\r
 \r
@@ -1176,10 +1156,10 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
                                 }\r
                             }\r
                         config.getTaxonNodeConfig().setDeleteTaxon(false);\r
-                        List<UUID> deletedNodes = nodeService.deleteTaxonNodes(nodesList, config);\r
-                        if (deletedNodes.isEmpty() && !nodesList.isEmpty()){\r
-                                result.setError();\r
-                             result.addException(new Exception("There are an error in deleting the taxon nodes."));\r
+                        DeleteResult resultNodes = nodeService.deleteTaxonNodes(nodesList, config);\r
+                        if (!resultNodes.isOk()){\r
+                               result.addExceptions(resultNodes.getExceptions());\r
+                               result.setStatus(resultNodes.getStatus());\r
                         }\r
                     }\r
                     if (!success){\r
@@ -1192,7 +1172,7 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
 \r
              //PolytomousKey TODO\r
 \r
-             boolean usedInPolytomousKey = checkForPolytomousKeys(taxon);\r
+\r
             //TaxonNameBase\r
             if (config.isDeleteNameIfPossible()){\r
 \r
@@ -1202,18 +1182,27 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
                     //check whether taxon will be deleted or not\r
                     if ((taxon.getTaxonNodes() == null || taxon.getTaxonNodes().size()== 0) && name != null ){\r
                         taxon = (Taxon) HibernateProxyHelper.deproxy(taxon);\r
-                        name.removeTaxonBase(taxon);\r
-                        nameService.merge(name);\r
+                        //name.removeTaxonBase(taxon);\r
+                        //nameService.saveOrUpdate(name);\r
+                        taxon.setName(null);\r
+                        //dao.delete(taxon);\r
                         DeleteResult nameResult = new DeleteResult();\r
-                       \r
-                        nameResult = nameService.delete(name, config.getNameDeletionConfig());\r
-                       \r
+\r
+                        //remove name if possible (and required)\r
+                        if (name != null && config.isDeleteNameIfPossible()){\r
+\r
+                               nameResult = nameService.delete(name, config.getNameDeletionConfig());\r
+\r
+                        }\r
+\r
+\r
+\r
                         if (nameResult.isError()){\r
                                //result.setError();\r
                                result.addRelatedObject(name);\r
                                result.addExceptions(nameResult.getExceptions());\r
                         }\r
-                        \r
+\r
                     }\r
 \r
             }\r
@@ -1239,27 +1228,28 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
             if ((taxon.getTaxonNodes() == null || taxon.getTaxonNodes().size()== 0)  ){\r
                try{\r
                        UUID uuid = dao.delete(taxon);\r
-                       \r
+\r
                }catch(Exception e){\r
                        result.addException(e);\r
                        result.setError();\r
-                       \r
+\r
                }\r
             } else {\r
                result.setError();\r
                result.addException(new Exception("The Taxon can't be deleted."));\r
-               \r
+\r
             }\r
-        }else {\r
-               List<Exception> exceptions = new ArrayList<Exception>();\r
-               for (String message: referencedObjects){\r
-                       ReferencedObjectUndeletableException exception = new ReferencedObjectUndeletableException(message);\r
-                       exceptions.add(exception);\r
-               }\r
-               result.addExceptions(exceptions);\r
-               result.setError();\r
-               \r
         }\r
+//        }else {\r
+//             List<Exception> exceptions = new ArrayList<Exception>();\r
+//             for (String message: referencedObjects){\r
+//                     ReferencedObjectUndeletableException exception = new ReferencedObjectUndeletableException(message);\r
+//                     exceptions.add(exception);\r
+//             }\r
+//             result.addExceptions(exceptions);\r
+//             result.setError();\r
+//\r
+//        }\r
         return result;\r
 \r
     }\r
@@ -1314,8 +1304,8 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
         this.deleteSynonym(syn, null);\r
         return result;\r
     }\r
-   \r
-    \r
+\r
+\r
 \r
     /* (non-Javadoc)\r
      * @see eu.etaxonomy.cdm.api.service.ITaxonService#deleteSynonym(eu.etaxonomy.cdm.model.taxon.Synonym, eu.etaxonomy.cdm.model.taxon.Taxon, boolean, boolean)\r
@@ -1343,10 +1333,10 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
         if (config == null){\r
             config = new SynonymDeletionConfigurator();\r
         }\r
-        List<String> messages = isDeletable(synonym, config);\r
-       \r
-       \r
-        if (messages.isEmpty()){\r
+        result = isDeletable(synonym, config);\r
+\r
+\r
+        if (result.isOk()){\r
             synonym = CdmBase.deproxy(dao.merge(synonym), Synonym.class);\r
 \r
             //remove synonymRelationship\r
@@ -1384,21 +1374,30 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
                result.addException(new ReferencedObjectUndeletableException("Synonym can not be deleted it is used in a synonymRelationship."));\r
                 return result;\r
             }\r
-            \r
-            return result;\r
-        }else{\r
-               List<Exception> exceptions = new ArrayList<Exception>();\r
-               for (String message :messages){\r
-                       exceptions.add(new ReferencedObjectUndeletableException(message));\r
-               }\r
-               result.setError();\r
-               result.addExceptions(exceptions);\r
-            return result;\r
+\r
+\r
         }\r
+        return result;\r
+//        else{\r
+//             List<Exception> exceptions = new ArrayList<Exception>();\r
+//             for (String message :messages){\r
+//                     exceptions.add(new ReferencedObjectUndeletableException(message));\r
+//             }\r
+//             result.setError();\r
+//             result.addExceptions(exceptions);\r
+//            return result;\r
+//        }\r
 \r
 \r
     }\r
 \r
+    @Transactional(readOnly = false)\r
+    @Override\r
+    public DeleteResult deleteSynonym(UUID synonymUuid, UUID taxonUuid, SynonymDeletionConfigurator config) {\r
+        Synonym synonym = HibernateProxyHelper.deproxy(dao.load(synonymUuid), Synonym.class);\r
+        Taxon taxon = HibernateProxyHelper.deproxy(dao.load(taxonUuid), Taxon.class);\r
+        return deleteSynonym(synonym, taxon, config);\r
+    }\r
 \r
     /* (non-Javadoc)\r
      * @see eu.etaxonomy.cdm.api.service.ITaxonService#findIdenticalTaxonNameIds(java.util.List)\r
@@ -1645,6 +1644,8 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
                     if (newRefDetail == null && keepReference){\r
                         newRefDetail = synRelation.getCitationMicroReference();\r
                     }\r
+                    newTaxon = HibernateProxyHelper.deproxy(newTaxon, Taxon.class);\r
+                    fromTaxon = HibernateProxyHelper.deproxy(fromTaxon, Taxon.class);\r
                     SynonymRelationship newSynRelation = newTaxon.addSynonym(syn, newSynonymRelationshipType, newReference, newRefDetail);\r
                     fromTaxon.removeSynonymRelation(synRelation, false);\r
 //\r
@@ -1660,6 +1661,7 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
             }\r
 \r
         }\r
+        saveOrUpdate(fromTaxon);\r
         saveOrUpdate(newTaxon);\r
         //Assert that there is a result\r
         if (result == null){\r
@@ -1713,7 +1715,7 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
     }\r
 \r
     @Override\r
-    public Pager<SearchResult<TaxonBase>> findByDistribution(List<NamedArea> areaFilter, List<PresenceAbsenceTermBase<?>> statusFilter,\r
+    public Pager<SearchResult<TaxonBase>> findByDistribution(List<NamedArea> areaFilter, List<PresenceAbsenceTerm> statusFilter,\r
             Classification classification,\r
             Integer pageSize, Integer pageNumber,\r
             List<OrderHint> orderHints, List<String> propertyPaths) throws IOException, ParseException {\r
@@ -1854,7 +1856,7 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
     @Override\r
     public Pager<SearchResult<TaxonBase>> findTaxaAndNamesByFullText(\r
             EnumSet<TaxaAndNamesSearchMode> searchModes, String queryString, Classification classification,\r
-            Set<NamedArea> namedAreas, Set<PresenceAbsenceTermBase<?>> distributionStatus, List<Language> languages,\r
+            Set<NamedArea> namedAreas, Set<PresenceAbsenceTerm> distributionStatus, List<Language> languages,\r
             boolean highlightFragments, Integer pageSize,\r
             Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths)\r
             throws CorruptIndexException, IOException, ParseException, LuceneMultiSearchException {\r
@@ -1870,13 +1872,13 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
 \r
         // convert sets to lists\r
         List<NamedArea> namedAreaList = null;\r
-        List<PresenceAbsenceTermBase<?>>distributionStatusList = null;\r
+        List<PresenceAbsenceTerm>distributionStatusList = null;\r
         if(namedAreas != null){\r
             namedAreaList = new ArrayList<NamedArea>(namedAreas.size());\r
             namedAreaList.addAll(namedAreas);\r
         }\r
         if(distributionStatus != null){\r
-            distributionStatusList = new ArrayList<PresenceAbsenceTermBase<?>>(distributionStatus.size());\r
+            distributionStatusList = new ArrayList<PresenceAbsenceTerm>(distributionStatus.size());\r
             distributionStatusList.addAll(distributionStatus);\r
         }\r
 \r
@@ -2125,7 +2127,7 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
      */\r
     protected Query createByDistributionJoinQuery(\r
             List<NamedArea> namedAreaList,\r
-            List<PresenceAbsenceTermBase<?>> distributionStatusList,\r
+            List<PresenceAbsenceTerm> distributionStatusList,\r
             QueryFactory queryFactory\r
             ) throws IOException {\r
 \r
@@ -2146,7 +2148,7 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
      * @return\r
      */\r
     private BooleanQuery createByDistributionQuery(List<NamedArea> namedAreaList,\r
-            List<PresenceAbsenceTermBase<?>> distributionStatusList, QueryFactory queryFactory) {\r
+            List<PresenceAbsenceTerm> distributionStatusList, QueryFactory queryFactory) {\r
         BooleanQuery areaQuery = new BooleanQuery();\r
         // area field from Distribution\r
         areaQuery.add(queryFactory.newEntityIdsQuery("area.id", namedAreaList), Occur.MUST);\r
@@ -2172,7 +2174,7 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
      * @throws IOException\r
      */\r
     protected LuceneSearch prepareByDistributionSearch(\r
-            List<NamedArea> namedAreaList, List<PresenceAbsenceTermBase<?>> distributionStatusList,\r
+            List<NamedArea> namedAreaList, List<PresenceAbsenceTerm> distributionStatusList,\r
             Classification classification) throws IOException {\r
 \r
         BooleanQuery finalQuery = new BooleanQuery();\r
@@ -3064,14 +3066,16 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
 \r
                 this.saveOrUpdate(toTaxon);\r
                 //TODO: configurator and classification\r
-                this.deleteTaxon(fromTaxon, null, null);\r
+                TaxonDeletionConfigurator config = new TaxonDeletionConfigurator();\r
+                config.setDeleteNameIfPossible(false);\r
+                this.deleteTaxon(fromTaxon, config, null);\r
                 return synonymRelationship.getSynonym();\r
 \r
     }\r
     @Override\r
-    public List<String> isDeletable(TaxonBase taxonBase, DeleteConfiguratorBase config){\r
-        List<String> result = new ArrayList<String>();\r
-        Set<CdmBase> references = commonService.getReferencingObjects(taxonBase);\r
+    public DeleteResult isDeletable(TaxonBase taxonBase, DeleteConfiguratorBase config){\r
+        DeleteResult result = new DeleteResult();\r
+        Set<CdmBase> references = commonService.getReferencingObjectsForDeletion(taxonBase);\r
         if (taxonBase instanceof Taxon){\r
             TaxonDeletionConfigurator taxonConfig = (TaxonDeletionConfigurator) config;\r
             result = isDeletableForTaxon(references, taxonConfig);\r
@@ -3082,53 +3086,55 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
         return result;\r
     }\r
 \r
-    private List<String> isDeletableForSynonym(Set<CdmBase> references, SynonymDeletionConfigurator config){\r
+    private DeleteResult isDeletableForSynonym(Set<CdmBase> references, SynonymDeletionConfigurator config){\r
         String message;\r
-        List<String> result = new ArrayList<String>();\r
+        DeleteResult result = new DeleteResult();\r
         for (CdmBase ref: references){\r
-            if (!(ref instanceof SynonymRelationship || ref instanceof Taxon || ref instanceof TaxonNameBase)){\r
+            if (!(ref instanceof SynonymRelationship || ref instanceof Taxon || ref instanceof TaxonNameBase )){\r
                 message = "The Synonym can't be deleted as long as it is referenced by " + ref.getClass().getSimpleName() + " with id "+ ref.getId();\r
-                result.add(message);\r
+                result.addException(new ReferencedObjectUndeletableException(message));\r
+                result.addRelatedObject(ref);\r
+                result.setAbort();\r
             }\r
         }\r
 \r
         return result;\r
     }\r
-    private List<String> isDeletableForTaxon(Set<CdmBase> references, TaxonDeletionConfigurator config){\r
-        String message;\r
-        List<String> result = new ArrayList<String>();\r
+    private DeleteResult isDeletableForTaxon(Set<CdmBase> references, TaxonDeletionConfigurator config){\r
+        String message = null;\r
+        DeleteResult result = new DeleteResult();\r
         for (CdmBase ref: references){\r
             if (!(ref instanceof TaxonNameBase)){\r
                 if (!config.isDeleteSynonymRelations() && (ref instanceof SynonymRelationship)){\r
                     message = "The Taxon can't be deleted as long as it has synonyms.";\r
-                    result.add(message);\r
+\r
                 }\r
                 if (!config.isDeleteDescriptions() && (ref instanceof DescriptionBase)){\r
                     message = "The Taxon can't be deleted as long as it has factual data.";\r
-                    result.add(message);\r
+\r
                 }\r
 \r
                 if (!config.isDeleteTaxonNodes() && (ref instanceof TaxonNode)){\r
                     message = "The Taxon can't be deleted as long as it belongs to a taxon node.";\r
-                    result.add(message);\r
+\r
                 }\r
                 if (!config.isDeleteTaxonRelationships() && (ref instanceof TaxonNode)){\r
                     if (!config.isDeleteMisappliedNamesAndInvalidDesignations() && (((TaxonRelationship)ref).getType().equals(TaxonRelationshipType.MISAPPLIED_NAME_FOR())|| ((TaxonRelationship)ref).getType().equals(TaxonRelationshipType.INVALID_DESIGNATION_FOR()))){\r
                         message = "The Taxon can't be deleted as long as it has misapplied names or invalid designations.";\r
-                        result.add(message);\r
+\r
                     } else{\r
                         message = "The Taxon can't be deleted as long as it belongs to a taxon node.";\r
-                        result.add(message);\r
+\r
                     }\r
                 }\r
                 if (ref instanceof PolytomousKeyNode){\r
                     message = "The Taxon can't be deleted as long as it is referenced by a polytomous key node.";\r
-                    result.add(message);\r
+\r
                 }\r
 \r
                 if (HibernateProxyHelper.isInstanceOf(ref, IIdentificationKey.class)){\r
                    message = "Taxon can't be deleted as it is used in an identification key. Remove from identification key prior to deleting this name";\r
-                   result.add(message);\r
+\r
 \r
                 }\r
 \r
@@ -3142,17 +3148,21 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
                 //TaxonInteraction\r
                 if (ref.isInstanceOf(TaxonInteraction.class)){\r
                     message = "Taxon can't be deleted as it is used in taxonInteraction#taxon2";\r
-                    result.add(message);\r
+\r
                 }\r
 \r
               //TaxonInteraction\r
                 if (ref.isInstanceOf(DeterminationEvent.class)){\r
                     message = "Taxon can't be deleted as it is used in a determination event";\r
-                    result.add(message);\r
+\r
                 }\r
 \r
             }\r
-\r
+            if (message != null){\r
+                   result.addException(new ReferencedObjectUndeletableException(message));\r
+                   result.addRelatedObject(ref);\r
+                   result.setAbort();\r
+            }\r
         }\r
 \r
         return result;\r
@@ -3285,6 +3295,39 @@ public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDa
         return result;\r
     }\r
 \r
+    @Override\r
+    public List<TaxonBase> findTaxaByName(MatchingTaxonConfigurator config){\r
+        List<TaxonBase> taxonList = dao.getTaxaByName(true, false, false, config.getTaxonNameTitle(), null, MatchMode.EXACT, null, 0, 0, config.getPropertyPath());\r
+        return taxonList;\r
+    }\r
+\r
+       @Override\r
+       @Transactional(readOnly = true)\r
+       public <S extends TaxonBase> Pager<FindByIdentifierDTO<S>> findByIdentifier(\r
+                       Class<S> clazz, String identifier, DefinedTerm identifierType, TaxonNode subtreeFilter,\r
+                       MatchMode matchmode, boolean includeEntity, Integer pageSize,\r
+                       Integer pageNumber,     List<String> propertyPaths) {\r
+               if (subtreeFilter == null){\r
+                       return findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);\r
+               }\r
+\r
+               Integer numberOfResults = dao.countByIdentifier(clazz, identifier, identifierType, subtreeFilter, matchmode);\r
+        List<Object[]> daoResults = new ArrayList<Object[]>();\r
+        if(numberOfResults > 0) { // no point checking again\r
+               daoResults = dao.findByIdentifier(clazz, identifier, identifierType, subtreeFilter,\r
+                               matchmode, includeEntity, pageSize, pageNumber, propertyPaths);\r
+        }\r
+\r
+        List<FindByIdentifierDTO<S>> result = new ArrayList<FindByIdentifierDTO<S>>();\r
+        for (Object[] daoObj : daoResults){\r
+               if (includeEntity){\r
+                       result.add(new FindByIdentifierDTO<S>((DefinedTerm)daoObj[0], (String)daoObj[1], (S)daoObj[2]));\r
+               }else{\r
+                       result.add(new FindByIdentifierDTO<S>((DefinedTerm)daoObj[0], (String)daoObj[1], (UUID)daoObj[2], (String)daoObj[3]));\r
+               }\r
+        }\r
+               return new DefaultPagerImpl<FindByIdentifierDTO<S>>(pageNumber, numberOfResults, pageSize, result);\r
+       }\r
 \r
 \r
 }\r