merge pesi->trunk

[cdmlib.git] / cdmlib-io / src / main / java / eu / etaxonomy / cdm / io / berlinModel / in / BerlinModelImportConfigurator.java

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportConfigurator.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportConfigurator.java
index 783c8d3c1b4c6da1f5fd11c71d9fee8d3fd5edbf..229b05ce8f11fa55a72a16966876882711bf2700 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportConfigurator.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportConfigurator.java
@@ -19,16 +19,19 @@ import java.util.Set;
 import org.apache.log4j.Logger;\r
 \r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
+import eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer;\r
+import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelTaxonImport.PublishMarkerChooser;\r
+import eu.etaxonomy.cdm.io.berlinModel.in.validation.BerlinModelGeneralImportValidator;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
 import eu.etaxonomy.cdm.io.common.ImportConfiguratorBase;\r
 import eu.etaxonomy.cdm.io.common.ImportStateBase;\r
 import eu.etaxonomy.cdm.io.common.Source;\r
+import eu.etaxonomy.cdm.io.common.mapping.IInputTransformer;\r
+import eu.etaxonomy.cdm.io.erms.ErmsTransformer;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\r
-import eu.etaxonomy.cdm.model.reference.IDatabase;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
-import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelTaxonImport.PublishMarkerChooser;\r
 \r
 /**\r
  * @author a.mueller\r
@@ -44,8 +47,12 @@ public class BerlinModelImportConfigurator extends ImportConfiguratorBase<Berlin
 \r
        private PublishMarkerChooser taxonPublishMarker = PublishMarkerChooser.ALL;\r
        \r
-       /* Max number of taxa to be saved with one service call */\r
-       private int limitSave = 1000;\r
+       //TODO\r
+       private static IInputTransformer defaultTransformer = null;\r
+       \r
+       \r
+       /* Max number of records to be saved with one service call */\r
+       private int recordsPerTransaction = 1000;\r
 \r
        private Method namerelationshipTypeMethod;\r
        private Method uuidForDefTermMethod;\r
@@ -63,10 +70,11 @@ public class BerlinModelImportConfigurator extends ImportConfiguratorBase<Berlin
        \r
        protected void makeIoClassList(){\r
                ioClassList = new Class[]{\r
-                               BerlinModelGeneralImport.class,\r
-                               BerlinModelUserImport.class,\r
-                               BerlinModelAuthorImport.class,\r
-                               BerlinModelAuthorTeamImport.class\r
+                               BerlinModelGeneralImportValidator.class\r
+                               , BerlinModelUserImport.class\r
+                               , BerlinModelAuthorImport.class\r
+                               , BerlinModelAuthorTeamImport.class\r
+                               , BerlinModelRefDetailImport.class\r
                                , BerlinModelReferenceImport.class\r
                                , BerlinModelTaxonNameImport.class\r
                                , BerlinModelTaxonNameRelationImport.class\r
@@ -99,7 +107,7 @@ public class BerlinModelImportConfigurator extends ImportConfiguratorBase<Berlin
         * @param destination\r
         */\r
        private BerlinModelImportConfigurator(Source berlinModelSource, ICdmDataSource destination) {\r
-          super();\r
+          super(defaultTransformer);\r
           setNomenclaturalCode(NomenclaturalCode.ICBN); //default for Berlin Model\r
           setSource(berlinModelSource);\r
           setDestination(destination);\r
@@ -306,15 +314,15 @@ public class BerlinModelImportConfigurator extends ImportConfiguratorBase<Berlin
        /**\r
         * @return the limitSave\r
         */\r
-       public int getLimitSave() {\r
-               return limitSave;\r
+       public int getRecordsPerTransaction() {\r
+               return recordsPerTransaction;\r
        }\r
 \r
        /**\r
         * @param limitSave the limitSave to set\r
         */\r
-       public void setLimitSave(int limitSave) {\r
-               this.limitSave = limitSave;\r
+       public void setRecordsPerTransaction(int recordsPerTransaction) {\r
+               this.recordsPerTransaction = recordsPerTransaction;\r
        }\r
 \r
 }\r