fix regression in fieldUnitDTO with wrong collector+collectionNr

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 b3b5edc3196558c476092c944dacfcda41325e7a..df08995965b4372cc5827ba60eb271e39118baf0 100644 (file)
--- 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
                 collectionString += (fieldNumber != null ? fieldNumber : "");
                 collectionString.trim();
             }
-            fieldUnitDTO.setCollection(collectionString);
+            fieldUnitDTO.setCollectingString(collectionString);
             // Date
             Partial gatheringDate = gatheringEvent.getGatheringDate();
             String dateString = null;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/FieldUnitDTO.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/FieldUnitDTO.java
index 4f4cc32a0869063c9758022f5980eb6f66e10a87..60a335b0cae7056213a8bb16e3f3781f7b382533 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/FieldUnitDTO.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/FieldUnitDTO.java
@@ -14,8 +14,9 @@ public class FieldUnitDTO extends DerivateDTO{
 
     //Row Attributes
        private String country;
-       private String collectionString;
+       private String collectingString;
        private String date;
+       private String collectionString;
 
        private boolean hasType;
        private List<UUID> taxonRelatedDerivedUnits = new ArrayList<>();
@@ -67,6 +68,21 @@ public class FieldUnitDTO extends DerivateDTO{
     public void setCollection(String collection) {
         this.collectionString = collection;
     }
+
+    /**
+     * @return the collectionString
+     */
+
+    public String getCollectingString() {
+        return collectingString;
+    }
+    /**
+     * @param collectionString the collectionString to set
+     */
+    public void setCollectingString(String collectingString) {
+        this.collectingString = collectingString;
+    }
+
     /**
      * @return the date
      */