ref #9932 continue Mexico eflora import

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 17d1236d20dd84620ae473c827c4d4489d202f0a..857a6763e1d46d8730221c58a0671557cd65fece 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
@@ -14,11 +14,11 @@ import java.util.UUID;
 import org.apache.log4j.Logger;
 
 import eu.etaxonomy.cdm.app.common.CdmDestinations;
-import eu.etaxonomy.cdm.common.URI;
 import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK;
+import eu.etaxonomy.cdm.io.common.Source;
 import eu.etaxonomy.cdm.io.mexico.MexicoConabioTransformer;
 import eu.etaxonomy.cdm.io.mexico.MexicoEfloraImportConfigurator;
 import eu.etaxonomy.cdm.model.reference.Reference;
@@ -56,7 +56,7 @@ public class MexicoEfloraActivator {
 
     protected void doImport(ICdmDataSource cdmDestination){
 
-        URI source = borhidi();
+        Source source = mexicoEfloraDb();
 
         //make Source
         MexicoEfloraImportConfigurator config= MexicoEfloraImportConfigurator.NewInstance(source, cdmDestination);
@@ -86,8 +86,8 @@ public class MexicoEfloraActivator {
 
 
     //Mexico eflora
-    public static URI borhidi() {
-        return URI.create("file:////BGBM-PESIHPC/Mexico/Borhidi_2012.xlsx");
+    public static Source mexicoEfloraDb() {
+        return new Source(Source.MYSQL, "localhost", "mexico_eflora", 3306);
     }
 
 

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportConfigurator.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportConfigurator.java
index b60cf55ca330983c8c5bc6e9e496b2785af4310f..d261d02af2e2997d2583deb77a382dd4dbd5001d 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportConfigurator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportConfigurator.java
@@ -21,6 +21,7 @@ import eu.etaxonomy.cdm.io.common.DbImportConfiguratorBase;
 import eu.etaxonomy.cdm.io.common.Source;
 import eu.etaxonomy.cdm.io.common.mapping.IInputTransformer;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
+import eu.etaxonomy.cdm.model.reference.Reference;
 
 /**
  * Configurator for Mexico Eflora import.
@@ -65,6 +66,9 @@ public class MexicoEfloraImportConfigurator
        private UUID featureTreeUuid;
        private String featureTreeTitle;
 
+
+    private Reference secReference;
+
     @Override
     protected void makeIoClassList(){
                ioClassList = new Class[]{
@@ -215,4 +219,11 @@ public class MexicoEfloraImportConfigurator
         this.doNamedAreas = doNamedAreas;
     }
 
+    public Reference getSecReference() {
+        return secReference;
+    }
+    public void setSecReference(Reference secReference) {
+        this.secReference = secReference;
+    }
+
 }

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 aa0d178f4fda4d70b6b165f618e10f60691e7573..330c06010397ca7449dba740ece61cb388e0087b 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
@@ -20,7 +20,6 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
-import eu.etaxonomy.cdm.database.update.DatabaseTypeNotSupportedException;
 import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelReferenceImport;
 import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelTaxonNameImport;
 import eu.etaxonomy.cdm.io.common.ResultSetPartitioner;
@@ -189,9 +188,6 @@ public class MexicoEfloraTaxonImport  extends MexicoEfloraImportBase {
                                        success = false;
                                }
                        }
-               } catch (DatabaseTypeNotSupportedException e) {
-                       logger.error("MethodNotSupportedException:" +  e);
-                       return false;
                } catch (Exception e) {
                        logger.error("SQLException:" +  e);
                        return false;