dwca bugfix for new signature

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/dwca/DwcaExportActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/dwca/DwcaExportActivator.java
index ded0eb6f6d1aacf2661f47c2ca811627075d66b9..359272a646195b386821f0a94ca7d255d097aadd 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/dwca/DwcaExportActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/dwca/DwcaExportActivator.java
@@ -9,19 +9,24 @@
 \r
 package eu.etaxonomy.cdm.app.dwca;\r
 \r
 \r
 package eu.etaxonomy.cdm.app.dwca;\r
 \r

+import java.io.File;\r
+import java.net.URI;\r

 import java.util.Arrays;\r
 import java.util.Arrays;\r

-import java.util.HashSet;\r

 import java.util.List;\r
 import java.util.List;\r

-import java.util.Set;\r

 import java.util.UUID;\r
 \r
 import org.apache.log4j.Logger;\r
 import java.util.UUID;\r
 \r
 import org.apache.log4j.Logger;\r

+import org.joda.time.DateTime;\r

 \r
 import eu.etaxonomy.cdm.app.common.CdmDestinations;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
 import eu.etaxonomy.cdm.io.common.CdmDefaultExport;\r
 import eu.etaxonomy.cdm.io.common.IExportConfigurator.CHECK;\r
 \r
 import eu.etaxonomy.cdm.app.common.CdmDestinations;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
 import eu.etaxonomy.cdm.io.common.CdmDefaultExport;\r
 import eu.etaxonomy.cdm.io.common.IExportConfigurator.CHECK;\r

+import eu.etaxonomy.cdm.io.dwca.out.DwcaEmlRecord;\r

 import eu.etaxonomy.cdm.io.dwca.out.DwcaTaxExportConfigurator;\r
 import eu.etaxonomy.cdm.io.dwca.out.DwcaTaxExportConfigurator;\r

