From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Wed, 8 Apr 2015 13:06:30 +0000 (+0000)
Subject:  - fixed citation string and specimen determination string in portal assembly
X-Git-Tag: cdmlib-parent-3.5.1~91
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/b0b10ae26a25a8bafecd2297d28fd9b6c6629c25

 - fixed citation string and specimen determination string in portal assembly
---

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
index 50a8568d31..2035010820 100644
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
@@ -426,7 +426,7 @@ public class OccurrenceServiceImpl extends IdentifiableServiceBase<SpecimenOrObs
         assembleDerivateDataDTO(fieldUnitDTO, fieldUnit);
 
         //assemble citation
-        String citation = assembleCitation(fieldUnit);
+        String citation = fieldUnit.getTitleCache();
         if(!preservedSpecimenAccessionNumbers.isEmpty()){
             citation += " (";
             for(String accessionNumber:preservedSpecimenAccessionNumbers){
@@ -458,53 +458,6 @@ public class OccurrenceServiceImpl extends IdentifiableServiceBase<SpecimenOrObs
     }
 
 
-    /**
-     * @param fieldUnit
-     * @param fieldUnitDTO
-     * @param preservedSpecimenAccessionNumbers
-     * @param SEPARATOR_STRING
-     * @return
-     */
-    private String assembleCitation(FieldUnit fieldUnit) {
-        String citation = "";
-        if(fieldUnit.getGatheringEvent()!=null){
-            //Country
-            GatheringEvent gatheringEvent = fieldUnit.getGatheringEvent();
-            NamedArea country = gatheringEvent.getCountry();
-            String countryString = country!=null?country.getDescription():null;
-            citation += countryString+SEPARATOR_STRING;
-
-            //Collection
-            AgentBase collector = gatheringEvent.getCollector();
-            String fieldNumber = fieldUnit.getFieldNumber();
-            String collectionString = "";
-            if(collector!=null || fieldNumber!=null){
-                collectionString += collector!=null?collector:"";
-                if(!collectionString.isEmpty()){
-                    collectionString += " ";
-                }
-                collectionString += (fieldNumber!=null?fieldNumber:"");
-                collectionString.trim();
-            }
-            citation += collectionString;
-            if(fieldUnit.getGatheringEvent().getLocality()!=null){
-                citation += fieldUnit.getGatheringEvent().getLocality().getText();
-                citation += SEPARATOR_STRING;
-            }
-            if(fieldUnit.getGatheringEvent().getExactLocation()!=null
-                    && fieldUnit.getGatheringEvent().getExactLocation().getLatitude()!=null
-                    && fieldUnit.getGatheringEvent().getExactLocation().getLongitude()!=null){
-                citation += fieldUnit.getGatheringEvent().getExactLocation().getLatitude().toString();
-                citation += SEPARATOR_STRING;
-                citation += fieldUnit.getGatheringEvent().getExactLocation().getLongitude().toString();
-                citation += SEPARATOR_STRING;
-            }
-        }
-        citation = removeTail(citation, SEPARATOR_STRING);
-        return citation;
-    }
-
-
     @Override
     public PreservedSpecimenDTO assemblePreservedSpecimenDTO(DerivedUnit derivedUnit){
         return assemblePreservedSpecimenDTO(derivedUnit, null);
@@ -545,7 +498,7 @@ public class OccurrenceServiceImpl extends IdentifiableServiceBase<SpecimenOrObs
         //citation
         Collection<FieldUnit> fieldUnits = getFieldUnits(derivedUnit);
         if(fieldUnits.size()==1){
-            preservedSpecimenDTO.setCitation(assembleCitation(fieldUnits.iterator().next()));
+            preservedSpecimenDTO.setCitation(fieldUnits.iterator().next().getTitleCache());
         }
         else{
             preservedSpecimenDTO.setCitation("No Citation available. This specimen either has no or multiple field units.");
@@ -600,7 +553,7 @@ public class OccurrenceServiceImpl extends IdentifiableServiceBase<SpecimenOrObs
                     TaxonDescription taxonDescription = HibernateProxyHelper.deproxy(individualsAssociation.getInDescription(), TaxonDescription.class);
                     Taxon taxon = taxonDescription.getTaxon();
                     if(taxon!=null && taxon.getName()!=null){
-                        preservedSpecimenDTO.addAssociatedTaxon(taxon.getName().getFullTitleCache());
+                        preservedSpecimenDTO.addAssociatedTaxon(taxon.getName().getTitleCache());
                     }
                 }
             }