adaptions to 5.23 and prior

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java
index f9ee13d77a244bc11459e20cf4644b8f4949e696..6c0d6fecd3931533f55e716e934f6d134622e939 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java
@@ -24,7 +24,6 @@ import static eu.etaxonomy.cdm.io.common.ImportHelper.NO_OVERWRITE;
 import static eu.etaxonomy.cdm.io.common.ImportHelper.OBLIGATORY;
 import static eu.etaxonomy.cdm.io.common.ImportHelper.OVERWRITE;
 
-import eu.etaxonomy.cdm.common.URI;
 import java.net.URISyntaxException;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -44,6 +43,7 @@ import org.springframework.stereotype.Component;
 
 import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.common.DOI;
+import eu.etaxonomy.cdm.common.URI;
 import eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer;
 import eu.etaxonomy.cdm.io.berlinModel.in.validation.BerlinModelReferenceImportValidator;
 import eu.etaxonomy.cdm.io.common.ICdmImport;
@@ -1225,14 +1225,9 @@ public class BerlinModelReferenceImport extends BerlinModelImportBase {
         return result;
     }
 
-    /**
-     * @param team
-     * @param refAuthorString
-     * @param refId
-     */
     private static void checkTeam(Team team, String refAuthorString, Integer refId) {
         TeamDefaultCacheStrategy formatter = (TeamDefaultCacheStrategy) team.getCacheStrategy();
-        formatter.setEtAlPosition(100);
+
         if (formatter.getTitleCache(team).equals(refAuthorString)){
             team.setProtectedTitleCache(false);
         }else if(formatter.getTitleCache(team).replace(" & ", ", ").equals(refAuthorString.replace(" & ", ", ").replace(" ,", ","))){
@@ -1248,14 +1243,8 @@ public class BerlinModelReferenceImport extends BerlinModelImportBase {
             team.setTitleCache(refAuthorString, true);
             logger.warn("Creation of titleCache for team with members did not (fully) work: " + refAuthorString + " <-> " + formatter.getTitleCache(team)+ " : " + refId);
         }
-
     }
 
-    /**
-     * @param hasDedupMember
-     * @param result
-     * @return
-     */
     private static void checkPerson(Person person, String refAuthorString, boolean hasDedupMember, Integer refId) {
         PersonDefaultCacheStrategy formatter = (PersonDefaultCacheStrategy) person.getCacheStrategy();
 
@@ -1294,10 +1283,6 @@ public class BerlinModelReferenceImport extends BerlinModelImportBase {
         }
     }
 
-    /**
-     * @param refAuthorString
-     * @return
-     */
     private static boolean containsEdOrColon(String str) {
         if (str.contains(" ed.") || str.contains(" Ed.") || str.contains("(ed.")
                 || str.contains("[ed.") || str.contains("(Eds)") || str.contains("(Eds.)") ||

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTaxonExport.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTaxonExport.java
index 93a0e74a5e93e658f3a586fd74ea4226602c8e6b..3d97d5f0d1b17689f7af5a30b730eb7b60b58af4 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTaxonExport.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTaxonExport.java
@@ -30,6 +30,7 @@ import org.springframework.transaction.TransactionStatus;
 
 import eu.etaxonomy.cdm.api.service.TaxonServiceImpl;
 import eu.etaxonomy.cdm.common.CdmUtils;
+import eu.etaxonomy.cdm.format.reference.NomenclaturalSourceFormatter;
 import eu.etaxonomy.cdm.io.common.Source;
 import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;
 import eu.etaxonomy.cdm.io.common.mapping.out.DbConstantMapper;
@@ -52,10 +53,10 @@ import eu.etaxonomy.cdm.model.common.RelationshipBase;
 import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
 import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
+import eu.etaxonomy.cdm.model.name.NomenclaturalSource;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonName;
-import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
@@ -1557,23 +1558,23 @@ public class PesiTaxonExport extends PesiExportBase {
         */
        @SuppressWarnings("unused")
        private static String getNomRefString(TaxonName taxonName) {
-               INomenclaturalReference ref = taxonName.getNomenclaturalReference();
-               if (ref == null){
+               NomenclaturalSource nomSource = taxonName.getNomenclaturalSource();
+               if (nomSource == null || nomSource.getCitation() == null){
                        return null;
                }
                String result = null;
                EnumSet<PesiSource> sources = getSources(taxonName);
                if(sources.contains(PesiSource.EM)){
-                   if (! ref.isProtectedAbbrevTitleCache()){
-                       ref.setAbbrevTitleCache(null, false);  //to remove a false cache
+                   if (! nomSource.getCitation().isProtectedAbbrevTitleCache()){
+                       nomSource.getCitation().setAbbrevTitleCache(null, false);  //to remove a false cache
                    }
-                   result = ref.getNomenclaturalCitation(taxonName.getNomenclaturalMicroReference());
+                   result = NomenclaturalSourceFormatter.INSTANCE().format(nomSource);
                }else if(sources.contains(PesiSource.FE)||sources.contains(PesiSource.IF) ){
             //TODO still need to check if correct for FE + IF
-                   if (! ref.isProtectedAbbrevTitleCache()){
-                ref.setAbbrevTitleCache(null, false);  //to remove a false cache
+                   if (! nomSource.getCitation().isProtectedAbbrevTitleCache()){
+                       nomSource.getCitation().setAbbrevTitleCache(null, false);  //to remove a false cache
             }
-            result = ref.getNomenclaturalCitation(taxonName.getNomenclaturalMicroReference());
+            result = NomenclaturalSourceFormatter.INSTANCE().format(nomSource);
             return result;   // according to SQL script
                }else if(sources.contains(PesiSource.ERMS)) {
             //result = null; //according to SQL script