+import eu.etaxonomy.cdm.model.agent.Institution;\r
+import eu.etaxonomy.cdm.model.agent.InstitutionalMembership;\r
+import eu.etaxonomy.cdm.model.agent.Person;\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -34,9 +39,9 @@ public class DwcaExportActivator {
        private static final Logger logger = Logger.getLogger(DwcaExportActivator.class);\r
 \r
        //database validation status (create, update, validate ...)\r
        private static final Logger logger = Logger.getLogger(DwcaExportActivator.class);\r
 \r
        //database validation status (create, update, validate ...)\r

-       private static final String fileDestination = "C:\\tmp\\dwcaTmp";\r
-//     private static final ICdmDataSource cdmSource = CdmDestinations.cdm_test_local_mysql();\r
-       private static final ICdmDataSource cdmSource = CdmDestinations.cdm_production_cichorieae();\r
+       private static final String fileDestination = "C:\\tmp\\dwcaTmp\\";\r
+       private static final ICdmDataSource cdmSource = CdmDestinations.cdm_test_local_mysql();\r
+//     private static final ICdmDataSource cdmSource = CdmDestinations.cdm_production_cichorieae();\r

        \r
        //check - import\r
        private static final CHECK check = CHECK.EXPORT_WITHOUT_CHECK;\r
        \r
        //check - import\r
        private static final CHECK check = CHECK.EXPORT_WITHOUT_CHECK;\r


@@ -49,26 +54,30 @@ public class DwcaExportActivator {
        \r
        \r
 // ****************** ALL *****************************************\r
        \r
        \r
 // ****************** ALL *****************************************\r

-//     private boolean doTaxa = false;\r
-//     private boolean doResourceRelation = true;\r
-//     private boolean doTypesAndSpecimen = true;\r
-//     private boolean doVernacularNames = true;\r
-//     private boolean doReferences = true;\r
-//     private boolean doDescription = true;\r
-//     private boolean doDistributions = true;\r
-//     private boolean doImages = true;\r
-\r
-\r
-// ************************ NONE **************************************** //\r
-       private boolean doTaxa = false;\r
-       private boolean doResourceRelation = false;\r
-       private boolean doTypesAndSpecimen = false;\r
-       private boolean doVernacularNames = false;\r
-       private boolean doReferences = false;\r
+       \r
+       private boolean doTaxa = true;\r
+       private boolean doResourceRelation = true;\r
+       private boolean doTypesAndSpecimen = true;\r
+       private boolean doVernacularNames = true;\r
+       private boolean doReferences = true;\r

        private boolean doDescription = true;\r
        private boolean doDescription = true;\r

-       private boolean doDistributions = false;\r
-       private boolean doImages = false;\r
+       private boolean doDistributions = true;\r
+       private boolean doImages = true;\r
+       private boolean doMetaData = true;\r
+       private boolean doEml = true;\r

 \r
 \r

+// ************************ NONE **************************************** //\r
+       \r
+//     private boolean doTaxa = false;\r
+//     private boolean doResourceRelation = false;\r
+//     private boolean doTypesAndSpecimen = false;\r
+//     private boolean doVernacularNames = false;\r
+//     private boolean doReferences = false;\r
+//     private boolean doDescription = false;\r
+//     private boolean doDistributions = false;\r
+//     private boolean doImages = false;\r
+//     private boolean doMetaData = false;\r
+//     private boolean doEml = false;\r

        \r
        public boolean  doExport(ICdmDataSource source){\r
                System.out.println("Start export to DWC-A ("+ fileDestination + ") ...");\r
        \r
        public boolean  doExport(ICdmDataSource source){\r
                System.out.println("Start export to DWC-A ("+ fileDestination + ") ...");\r


@@ -87,8 +96,9 @@ public class DwcaExportActivator {
                \r
                //make file destination\r
                String destination = fileDestination;\r
                \r
                //make file destination\r
                String destination = fileDestination;\r

+               DwcaEmlRecord emlRecord = getEmlRecord();\r

                \r
                \r

-               DwcaTaxExportConfigurator config = DwcaTaxExportConfigurator.NewInstance(source, destination);\r
+               DwcaTaxExportConfigurator config = DwcaTaxExportConfigurator.NewInstance(source, new File(destination), emlRecord);\r

                \r
                config.setDoTaxa(doTaxa);\r
                config.setDoResourceRelation(doResourceRelation);\r
                \r
                config.setDoTaxa(doTaxa);\r
                config.setDoResourceRelation(doResourceRelation);\r


@@ -98,6 +108,8 @@ public class DwcaExportActivator {
                config.setDoDescription(doDescription);\r
                config.setDoDistributions(doDistributions);\r
                config.setDoImages(doImages);\r
                config.setDoDescription(doDescription);\r
                config.setDoDistributions(doDistributions);\r
                config.setDoImages(doImages);\r

+               config.setDoMetaData(doMetaData);\r
+               config.setDoEml(doEml);\r

                config.setCheck(check);\r
                \r
                config.setFeatureExclusions(featureExclusions);\r
                config.setCheck(check);\r
                \r
                config.setFeatureExclusions(featureExclusions);\r


@@ -110,6 +122,33 @@ public class DwcaExportActivator {
        }\r
 \r
 \r
        }\r
 \r
 \r

+       private DwcaEmlRecord getEmlRecord() {\r
+               DwcaEmlRecord emlRecord = new DwcaEmlRecord();\r
+               emlRecord.setIdentifier("My Identifier");\r
+               emlRecord.setTitle("Cich DB");\r
+               emlRecord.setPublicationDate(new DateTime());\r
+               emlRecord.setExpectedCitation("Expected Citation");\r
+               emlRecord.setAbstractInfo("The abstract");\r
+               emlRecord.setAdditionalInformation("Add info");\r
+               emlRecord.setResourceLanguage(null);\r
+               emlRecord.setResourceUrl(URI.create("http://wp6-cichorieae.e-taxonomy.eu/portal/"));\r
+               emlRecord.setMetaDataLanguage(null);\r
+               emlRecord.setResourceLogoUri(null);\r
+               emlRecord.setCreativeCommonsLicensing(null);\r
+               emlRecord.setProjectTitle("Projekt tit");\r
+               emlRecord.setProjectLead("Proj Lead");\r
+               emlRecord.setProjectDescription("Proj Desc");\r
+               \r
+               Person person = Person.NewInstance();\r
+               Institution institution = Institution.NewInstance();\r
+               \r
+               InstitutionalMembership m = person.addInstitutionalMembership(institution, null, null, null);\r
+               emlRecord.setResourceCreator(m);\r
+               \r
+               return emlRecord;\r
+       }\r
+\r
+\r

        /**\r
         * @param args\r
         */\r
        /**\r
         * @param args\r
         */\r