package eu.etaxonomy.cdm.api.service;\r
\r
import java.util.ArrayList;\r
-import java.util.Collection;\r
import java.util.Comparator;\r
import java.util.HashSet;\r
import java.util.List;\r
-import java.util.Map;\r
import java.util.Set;\r
import java.util.UUID;\r
\r
import org.apache.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Service;\r
-import org.springframework.transaction.TransactionStatus;\r
+import org.springframework.transaction.annotation.Propagation;\r
import org.springframework.transaction.annotation.Transactional;\r
\r
import eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator;\r
import eu.etaxonomy.cdm.api.service.pager.Pager;\r
import eu.etaxonomy.cdm.api.service.pager.impl.DefaultPagerImpl;\r
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;\r
+import eu.etaxonomy.cdm.model.common.CdmBase;\r
import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;\r
import eu.etaxonomy.cdm.model.common.RelationshipBase;\r
+import eu.etaxonomy.cdm.model.common.RelationshipBase.Direction;\r
import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;\r
-import eu.etaxonomy.cdm.model.description.CommonTaxonName;\r
-import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
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.name.HomotypicalGroup;\r
import eu.etaxonomy.cdm.model.name.Rank;\r
import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
-import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
-import eu.etaxonomy.cdm.model.taxon.ITreeNode;\r
+import eu.etaxonomy.cdm.model.reference.Reference;\r
+import eu.etaxonomy.cdm.model.taxon.Classification;\r
import eu.etaxonomy.cdm.model.taxon.Synonym;\r
import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;\r
import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;\r
import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;\r
import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
-import eu.etaxonomy.cdm.persistence.dao.BeanInitializer;\r
import eu.etaxonomy.cdm.persistence.dao.common.IOrderedTermVocabularyDao;\r
import eu.etaxonomy.cdm.persistence.dao.description.IDescriptionDao;\r
import eu.etaxonomy.cdm.persistence.dao.name.ITaxonNameDao;\r
import eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonDao;\r
import eu.etaxonomy.cdm.persistence.fetch.CdmFetch;\r
+import eu.etaxonomy.cdm.persistence.query.MatchMode;\r
import eu.etaxonomy.cdm.persistence.query.OrderHint;\r
\r
\r
+/**\r
+ * @author a.kohlbecker\r
+ * @date 10.09.2010\r
+ *\r
+ */\r
@Service\r
-@Transactional(readOnly = true)\r
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)\r
public class TaxonServiceImpl extends IdentifiableServiceBase<TaxonBase,ITaxonDao> implements ITaxonService{\r
private static final Logger logger = Logger.getLogger(TaxonServiceImpl.class);\r
\r
@Autowired\r
private ITaxonNameDao nameDao;\r
\r
+ @Autowired \r
+ private IDescriptionDao descriptionDao;\r
\r
@Autowired\r
private IOrderedTermVocabularyDao orderedVocabularyDao;\r
- @Autowired\r
- private IDescriptionDao descriptionDao;\r
- @Autowired\r
- private BeanInitializer defaultBeanInitializer;\r
- \r
- private Comparator<? super TaxonNode> taxonNodeComparator;\r
- @Autowired\r
- public void setTaxonNodeComparator(ITaxonNodeComparator<? super TaxonNode> taxonNodeComparator){\r
- this.taxonNodeComparator = (Comparator<? super TaxonNode>) taxonNodeComparator;\r
- }\r
\r
/**\r
* Constructor\r
* FIXME Candidate for harmonization\r
* rename searchByName ? \r
*/\r
- public List<TaxonBase> searchTaxaByName(String name, ReferenceBase sec) {\r
+ public List<TaxonBase> searchTaxaByName(String name, Reference sec) {\r
return dao.getTaxaByName(name, sec);\r
}\r
\r
\r
/**\r
* FIXME Candidate for harmonization\r
- * merge with getRootTaxa(ReferenceBase sec, ..., ...)\r
+ * merge with getRootTaxa(Reference sec, ..., ...)\r
* (non-Javadoc)\r
- * @see eu.etaxonomy.cdm.api.service.ITaxonService#getRootTaxa(eu.etaxonomy.cdm.model.reference.ReferenceBase)\r
+ * @see eu.etaxonomy.cdm.api.service.ITaxonService#getRootTaxa(eu.etaxonomy.cdm.model.reference.Reference)\r
*/\r
- public List<Taxon> getRootTaxa(ReferenceBase sec){\r
+ public List<Taxon> getRootTaxa(Reference sec){\r
return getRootTaxa(sec, CdmFetch.FETCH_CHILDTAXA(), true);\r
}\r
\r
/**\r
* FIXME Candidate for harmonization\r
- * merge with getRootTaxa(ReferenceBase sec, ..., ...)\r
+ * merge with getRootTaxa(Reference sec, ..., ...)\r
* (non-Javadoc)\r
- * @see eu.etaxonomy.cdm.api.service.ITaxonService#getRootTaxa(eu.etaxonomy.cdm.model.reference.ReferenceBase, boolean)\r
+ * @see eu.etaxonomy.cdm.api.service.ITaxonService#getRootTaxa(eu.etaxonomy.cdm.model.reference.Reference, boolean)\r
*/\r
- public List<Taxon> getRootTaxa(ReferenceBase sec, CdmFetch cdmFetch, boolean onlyWithChildren) {\r
+ public List<Taxon> getRootTaxa(Reference sec, CdmFetch cdmFetch, boolean onlyWithChildren) {\r
if (cdmFetch == null){\r
cdmFetch = CdmFetch.NO_FETCH();\r
}\r
\r
/**\r
* FIXME Candidate for harmonization\r
- * merge with getRootTaxa(ReferenceBase sec, ..., ...)\r
+ * merge with getRootTaxa(Reference sec, ..., ...)\r
* (non-Javadoc)\r
- * @see eu.etaxonomy.cdm.api.service.ITaxonService#getRootTaxa(eu.etaxonomy.cdm.model.reference.ReferenceBase, boolean, boolean)\r
+ * @see eu.etaxonomy.cdm.api.service.ITaxonService#getRootTaxa(eu.etaxonomy.cdm.model.reference.Reference, boolean, boolean)\r
*/\r
- public List<Taxon> getRootTaxa(ReferenceBase sec, boolean onlyWithChildren,\r
+ public List<Taxon> getRootTaxa(Reference sec, boolean onlyWithChildren,\r
boolean withMisapplications) {\r
return dao.getRootTaxa(sec, null, onlyWithChildren, withMisapplications);\r
}\r
\r
/* (non-Javadoc)\r
- * @see eu.etaxonomy.cdm.api.service.ITaxonService#getRootTaxa(eu.etaxonomy.cdm.model.name.Rank, eu.etaxonomy.cdm.model.reference.ReferenceBase, boolean, boolean)\r
+ * @see eu.etaxonomy.cdm.api.service.ITaxonService#getRootTaxa(eu.etaxonomy.cdm.model.name.Rank, eu.etaxonomy.cdm.model.reference.Reference, boolean, boolean)\r
*/\r
- public List<Taxon> getRootTaxa(Rank rank, ReferenceBase sec, boolean onlyWithChildren,\r
+ public List<Taxon> getRootTaxa(Rank rank, Reference sec, boolean onlyWithChildren,\r
boolean withMisapplications, List<String> propertyPaths) {\r
return dao.getRootTaxa(rank, sec, null, onlyWithChildren, withMisapplications, propertyPaths);\r
}\r
* @see eu.etaxonomy.cdm.api.service.ITaxonService#makeTaxonSynonym(eu.etaxonomy.cdm.model.taxon.Taxon, eu.etaxonomy.cdm.model.taxon.Taxon)\r
*/\r
@Transactional(readOnly = false)\r
- public Synonym makeTaxonSynonym(Taxon oldTaxon, Taxon newAcceptedTaxon, SynonymRelationshipType synonymRelationshipType, ReferenceBase citation, String citationMicroReference) {\r
- if (oldTaxon == null || newAcceptedTaxon == null || oldTaxon.getName() == null){\r
- throw new IllegalArgumentException();\r
+ public Synonym changeAcceptedTaxonToSynonym(TaxonNode oldTaxonNode, TaxonNode newAcceptedTaxonNode, SynonymRelationshipType synonymRelationshipType, Reference citation, String citationMicroReference) {\r
+\r
+ // TODO at the moment this method only moves synonym-, concept relations and descriptions to the new accepted taxon\r
+ // in a future version we also want to move cdm data like annotations, marker, so., but we will need a policy for that\r
+ if (oldTaxonNode == null || newAcceptedTaxonNode == null || oldTaxonNode.getTaxon().getName() == null){\r
+ throw new IllegalArgumentException("A mandatory parameter was null.");\r
}\r
\r
+ if(oldTaxonNode.equals(newAcceptedTaxonNode)){\r
+ throw new IllegalArgumentException("Taxon can not be made synonym of its own.");\r
+ }\r
+ \r
+ Taxon oldTaxon = (Taxon) HibernateProxyHelper.deproxy(oldTaxonNode.getTaxon());\r
+ Taxon newAcceptedTaxon = (Taxon) HibernateProxyHelper.deproxy(newAcceptedTaxonNode.getTaxon());\r
+ \r
// Move oldTaxon to newTaxon\r
TaxonNameBase<?,?> synonymName = oldTaxon.getName();\r
if (synonymRelationshipType == null){\r
if (synonymName.isHomotypic(newAcceptedTaxon.getName())){\r
synonymRelationshipType = SynonymRelationshipType.HOMOTYPIC_SYNONYM_OF();\r
}else{\r
- //TODO synonymType \r
synonymRelationshipType = SynonymRelationshipType.HETEROTYPIC_SYNONYM_OF();\r
}\r
}\r
- SynonymRelationship synRel = newAcceptedTaxon.addSynonymName(synonymName, synonymRelationshipType, citation, citationMicroReference);\r
+ SynonymRelationship synonmyRelationship = newAcceptedTaxon.addSynonymName(synonymName, synonymRelationshipType, citation, citationMicroReference);\r
\r
//Move Synonym Relations to new Taxon\r
for(SynonymRelationship synRelation : oldTaxon.getSynonymRelations()){\r
synRelation.getCitation(), synRelation.getCitationMicroReference());\r
}\r
\r
- //Move Taxon RelationShips to new Taxon\r
- Set<TaxonRelationship> removableTaxonRels = new HashSet<TaxonRelationship>();\r
- for(TaxonRelationship taxonRelation : oldTaxon.getTaxonRelations()){\r
- //CHILDREN\r
- if (taxonRelation.getType().equals(TaxonRelationshipType.TAXONOMICALLY_INCLUDED_IN())){\r
- if (taxonRelation.getFromTaxon() == oldTaxon){\r
- removableTaxonRels.add(taxonRelation);\r
-// oldTaxon.removeTaxonRelation(taxonRelation);\r
- }else if(taxonRelation.getToTaxon() == oldTaxon){\r
- newAcceptedTaxon.addTaxonomicChild(taxonRelation.getFromTaxon(), taxonRelation.getCitation(), taxonRelation.getCitationMicroReference());\r
- removableTaxonRels.add(taxonRelation);\r
-// oldTaxon.removeTaxonRelation(taxonRelation);\r
- }else{\r
- logger.warn("Taxon is not part of its own Taxonrelationship");\r
- }\r
- }\r
- //MISAPPLIED NAMES\r
- if (taxonRelation.getType().equals(TaxonRelationshipType.MISAPPLIED_NAME_FOR())){\r
- if (taxonRelation.getFromTaxon() == oldTaxon){\r
- newAcceptedTaxon.addMisappliedName(taxonRelation.getToTaxon(), taxonRelation.getCitation(), taxonRelation.getCitationMicroReference());\r
- removableTaxonRels.add(taxonRelation);\r
-// oldTaxon.removeTaxonRelation(taxonRelation);\r
- }else if(taxonRelation.getToTaxon() == oldTaxon){\r
- newAcceptedTaxon.addMisappliedName(taxonRelation.getFromTaxon(), taxonRelation.getCitation(), taxonRelation.getCitationMicroReference());\r
- removableTaxonRels.add(taxonRelation);\r
-// oldTaxon.removeTaxonRelation(taxonRelation);\r
- }else{\r
- logger.warn("Taxon is not part of its own Taxonrelationship");\r
- }\r
+ \r
+ // CHILD NODES\r
+ if(oldTaxonNode.getChildNodes() != null && oldTaxonNode.getChildNodes().size() != 0){\r
+ for(TaxonNode childNode : oldTaxonNode.getChildNodes()){\r
+ newAcceptedTaxonNode.addChildNode(childNode, childNode.getReference(), childNode.getMicroReference(), childNode.getSynonymToBeUsed());\r
}\r
- //Concept Relationships\r
- //FIXME implement\r
-// if (taxonRelation.getType().equals(TaxonRelationshipType.MISAPPLIEDNAMEFOR())){\r
-// if (taxonRelation.getFromTaxon() == oldTaxon){\r
-// newAcceptedTaxon.addMisappliedName(taxonRelation.getToTaxon(), taxonRelation.getCitation(), taxonRelation.getCitationMicroReference());\r
-// removableTaxonRels.add(taxonRelation);\r
-// }else if(taxonRelation.getToTaxon() == oldTaxon){\r
-// newAcceptedTaxon.addMisappliedName(taxonRelation.getFromTaxon(), taxonRelation.getCitation(), taxonRelation.getCitationMicroReference());\r
-// removableTaxonRels.add(taxonRelation);\r
-// }else{\r
-// logger.warn("Taxon is not part of its own Taxonrelationship");\r
-// }\r
-// }\r
}\r
\r
- for(TaxonRelationship taxonRel : removableTaxonRels) {\r
- oldTaxon.removeTaxonRelation(taxonRel);\r
+ //Move Taxon RelationShips to new Taxon\r
+ Set<TaxonRelationship> obsoleteTaxonRelationships = new HashSet<TaxonRelationship>();\r
+ for(TaxonRelationship taxonRelationship : oldTaxon.getTaxonRelations()){\r
+ Taxon fromTaxon = (Taxon) HibernateProxyHelper.deproxy(taxonRelationship.getFromTaxon());\r
+ Taxon toTaxon = (Taxon) HibernateProxyHelper.deproxy(taxonRelationship.getToTaxon());\r
+ if (fromTaxon == oldTaxon){\r
+ newAcceptedTaxon.addTaxonRelation(taxonRelationship.getToTaxon(), taxonRelationship.getType(), \r
+ taxonRelationship.getCitation(), taxonRelationship.getCitationMicroReference());\r
+ \r
+ }else if(toTaxon == oldTaxon){\r
+ taxonRelationship.getFromTaxon().addTaxonRelation(newAcceptedTaxon, taxonRelationship.getType(), \r
+ taxonRelationship.getCitation(), taxonRelationship.getCitationMicroReference());\r
+\r
+ }else{\r
+ logger.warn("Taxon is not part of its own Taxonrelationship");\r
+ }\r
+ // Remove old relationships\r
+ taxonRelationship.setToTaxon(null);\r
+ taxonRelationship.setFromTaxon(null);\r
}\r
\r
- //Move Descriptions to new Taxon\r
- for(TaxonDescription taxDescription : oldTaxon.getDescriptions()){\r
- newAcceptedTaxon.addDescription(taxDescription);\r
+ //Move descriptions to new taxon\r
+ for(TaxonDescription description : oldTaxon.getDescriptions()){\r
+ description.setTitleCache("Description copied from former accepted taxon: " + oldTaxon.getTitleCache() + "(Old title: " + description.getTitleCache() + ")");\r
+ newAcceptedTaxon.addDescription(description);\r
}\r
- //delete old Taxon\r
- this.dao.saveOrUpdate(newAcceptedTaxon);\r
-// FIXME implement\r
-// this.dao.delete(oldTaxon);\r
+ \r
+ oldTaxonNode.delete();\r
\r
- //return\r
-// this.dao.flush();\r
- return synRel.getSynonym();\r
+ return synonmyRelationship.getSynonym();\r
}\r
\r
/*\r
* @see eu.etaxonomy.cdm.api.service.ITaxonService#swapSynonymWithAcceptedTaxon(eu.etaxonomy.cdm.model.taxon.Synonym)\r
*/\r
@Transactional(readOnly = false)\r
- public void makeSynonymAcceptedTaxon(Synonym synonym, Taxon acceptedTaxon, SynonymRelationshipType synonymRelationshipType){\r
+ public void swapSynonymAndAcceptedTaxon(Synonym synonym, Taxon acceptedTaxon){\r
\r
- // create a new synonym with the old acceptedName\r
- TaxonNameBase oldAcceptedTaxonName = acceptedTaxon.getName();\r
+ TaxonNameBase synonymName = synonym.getName();\r
+ synonymName.removeTaxonBase(synonym);\r
+ TaxonNameBase taxonName = acceptedTaxon.getName();\r
+ taxonName.removeTaxonBase(acceptedTaxon);\r
+ \r
+ synonym.setName(taxonName);\r
+ acceptedTaxon.setName(synonymName);\r
+ \r
+ // the accepted taxon needs a new uuid because the concept has changed\r
+ // FIXME this leads to an error "HibernateException: immutable natural identifier of an instance of eu.etaxonomy.cdm.model.taxon.Taxon was altered"\r
+ //acceptedTaxon.setUuid(UUID.randomUUID());\r
+ }\r
+ \r
+ \r
+ /*\r
+ * (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.service.ITaxonService#makeSynonymAcceptedTaxon(eu.etaxonomy.cdm.model.taxon.Synonym, eu.etaxonomy.cdm.model.taxon.Taxon)\r
+ */\r
+ public Taxon changeSynonymToAcceptedTaxon(Synonym synonym, Taxon acceptedTaxon){\r
+ \r
+ Taxon newAcceptedTaxon = Taxon.NewInstance(synonym.getName(), acceptedTaxon.getSec());\r
\r
- // remove synonym from oldAcceptedTaxon\r
acceptedTaxon.removeSynonym(synonym);\r
\r
- // make synonym name the accepted taxons name\r
- TaxonNameBase newAcceptedTaxonName = synonym.getName();\r
- acceptedTaxon.setName(newAcceptedTaxonName);\r
+ // since we are swapping names, we have to detach the name from the synonym completely. \r
+ // Otherwise the synonym will still be in the list of typified names.\r
+ synonym.getName().removeTaxonBase(synonym);\r
\r
- // add the new synonym to the acceptedTaxon\r
- if(synonymRelationshipType == null){\r
- synonymRelationshipType = SynonymRelationshipType.SYNONYM_OF();\r
- }\r
+ return newAcceptedTaxon;\r
+ }\r
+ \r
+ public Taxon changeSynonymToRelatedTaxon(Synonym synonym, Taxon toTaxon, TaxonRelationshipType taxonRelationshipType, Reference citation, String microcitation){\r
+ \r
+ // Get name from synonym\r
+ TaxonNameBase<?, ?> synonymName = synonym.getName();\r
+ \r
+ // remove synonym from taxon\r
+ toTaxon.removeSynonym(synonym);\r
\r
- acceptedTaxon.addSynonymName(oldAcceptedTaxonName, synonymRelationshipType);\r
+ // Create a taxon with synonym name\r
+ Taxon fromTaxon = Taxon.NewInstance(synonymName, null);\r
+ \r
+ // Add taxon relation \r
+ fromTaxon.addTaxonRelation(toTaxon, taxonRelationshipType, citation, microcitation);\r
+ \r
+ // since we are swapping names, we have to detach the name from the synonym completely. \r
+ // Otherwise the synonym will still be in the list of typified names.\r
+ synonym.getName().removeTaxonBase(synonym);\r
+ \r
+ return fromTaxon;\r
}\r
\r
- public void generateTitleCache() {\r
- generateTitleCache(true);\r
- }\r
- //TODO\r
- public void generateTitleCache(boolean forceProtected) {\r
- logger.warn("generateTitleCache not yet fully implemented!");\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#updateTitleCache()\r
+ */\r
+ @Override\r
+ @Transactional(readOnly = false)\r
+ public void updateTitleCache() {\r
+ Class<TaxonBase> clazz = TaxonBase.class;\r
+ super.updateTitleCache(clazz, null, null);\r
}\r
-\r
+ \r
@Autowired\r
protected void setDao(ITaxonDao dao) {\r
this.dao = dao;\r
return new DefaultPagerImpl<TaxonBase>(pageNumber, numberOfResults, pageSize, results);\r
}\r
\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
+ \r
+ List<TaxonBase> results = new ArrayList<TaxonBase>();\r
+ if(numberOfResults > 0) { // no point checking again\r
+ results = dao.findTaxaByName(clazz, uninomial, infragenericEpithet, specificEpithet, infraspecificEpithet, rank, pageSize, pageNumber); \r
+ }\r
+ \r
+ return results;\r
+ }\r
+\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
\r
}\r
return heterotypicSynonymyGroups;\r
}\r
-\r
- public Pager<TaxonBase> search(Class<? extends TaxonBase> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {\r
- Integer numberOfResults = dao.count(clazz,queryString);\r
- \r
- List<TaxonBase> results = new ArrayList<TaxonBase>();\r
- if(numberOfResults > 0) { // no point checking again\r
- results = dao.search(clazz,queryString, pageSize, pageNumber, orderHints, propertyPaths); \r
- }\r
- \r
- return new DefaultPagerImpl<TaxonBase>(pageNumber, numberOfResults, pageSize, results);\r
- }\r
-\r
\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.service.ITaxonService#findTaxaAndNames(eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator)\r
+ */\r
public Pager<IdentifiableEntity> findTaxaAndNames(ITaxonServiceConfigurator configurator) {\r
\r
List<IdentifiableEntity> results = new ArrayList<IdentifiableEntity>();\r
long numberTaxaResults = 0L;\r
\r
Class<? extends TaxonBase> clazz = null;\r
- if (configurator.isDoTaxa() && configurator.isDoSynonyms()) {\r
+ List<String> propertyPath = new ArrayList<String>();\r
+ if(configurator.getTaxonPropertyPath() != null){\r
+ propertyPath.addAll(configurator.getTaxonPropertyPath());\r
+ }\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
\r
if(clazz != null){\r
- numberTaxaResults = \r
- dao.countTaxaByName(clazz, \r
- configurator.getSearchString(), configurator.getTaxonomicTree(), configurator.getMatchMode(),\r
- configurator.getNamedAreas());\r
- if(numberTaxaResults > configurator.getPageSize() * configurator.getPageNumber()){ // no point checking again if less results\r
+ if(configurator.getPageSize() != null){ // no point counting if we need all anyway\r
+ numberTaxaResults = \r
+ dao.countTaxaByName(clazz, \r
+ configurator.getSearchString(), configurator.getClassification(), configurator.getMatchMode(),\r
+ configurator.getNamedAreas());\r
+ }\r
+ if(configurator.getPageSize() == null || numberTaxaResults > configurator.getPageSize() * configurator.getPageNumber()){ // no point checking again if less results\r
taxa = dao.getTaxaByName(clazz, \r
- configurator.getSearchString(), configurator.getTaxonomicTree(), configurator.getMatchMode(),\r
+ configurator.getSearchString(), configurator.getClassification(), configurator.getMatchMode(),\r
configurator.getNamedAreas(), configurator.getPageSize(), \r
- configurator.getPageNumber(), configurator.getTaxonPropertyPath());\r
+ configurator.getPageNumber(), propertyPath);\r
}\r
}\r
\r
}\r
\r
numberOfResults += numberTaxaResults;\r
- \r
+\r
// Names without taxa \r
- \r
if (configurator.isDoNamesWithoutTaxa()) {\r
int numberNameResults = 0;\r
- //FIXME implement search by area\r
+ \r
List<? extends TaxonNameBase<?,?>> names = \r
nameDao.findByName(configurator.getSearchString(), configurator.getMatchMode(), \r
- configurator.getPageSize(), configurator.getPageNumber(), null, null);\r
+ configurator.getPageSize(), configurator.getPageNumber(), null, configurator.getTaxonNamePropertyPath());\r
if (logger.isDebugEnabled()) { logger.debug(names.size() + " matching name(s) found"); }\r
if (names.size() > 0) {\r
for (TaxonNameBase<?,?> taxonName : names) {\r
}\r
\r
// Taxa from common names\r
- // FIXME the matching common names also must be returned\r
- // FIXME implement search by area\r
+ \r
if (configurator.isDoTaxaByCommonNames()) {\r
- int numberCommonNameResults = 0;\r
- List<CommonTaxonName> commonTaxonNames = \r
- descriptionDao.searchDescriptionByCommonName(configurator.getSearchString(), \r
- configurator.getMatchMode(), configurator.getPageSize(), configurator.getPageNumber());\r
- if (logger.isDebugEnabled()) { logger.debug(commonTaxonNames.size() + " matching common name(s) found"); }\r
- if (commonTaxonNames.size() > 0) {\r
- for (CommonTaxonName commonTaxonName : commonTaxonNames) {\r
- DescriptionBase description = commonTaxonName.getInDescription();\r
- description = HibernateProxyHelper.deproxy(description, DescriptionBase.class);\r
- if (description instanceof TaxonDescription) {\r
- TaxonDescription taxonDescription = HibernateProxyHelper.deproxy(description, TaxonDescription.class);\r
- Taxon taxon = taxonDescription.getTaxon();\r
- taxon = HibernateProxyHelper.deproxy(taxon, Taxon.class);\r
- if (!results.contains(taxon) && !taxon.isMisappliedName()) {\r
- defaultBeanInitializer.initialize(taxon, configurator.getTaxonPropertyPath());\r
- results.add(taxon);\r
- numberCommonNameResults++;\r
- }\r
- } else {\r
- logger.warn("Description of " + commonTaxonName.getName() + " is not an instance of TaxonDescription");\r
- }\r
- }\r
- numberOfResults += numberCommonNameResults;\r
- } \r
+ taxa = null;\r
+ numberTaxaResults = 0;\r
+ if(configurator.getPageSize() != null){// no point counting if we need all anyway\r
+ numberTaxaResults = dao.countTaxaByCommonName(configurator.getSearchString(), configurator.getClassification(), configurator.getMatchMode(), configurator.getNamedAreas());\r
+ }\r
+ if(configurator.getPageSize() == null || numberTaxaResults > configurator.getPageSize() * configurator.getPageNumber()){\r
+ taxa = dao.getTaxaByCommonName(configurator.getSearchString(), configurator.getClassification(), configurator.getMatchMode(), configurator.getNamedAreas(), configurator.getPageSize(), configurator.getPageNumber(), configurator.getTaxonPropertyPath());\r
+ }\r
+ if(taxa != null){\r
+ results.addAll(taxa);\r
+ }\r
+ numberOfResults += numberTaxaResults;\r
+ \r
}\r
\r
- //FIXME does not work any more after model change\r
- logger.warn("Sort does currently not work on identifiable entities due to model changes (duplicated implementation of the Comparable interface).");\r
- //Collections.sort(results);\r
- return new DefaultPagerImpl<IdentifiableEntity>\r
+ return new DefaultPagerImpl<IdentifiableEntity>\r
(configurator.getPageNumber(), numberOfResults, configurator.getPageSize(), results);\r
}\r
\r
return dao.getUuidAndTitleCache();\r
}\r
\r
- public List<MediaRepresentation> getAllMedia(Taxon taxon, int size, int height, int widthOrDuration, String[] mimeTypes, List<String> propertyPaths){\r
+ public List<MediaRepresentation> getAllMedia(Taxon taxon, int size, int height, int widthOrDuration, String[] mimeTypes){\r
List<MediaRepresentation> medRep = new ArrayList<MediaRepresentation>();\r
- taxon = (Taxon)dao.load(taxon.getUuid(), propertyPaths);\r
+ taxon = (Taxon)dao.load(taxon.getUuid());\r
Set<TaxonDescription> descriptions = taxon.getDescriptions();\r
for (TaxonDescription taxDesc: descriptions){\r
Set<DescriptionElementBase> elements = taxDesc.getElements();\r
for(Media media : descElem.getMedia()){\r
\r
//find the best matching representation\r
- medRep.add(media.findBestMatchingRepresentation(size, height, widthOrDuration, mimeTypes));\r
+ medRep.add(MediaUtils.findBestMatchingRepresentation(media, size, height, widthOrDuration, mimeTypes));\r
\r
}\r
}\r
}\r
return medRep;\r
}\r
+\r
+ public List<TaxonBase> findTaxaByID(Set<Integer> listOfIDs) {\r
+ return this.dao.findById(listOfIDs);\r
+ }\r
+\r
+ public int countAllRelationships() {\r
+ return this.dao.countAllRelationships();\r
+ }\r
+\r
+ public List<Synonym> createAllInferredSynonyms(Classification tree,\r
+ Taxon taxon) {\r
+ \r
+ return this.dao.createAllInferredSynonyms(taxon, tree);\r
+ }\r
+\r
+ public List<Synonym> createInferredSynonyms(Classification tree, Taxon taxon, SynonymRelationshipType type) {\r
+ \r
+ return this.dao.createInferredSynonyms(taxon, tree, type);\r
+ }\r
+\r
+ public List<TaxonNameBase> findIdenticalTaxonNames(List<String> propertyPath) {\r
+ \r
+ return this.dao.findIdenticalTaxonNames(propertyPath);\r
+ }\r
+ \r
+ public List<TaxonNameBase> findIdenticalTaxonNameIds(List<String> propertyPath) {\r
+ \r
+ return this.dao.findIdenticalNamesNew(propertyPath);\r
+ }\r
+ \r
+ public String getPhylumName(TaxonNameBase name){\r
+ return this.dao.getPhylumName(name);\r
+ }\r
+ \r
+ private class TaxonAndNameComparator implements Comparator{\r
+\r
+ public int compare(Object arg0, Object arg1) {\r
+ IdentifiableEntity castArg0 = (IdentifiableEntity) arg0;\r
+ IdentifiableEntity castArg1 = (IdentifiableEntity) arg1;\r
+ return castArg0.compareTo(castArg1);\r
+ }\r
+ \r
+ }\r
+\r
+ public long deleteSynonymRelationships(Synonym syn) {\r
+ \r
+ return dao.deleteSynonymRelationships(syn);\r
+ }\r
+\r
+ \r
+ public List<SynonymRelationship> listSynonymRelationships(\r
+ TaxonBase taxonBase, SynonymRelationshipType type, Integer pageSize, Integer pageNumber,\r
+ List<OrderHint> orderHints, List<String> propertyPaths, Direction direction) {\r
+ Integer numberOfResults = dao.countSynonymRelationships(taxonBase, type, direction);\r
+ \r
+ List<SynonymRelationship> results = new ArrayList<SynonymRelationship>();\r
+ if(numberOfResults > 0) { // no point checking again\r
+ results = dao.getSynonymRelationships(taxonBase, type, pageSize, pageNumber, orderHints, propertyPaths, direction); \r
+ }\r
+ return results;\r
+ }\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.service.ITaxonService#matchToTaxon(eu.etaxonomy.cdm.model.name.NonViralName)\r
+ */\r
+ @Override\r
+ public Taxon findBestMatchingTaxon(String taxonName) {\r
+ \r
+ Taxon matchedTaxon = null;\r
+ try{\r
+ // 1. search for acceptet taxa\r
+ List<TaxonBase> taxonList = dao.findByNameTitleCache(Taxon.class, taxonName, null, MatchMode.EXACT, null, 0, null, null);\r
+ for(IdentifiableEntity taxonBaseCandidate : taxonList){\r
+ if(taxonBaseCandidate instanceof Taxon){\r
+ matchedTaxon = (Taxon)taxonBaseCandidate;\r
+ if(taxonList.size() > 1){\r
+ logger.info(taxonList.size() + " TaxonBases found, using first accepted Taxon: " + matchedTaxon.getTitleCache());\r
+ return matchedTaxon;\r
+ } else {\r
+ logger.info("using accepted Taxon: " + matchedTaxon.getTitleCache());\r
+ return matchedTaxon;\r
+ }\r
+ //TODO extend method: search using treeUUID, using SecUUID, first find accepted then include synonyms until a matching taxon is found \r
+ }\r
+ }\r
+ \r
+ // 2. search for synonyms\r
+ List<TaxonBase> synonymList = dao.findByNameTitleCache(Synonym.class, taxonName, null, MatchMode.EXACT, null, 0, null, null);\r
+ for(TaxonBase taxonBase : synonymList){\r
+ if(taxonBase instanceof Synonym){\r
+ Set<Taxon> acceptetdCandidates = ((Synonym)taxonBase).getAcceptedTaxa();\r
+ if(!acceptetdCandidates.isEmpty()){\r
+ matchedTaxon = acceptetdCandidates.iterator().next();\r
+ if(acceptetdCandidates.size() == 1){\r
+ logger.info(acceptetdCandidates.size() + " Accepted taxa found for synonym " + taxonBase.getTitleCache() + ", using first one: " + matchedTaxon.getTitleCache());\r
+ return matchedTaxon;\r
+ } else {\r
+ logger.info("using accepted Taxon " + matchedTaxon.getTitleCache() + "for synonym " + taxonBase.getTitleCache());\r
+ return matchedTaxon;\r
+ }\r
+ //TODO extend method: search using treeUUID, using SecUUID, first find accepted then include synonyms until a matching taxon is found\r
+ }\r
+ }\r
+ }\r
+ \r
+ } catch (Exception e){\r
+ logger.error(e);\r
+ }\r
+ \r
+ return matchedTaxon;\r
+ }\r
+\r
+ @Override\r
+ public Synonym findBestMatchingSynonym(String taxonName) {\r
+ List<TaxonBase> synonymList = dao.findByNameTitleCache(Synonym.class, taxonName, null, MatchMode.EXACT, null, 0, null, null);\r
+ if(! synonymList.isEmpty()){\r
+ Synonym result = CdmBase.deproxy(synonymList.iterator().next(), Synonym.class);\r
+ if(synonymList.size() == 1){\r
+ logger.info(synonymList.size() + " Synonym found " + result.getTitleCache() );\r
+ return result;\r
+ } else {\r
+ logger.info("Several matching synonyms found. Using first: " + result.getTitleCache());\r
+ return result;\r
+ }\r
+ }\r
+ return null;\r
+ }\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.service.ITaxonService#moveSynonymToAnotherTaxon(eu.etaxonomy.cdm.model.taxon.SynonymRelationship, eu.etaxonomy.cdm.model.taxon.Taxon, eu.etaxonomy.cdm.model.reference.Reference, java.lang.String)\r
+ */\r
+ @Override\r
+ public Taxon moveSynonymToAnotherTaxon(SynonymRelationship synonymRelation,\r
+ Taxon toTaxon, SynonymRelationshipType synonymRelationshipType, Reference reference, String referenceDetail) {\r
+ Taxon fromTaxon = synonymRelation.getAcceptedTaxon();\r
+ \r
+ fromTaxon.removeSynonymRelation(synonymRelation);\r
+ \r
+ toTaxon.addSynonym(synonymRelation.getSynonym(), synonymRelationshipType);\r
+ \r
+ return toTaxon;\r
+ }\r
+ \r
+ \r
}\r