ref #9932 cleanup and minor issues

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraFactCategoryImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraFactCategoryImport.java
index 35c0e3c7e401a292ef5d7500b71a14eb7399314c..c5705b60349d1f844233ce681f967c1e73a147bc 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraFactCategoryImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraFactCategoryImport.java
@@ -107,16 +107,18 @@ public class MexicoEfloraFactCategoryImport extends MexicoEfloraImportBase {
         @SuppressWarnings("unchecked")
         TermVocabulary<Feature> featureVoc = TermVocabulary.NewInstance(TermType.Feature);
 //        featureVoc.setLabel("Catalogo", Language.SPANISH_CASTILIAN());
-        featureVoc.setTitleCache("Catalogo", true);
+        featureVoc.setLabel("Catalogo", Language.SPANISH_CASTILIAN());
 
+        //hierarchical feature tree
         TermTree<Feature> featureTree = TermTree.NewFeatureInstance(state.getConfig().getFeatureTreeUuid());
-        featureTree.setTitleCache(state.getConfig().getFeatureTreeTitle(), true);
+        featureTree.setLabel(state.getConfig().getFeatureTreeTitle(), Language.SPANISH_CASTILIAN());
         featureTree.setUuid(state.getConfig().getFeatureTreeUuid());
         featureTree.getRoot().addChild(Feature.DISTRIBUTION());
         getTermTreeService().save(featureTree);
 
+        //flat feature tree
         TermTree<Feature> flatFeatureTree = TermTree.NewFeatureInstance(state.getConfig().getFeatureTreeUuid());
-        flatFeatureTree.setTitleCache(state.getConfig().getFlatFeatureTreeTitle(), true);
+        flatFeatureTree.setLabel(state.getConfig().getFlatFeatureTreeTitle(), Language.SPANISH_CASTILIAN());
         flatFeatureTree.setUuid(state.getConfig().getFlatFeatureTreeUuid());
         flatFeatureTree.getRoot().addChild(Feature.DISTRIBUTION());
         getTermTreeService().save(flatFeatureTree);

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportBase.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportBase.java
index be6eaccd16cf0ecca0047e9cb13d32ae03b5c46e..cb6f423c06bad56ae29d67347283aa18167fb6ef 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportBase.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportBase.java
@@ -69,7 +69,7 @@ public abstract class MexicoEfloraImportBase
         }
         result = areaById == null? areaByLabel : areaById;
 
-        if (result == null) {
+        if (result == null && !"ND".equalsIgnoreCase(label)) {  //ND = no data
             logger.warn("Area not found, create new one: " + idRegion + "; " + label);
             NamedAreaLevel level = idTipoRegion != null && idTipoRegion.equals(1)? NamedAreaLevel.COUNTRY() : null;
             NamedAreaType areaType = NamedAreaType.ADMINISTRATION_AREA();

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportState.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportState.java
index 84de6449187f204da8059d4ff393869211b587f2..a6d036de57e28dcb1881e079727d08640781ff26 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportState.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportState.java
@@ -26,7 +26,6 @@ import eu.etaxonomy.cdm.model.term.DefinedTermBase;
  *
  * @author a.mueller
  * @date 29.01.2022
- *
  */
 public class MexicoEfloraImportState
         extends DbImportStateBase<MexicoEfloraImportConfigurator, MexicoEfloraImportState>{