ref #9932 handle Plantae and Tracheophyta

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/mexico/MexicoEfloraActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/mexico/MexicoEfloraActivator.java
index d45c20e9562b251ef5c25df506c3cab09fbba76e..4c8db46a1234a09e4ad21737f043dcc79a0d5775 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/mexico/MexicoEfloraActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/mexico/MexicoEfloraActivator.java
@@ -50,7 +50,7 @@ public class MexicoEfloraActivator {
 
     //classification
     static final UUID classificationUuid = UUID.fromString("588dd2de-7c95-42ad-8eb1-994460561b5e");
-    private static final String classificationName = "Mexico Eflora";
+    private static final String classificationName = "Plantae";
 
     //check - import
     static final CHECK check = CHECK.IMPORT_WITHOUT_CHECK;

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraTaxonImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraTaxonImport.java
index be1b11940bcfe13bd48767962f398a2c4e49bf14..773efdf83ff988fe867637b6ccc480743a33996e 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraTaxonImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraTaxonImport.java
@@ -69,6 +69,7 @@ public class MexicoEfloraTaxonImport  extends MexicoEfloraImportBase {
        protected String getIdQuery(MexicoEfloraImportState state) {
                String sql = " SELECT IdCAT "
                        + " FROM " + dbTableName
+                       + " WHERE IdCAT NOT IN ('2PLANT','79217TRACH') "
                        + " ORDER BY IdCAT ";
                return sql;
        }

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraTaxonRelationImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraTaxonRelationImport.java
index bdd3699eef8b1e8497f5836f507c7c3362a2c061..55953cf9a3b925abb4f6a837dc960b8eb542aa94 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraTaxonRelationImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraTaxonRelationImport.java
@@ -56,13 +56,14 @@ public class MexicoEfloraTaxonRelationImport extends MexicoEfloraImportBase {
                String sql = " SELECT IdCAT "
                        + " FROM " + dbTableName + " t "
                        + " LEFT JOIN cv1_Controlled_vocabulary_for_name_Ranks r ON t.CategoriaTaxonomica = r.NombreCategoriaTaxonomica "
+                       + " WHERE t.IdCAT_AscendenteHerarquico4CDM NOT IN ('2PLANT','79217TRACH') "
                        + " ORDER BY r.Nivel1, IdCAT ";
                return sql;
        }
 
        @Override
        protected String getRecordQuery(MexicoEfloraImportConfigurator config) {
-               String sqlSelect = " SELECT t.*, acc.uuid accUuid, p.uuid pUuid, bas.uuid basUuid ";
+               String sqlSelect = " SELECT t.*, acc.uuid accUuid, p.uuid pUuid, bas.uuid basUuid, p.IDCat pID ";
                String sqlFrom = " FROM " + dbTableName + " t "
                        + " LEFT JOIN "+dbTableName+" acc ON acc.IdCat = t.IdCATRel "
                        + " LEFT JOIN "+dbTableName+" p ON p.IdCat = t.IdCAT_AscendenteHerarquico4CDM "
@@ -95,11 +96,11 @@ public class MexicoEfloraTaxonRelationImport extends MexicoEfloraImportBase {
                            String accUuidStr = rs.getString("accUuid"); //accepted for synonym
                            String parentUuidStr = rs.getString("pUuid");  //parent
                                String basUuidStr = rs.getString("basUuid"); //basionyms of accepted taxa
+                               String parentId = rs.getString("pID");
 
-//                             UUID accUuid = accUuidStr == null? null : UUID.fromString(accUuidStr);
-//                             UUID parentUuid = parentUuidStr == null? null : UUID.fromString(parentUuidStr);
-//                             UUID basionymUuid = basUuidStr == null? null : UUID.fromString(basUuidStr);
-
+                               if ("2PLANT".equals(parentId) || "79217TRACH".equals(parentId)) {
+                                   parentUuidStr = null;
+                               }
 
                                TaxonBase<?> taxonBase = taxonMap.get(uuid.toString());