(no commit message)

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelImportActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelImportActivator.java
index 910565f4e965163cbad176fe45f9a9d7d74af510..b5316bb227fb799f9b3f0c55b6860ff5fbcfd395 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelImportActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelImportActivator.java
@@ -32,13 +32,13 @@ public class BerlinModelImportActivator {
        //static final Source berlinModelSource = BerlinModelSources.EDIT_Diptera();\r
        static final Source berlinModelSource = BerlinModelSources.editWP6();   \r
        //static final ICdmDataSource cdmDestination = CdmDestinations.cdm_edit_diptera();\r
        //static final Source berlinModelSource = BerlinModelSources.EDIT_Diptera();\r
        static final Source berlinModelSource = BerlinModelSources.editWP6();   \r
        //static final ICdmDataSource cdmDestination = CdmDestinations.cdm_edit_diptera();\r

-    static final ICdmDataSource cdmDestination = CdmDestinations.cdm_portal_test();\r
+    static final ICdmDataSource cdmDestination = CdmDestinations.cdm_portal_test_localhost();\r

        \r
        //authors\r
        static final boolean doAuthors = true;\r
        //references\r
        static final DO_REFERENCES doReferences =  DO_REFERENCES.ALL;\r
        \r
        //authors\r
        static final boolean doAuthors = true;\r
        //references\r
        static final DO_REFERENCES doReferences =  DO_REFERENCES.ALL;\r

-       static final CHECK check = CHECK.CHECK_ONLY;\r
+       static final CHECK check = CHECK.CHECK_AND_IMPORT;\r

        //names\r
        static final boolean doTaxonNames = true;\r
        static final boolean doRelNames = true;\r
        //names\r
        static final boolean doTaxonNames = true;\r
        static final boolean doRelNames = true;\r


@@ -78,7 +78,7 @@ public class BerlinModelImportActivator {
                // invoke import\r
                BerlinModelImport bmImport = new BerlinModelImport();\r
                bmImport.doCheck(bmImportConfigurator);\r
                // invoke import\r
                BerlinModelImport bmImport = new BerlinModelImport();\r
                bmImport.doCheck(bmImportConfigurator);\r

-               //bmImport.doImport(bmImportConfigurator);\r
+               bmImport.doImport(bmImportConfigurator);\r

 \r
                System.out.println("End import from BerlinModel ("+ source.getDatabase() + ")...");\r
        }\r
 \r
                System.out.println("End import from BerlinModel ("+ source.getDatabase() + ")...");\r
        }\r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmDestinations.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmDestinations.java
index 5c2a780d61eef7cd667363b67c7a9bcbe53e7d15..19f5192804003aee81b561a7cf74dd068015c8be 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmDestinations.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmDestinations.java
@@ -79,6 +79,14 @@ public class CdmDestinations {
                return makeDestination(cdmServer, cdmDB, -1, cdmUserName, null);\r
        }\r
        \r
                return makeDestination(cdmServer, cdmDB, -1, cdmUserName, null);\r
        }\r
        \r

+       public static ICdmDataSource cdm_portal_test_localhost(){\r
+               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;\r
+               String cdmServer = "127.0.0.1";\r
+               String cdmDB = "cdm_portal_test";\r
+               String cdmUserName = "edit";\r
+               return makeDestination(cdmServer, cdmDB, -1, cdmUserName, null);\r
+       }\r
+       \r

        public static ICdmDataSource cdm_edit_cichorieae(){\r
                DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;\r
                String cdmServer = "192.168.2.10";\r
        public static ICdmDataSource cdm_edit_cichorieae(){\r
                DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;\r
                String cdmServer = "192.168.2.10";\r