sdd import matches descriptions to existing taxa & new data from DeltaAccess export

diff --git a/.gitattributes b/.gitattributes
index 966f6636b0db2fe477ea270df0511b76af580fb3..8342688cb91099216d742494975548e71d66f3c7 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -133,6 +133,7 @@ app-import/src/main/resources/images/protologue_links_palmae.xls -text
 app-import/src/main/resources/log4j.properties -text
 app-import/src/main/resources/sdd/Cicad.sdd11.xml -text
 app-import/src/main/resources/sdd/Cicad2.sdd11.xml -text
+app-import/src/main/resources/sdd/Cichorieae-DA-export-sdd.xml -text
 app-import/src/main/resources/sdd/Crepis-test.sdd -text
 app-import/src/main/resources/sdd/Erythroneura.sdd11.xml -text
 app-import/src/main/resources/sdd/LIAS_Main.sdd11.xml -text

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/CichorieaeActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/CichorieaeActivator.java
index e24b91ee9896d03352daa1f596ab5b839b15b2c4..b00e57da2af101e946acdcb61481a40b10ff9e9f 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/CichorieaeActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/CichorieaeActivator.java
@@ -30,10 +30,18 @@ public class CichorieaeActivator {
 \r
        //database validation status (create, update, validate ...)\r
        static DbSchemaValidation hbm2dll = DbSchemaValidation.UPDATE;\r
-       //static final String sddSource = SDDSources.viola_local();\r
-       //      static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_andreasM2();\r
+       \r
+       /********************************************************************************\r
+        * IMPORTANT:\r
+        * \r
+        * execute the following sql statements before runniung the import\r
+        * \r
+        * ALTER TABLE `statedata_definedtermbase`  DROP INDEX `modifiers_id`;\r
+        * ALTER TABLE `statisticalmeasurementvalue_definedtermbase`  DROP INDEX `modifiers_id`;\r
+        * \r
+        ********************************************************************************/\r
        static final ICdmDataSource cdmDestination = CdmDestinations.local_cdm_edit_cichorieae_b();\r
-       static final String sddSource = SDDSources.Crepis_test_local();\r
+       static final String sddSource = SDDSources.Cichorieae_DA_export_sdd();\r
        //      static final ICdmDataSource cdmDestination = CdmDestinations.cdm_portal_test_localhost();\r
 \r
        static final String sourceSecId = "cichorieae-crepis-sdd-import";\r
@@ -54,15 +62,15 @@ public class CichorieaeActivator {
        static final boolean doRelTaxa = true;\r
        static final boolean doFacts = true;\r
 \r
+       static final boolean doMatchTaxa = true;\r
 \r
        /**\r
         * @param args\r
         */\r
        public static void main(String[] args) {\r
-               //System.out.println("Jobi joba"); \r
-               logger.info("Start import from SDDDD("+ sddSource.toString() + ") ...");\r
 \r
-               //make BerlinModel Source\r
+               logger.info("Start import from SDD ("+ sddSource.toString() + ") ...");\r
+\r
                String source = sddSource;\r
                ICdmDataSource destination = cdmDestination;\r
 \r
@@ -83,6 +91,8 @@ public class CichorieaeActivator {
                sddImportConfigurator.setCheck(check);\r
                sddImportConfigurator.setDbSchemaValidation(hbm2dll);\r
                \r
+               sddImportConfigurator.setDoMatchTaxa(doMatchTaxa);\r
+               \r
 \r
                // invoke import\r
                CdmDefaultImport<SDDImportConfigurator> sddImport = new CdmDefaultImport<SDDImportConfigurator>();\r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/SDDSources.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/SDDSources.java
index 5adee2c6e1e2bffe91b719853ba25a7743f7b334..bd08b6387c621f8fdf1a2ade2139ea7e0a7d19ee 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/SDDSources.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/SDDSources.java
@@ -82,8 +82,13 @@ public class SDDSources {
        public static String Crepis_test_local(){
                URL url = new SDDSources().getClass().getResource("/sdd/Crepis-test.sdd");
                String sourceUrl = url.toString();
-               return sourceUrl;
-               
-}
+               return sourceUrl;       
+       }
+       
+       public static String Cichorieae_DA_export_sdd(){
+               URL url = new SDDSources().getClass().getResource("/sdd/Cichorieae-DA-export-sdd.xml");
+               String sourceUrl = url.toString();
+               return sourceUrl;       
+       }
        
 }

diff --git a/app-import/src/main/resources/sdd/Cichorieae-DA-export-sdd.xml b/app-import/src/main/resources/sdd/Cichorieae-DA-export-sdd.xml
new file mode 100644 (file)
index 0000000..62c3bd4
Binary files /dev/null and b/app-import/src/main/resources/sdd/Cichorieae-DA-export-sdd.xml differ

diff --git a/app-import/src/main/resources/sdd/Crepis-test.sdd b/app-import/src/main/resources/sdd/Crepis-test.sdd
index ca9e6e9d67e895d0e2e184437703b6c0f58cc16e..8b4a593c6f04a5cb025e4865fd4a3d3821e0cf54 100644 (file)
Binary files a/app-import/src/main/resources/sdd/Crepis-test.sdd and b/app-import/src/main/resources/sdd/Crepis-test.sdd differ