update palmae import

diff --git a/.gitattributes b/.gitattributes
index f66eefff526ab0fceba40774c8c4a8e223cacf28..244d8f5cd4d5684c81dc01f2ab3219773ad9407a 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -56,8 +56,8 @@ app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraActivator.java
 app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraDistributionParser.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraImageActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeActivator.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeExcelProtologueActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeImageActivator.java -text
-app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeProtologueActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeProtologueImportActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeTaxonXImportActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/config/PalmaeProtologueImportConfigurator.java -text

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeActivator.java
index 23084cb5a71ea253494d3bc1c84154b3f95354de..8ce702d028ef7852011b37887e8f460ffcd3f49f 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeActivator.java
@@ -43,7 +43,7 @@ public class PalmaeActivator {
        //database validation status (create, update, validate ...)\r
        static DbSchemaValidation hbm2dll = DbSchemaValidation.CREATE;\r
        static final String tcsSource = TcsSources.arecaceae_local();\r
-       static final ICdmDataSource cdmDestination = CdmDestinations.localH2();\r
+       static final ICdmDataSource cdmDestination = CdmDestinations.localH2Palmae();\r
 \r
        static final UUID featureTreeUuid = UUID.fromString("72ccce05-7cc8-4dab-8e47-bf3f5fd848a0");\r
                \r
@@ -53,10 +53,10 @@ public class PalmaeActivator {
        static final boolean pubishReferencesInBibliography = false;\r
        \r
        //should the other imports run as well?\r
-       static final boolean includeTaxonX = false;\r
+       static final boolean includeTaxonX = true;\r
        static final boolean includeImages = true;\r
-       static final boolean includeExcelProtologue = false;\r
-       static final boolean includeMediaProtologue = false;\r
+       static final boolean includeExcelProtologue = true;\r
+       static final boolean includeMediaProtologue = true;\r
        \r
        //check - import\r
        static final CHECK check = CHECK.CHECK_AND_IMPORT;\r
@@ -184,7 +184,7 @@ public class PalmaeActivator {
                if (includeExcelProtologue){\r
                        System.out.println("Start importing protologues ...");\r
                        ImageImportConfigurator imageConfigurator = ImageImportConfigurator.NewInstance(\r
-                                       PalmaeProtologueActivator.sourceFile, cdmDestination, PalmaeProtologueImport.class);\r
+                                       PalmaeExcelProtologueActivator.sourceFile, cdmDestination, PalmaeProtologueImport.class);\r
                        imageConfigurator.setSecUuid(secUuid);\r
                        \r
                        CdmDefaultImport<IImportConfigurator> imageImporter = new CdmDefaultImport<IImportConfigurator>();\r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeProtologueActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeExcelProtologueActivator.java
similarity index 89%
rename from app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeProtologueActivator.java
rename to app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeExcelProtologueActivator.java
index c7cbadf5e4b16906125b75603712151c5099e672..26a969e00f050c361bd736c91cd0c191759636ab 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeProtologueActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeExcelProtologueActivator.java
@@ -26,13 +26,12 @@ import eu.etaxonomy.cdm.io.common.IImportConfigurator;
  * @created 19.11.2008
  * @version 2.0 (18.02.2009)
  */
-public class PalmaeProtologueActivator {
+public class PalmaeExcelProtologueActivator {
        @SuppressWarnings("unused")
-       private static final Logger logger = Logger
-                       .getLogger(PalmaeProtologueActivator.class);
+       private static final Logger logger = Logger.getLogger(PalmaeExcelProtologueActivator.class);
 
        public static final File sourceFile = new File("src/main/resources/images/protologue_links_palmae.xls");
-       private static final ICdmDataSource cdmDestination = CdmDestinations.localH2();
+       private static final ICdmDataSource cdmDestination = CdmDestinations.localH2Palmae();
 
        static final UUID secUuid = UUID.fromString("5f32b8af-0c97-48ac-8d33-6099ed68c625");
        

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/PalmaeProtologueImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/PalmaeProtologueImport.java
index 535ef496a5a3ad1f5218f3fb9e762cb95c7b91a6..7bbd5ae1786041878eb63a6295db5a8a2bab4bef 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/PalmaeProtologueImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/PalmaeProtologueImport.java
@@ -35,14 +35,13 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase;
  */
 @Component
 public class PalmaeProtologueImport extends AbstractImageImporter {
-       private static final Logger logger = Logger
-                       .getLogger(PalmaeProtologueImport.class);
+       private static final Logger logger = Logger.getLogger(PalmaeProtologueImport.class);
 
        public static final String SPECIES = "Species";
-       public static final String TAXONID = "TaxonID";
-       public static final String ACC_OR_SYN = "AcceptedOrSynonym";
-       public static final String AUTHOR = "Author";
-       public static final String REFERENCE = "Reference";
+       public static final String TAXONID = "Taxon ID";
+//     public static final String ACC_OR_SYN = "AcceptedOrSynonym";
+//     public static final String AUTHOR = "Author";
+//     public static final String REFERENCE = "Reference";
        public static final String LINK_PROTO = "Link proto";
        
        /* (non-Javadoc)
@@ -70,9 +69,6 @@ public class PalmaeProtologueImport extends AbstractImageImporter {
                        count++;
                        String species = row.get(PalmaeProtologueImport.SPECIES).trim();
                        String taxonId = row.get(PalmaeProtologueImport.TAXONID);
-                       //String accOrSyn = row.get(PalmaeProtologueImport.ACC_OR_SYN).trim();
-                       //String author = row.get(PalmaeProtologueImport.AUTHOR).trim();                        
-                       //String reference = row.get(PalmaeProtologueImport.REFERENCE).trim();
                        String linkProto= row.get(PalmaeProtologueImport.LINK_PROTO).trim();
                        
                        //logger.info(species + ",  " + taxonId + ",  " + accOrSyn + ",  " + reference + ",  " + linkProto);

diff --git a/app-import/src/main/resources/images/protologue_links_palmae.xls b/app-import/src/main/resources/images/protologue_links_palmae.xls
index 2a1afab80ebf4cb98d89d5a6f0a443caa0bbde7e..51ca3477274614a1ffb0f723cbb959fc0c48b0f6 100644 (file)
Binary files a/app-import/src/main/resources/images/protologue_links_palmae.xls and b/app-import/src/main/resources/images/protologue_links_palmae.xls differ