some updates to ILDIS activator

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/IldisActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/IldisActivator.java
index e94c5745245e574356358399e9cbe92878c63667..b1dea9bde722a5424b9cf862c0f91c9c39ed460f 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/IldisActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/IldisActivator.java
@@ -9,7 +9,6 @@
 */\r
 package eu.etaxonomy.cdm.app.berlinModelImport;\r
 \r
-import java.io.File;\r
 import java.util.UUID;\r
 \r
 import org.apache.log4j.Logger;\r
@@ -36,38 +35,25 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
  *\r
  */\r
 public class IldisActivator {\r
+       @SuppressWarnings("unused")\r
        private static final Logger logger = Logger.getLogger(FaunaEuropaeaActivator.class);\r
        //database validation status (create, update, validate ...)\r
        static DbSchemaValidation hbm2dll = DbSchemaValidation.CREATE;\r
        static final Source berlinModelSource = BerlinModelSources.ILDIS();\r
-       static final ICdmDataSource cdmDestination = CdmDestinations.cdm_ildis_dev();\r
+//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_ildis_dev();\r
+       static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_mysql();\r
+       \r
 \r
        static final UUID secUuid = UUID.fromString("a7f29364-ce98-4c1d-ad2e-3d889cc5885c");\r
        static final UUID classificationUuid = UUID.fromString("c7a4e447-ca1e-46e9-adb9-037dab039ccc");\r
-       static final int sourceSecId = 7800000;\r
+       static final int sourceSecId = 8500000;\r
        \r
        static final UUID featureTreeUuid = UUID.fromString("9703afa5-3104-4b3b-b498-f549c0df2d2a");\r
        static final Object[] featureKeyList = new Integer[]{1, 43, 31, 4, 12, 98, 41};         \r
        \r
-       /* --------- MEDIA recources ------------ */\r
-       static final boolean stopOnMediaErrors = true;\r
-       static final String protologueUrlString = "http://wp5.e-taxonomy.eu/dataportal/cichorieae/media/protolog/";\r
-       //Mac\r
-       //static final File protologuePath = new File("/Volumes/protolog/protolog/");\r
-       //Windows\r
-       public static final String imageFolderString  = "//media/editwp6/photos";\r
-       static final File protologuePath = new File("//media/editwp6/protolog");\r
-//     public static final File imageFolder  = new File("/media/photos");\r
-//     static final File protologuePath = new File("/media/protolog");\r
-       /* -------------------------------------- */\r
-       \r
        // set to zero for unlimited nameFacts\r
        static final int recordsPerTransaction = 2000;\r
        \r
-       //should the other imports run as well?\r
-       static final boolean includeImages = true;\r
-       \r
-       \r
        //check - import\r
        static final CHECK check = CHECK.CHECK_AND_IMPORT;\r
 \r
@@ -162,29 +148,6 @@ public class IldisActivator {
                bmImportConfigurator.setDbSchemaValidation(hbm2dll);\r
                bmImportConfigurator.setRecordsPerTransaction(recordsPerTransaction);\r
                \r
-\r
-//             // protologueResourceLocations\r
-//             if ( protologuePath.exists() && protologuePath.isDirectory()){\r
-//                     bmImportConfigurator.setMediaUrl(protologueUrlString);\r
-//                     bmImportConfigurator.setMediaPath(protologuePath);\r
-//             }else{\r
-//                     if(stopOnMediaErrors){\r
-//                             logger.error("Could not configure protologue ResourceLocations -> will quit.");\r
-//                             System.exit(-1);\r
-//                     }\r
-//                     logger.error("Could not configure protologue ResourceLocations");\r
-//             }\r
-//             \r
-//             File imageFolder = new File(imageFolderString);\r
-//             // also check the image source folder\r
-//             if ( !imageFolder.exists() || !imageFolder.isDirectory()){\r
-//                     if(stopOnMediaErrors){\r
-//                             logger.error("Could not configure imageFolder  -> will quit.");\r
-//                             System.exit(-1);\r
-//                     }\r
-//                     logger.error("Could not configure imageFolder");\r
-//             }\r
-               \r
                bmImportConfigurator.setCheck(check);\r
                bmImportConfigurator.setEditor(editor);\r
                \r
@@ -206,26 +169,6 @@ public class IldisActivator {
                \r
                System.out.println("End import from BerlinModel ("+ source.getDatabase() + ")...");\r
 \r
-               \r
-//             if (includeImages) {\r
-//                     System.out.println("Start importing images ...");\r
-//                     CdmDefaultImport<IImportConfigurator> imageImporter = new CdmDefaultImport<IImportConfigurator>();\r
-//                     URI imageFolderCichorieae;\r
-//                     try {\r
-//                             imageFolderCichorieae = new URI(CichorieaeActivator.imageFolderString);\r
-//                             ImageImportConfigurator imageConfigurator = ImageImportConfigurator.NewInstance(\r
-//                                             imageFolderCichorieae, destination, CichorieaeImageImport.class);\r
-//                             imageConfigurator.setSecUuid(secUuid);\r
-//                             imageConfigurator.setClassificationUuid(classificationUuid);\r
-//                             success &= imageImporter.invoke(imageConfigurator);\r
-//                     } catch (URISyntaxException e) {\r
-//                             e.printStackTrace();\r
-//                     }\r
-//                             System.out.println("End importing images ...");\r
-//             }\r
-\r
-               logger.warn("!!!! NOTE: RefDetail notes and RelPTaxon notes are not imported automatically. Please check for these notes and import them manually.");\r
-               \r
                return success;\r
                \r
        }\r