Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop

[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / service / IOccurrenceService.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IOccurrenceService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IOccurrenceService.java
index 1436695fec42a0b5a8a6593935b325984e83d0e3..f1237765201f32c3962cec67f89b6a0f0e95083b 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IOccurrenceService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IOccurrenceService.java
@@ -17,7 +17,6 @@ import java.util.Map;
 import java.util.Set;\r
 import java.util.UUID;\r
 \r
-import org.apache.lucene.index.CorruptIndexException;\r
 import org.hibernate.search.spatial.impl.Rectangle;\r
 import org.springframework.transaction.annotation.Transactional;\r
 \r
@@ -37,28 +36,20 @@ import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
 import eu.etaxonomy.cdm.model.description.IndividualsAssociation;\r
-import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.cdm.model.location.Country;\r
 import eu.etaxonomy.cdm.model.location.Point;\r
 import eu.etaxonomy.cdm.model.media.Media;\r
 import eu.etaxonomy.cdm.model.molecular.DnaSample;\r
 import eu.etaxonomy.cdm.model.molecular.Sequence;\r
-import eu.etaxonomy.cdm.model.name.HomotypicalGroup;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;\r
 import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.cdm.model.occurrence.DerivationEvent;\r
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;\r
 import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;\r
 import eu.etaxonomy.cdm.model.occurrence.FieldUnit;\r
-import eu.etaxonomy.cdm.model.occurrence.GatheringEvent;\r
-import eu.etaxonomy.cdm.model.occurrence.MediaSpecimen;\r
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;\r
-import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
-import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
-import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;\r
-import eu.etaxonomy.cdm.persistence.dao.initializer.IBeanInitializer;\r
 import eu.etaxonomy.cdm.persistence.dto.SpecimenNodeWrapper;\r
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;\r
 import eu.etaxonomy.cdm.persistence.query.OrderHint;\r
@@ -696,8 +687,8 @@ public interface IOccurrenceService extends IIdentifiableEntityService<SpecimenO
      * @return\r
      * @throws IOException\r
      */\r
-    List<DerivedUnit> findByAccessionNumber(\r
-             String accessionNumberString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints,\r
+    FieldUnitDTO findByAccessionNumber(\r
+             String accessionNumberString, List<OrderHint> orderHints,\r
             List<String> propertyPaths);\r
 \r
     /**\r
@@ -728,4 +719,11 @@ public interface IOccurrenceService extends IIdentifiableEntityService<SpecimenO
      */\r
     public List<Point> findPointsForFieldUnitList(List<UUID> fieldUnitUuids);\r
 \r
+    /**\r
+     * Load the FieldUnitDTO for the given <code>derivedUnitUuid</code> with all intermediate derivatives and {@link eu.etaxonomy.cdm.api.service.dto.GatheringEventDTO}\r
+     * @param derivedUnitUuid\r
+     * @return\r
+     */\r
+    FieldUnitDTO loadFieldUnitDTO(UUID derivedUnitUuid);\r
+\r
 }\r