exclude updated_when from TaxonName

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportBase.java
index 2d7c001dc5f702bf2f09cd5897fa4797a5381b5e..37dab4f54480310ff26da4e30a4645d3896039f7 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportBase.java
@@ -25,11 +25,11 @@ import org.joda.time.DateTime;
 import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.io.common.CdmImportBase;\r
 import eu.etaxonomy.cdm.io.common.ICdmIO;\r
+import eu.etaxonomy.cdm.io.common.IImportConfigurator.EDITOR;\r
 import eu.etaxonomy.cdm.io.common.IPartitionedIO;\r
 import eu.etaxonomy.cdm.io.common.ImportHelper;\r
 import eu.etaxonomy.cdm.io.common.ResultSetPartitioner;\r
 import eu.etaxonomy.cdm.io.common.Source;\r
-import eu.etaxonomy.cdm.io.common.IImportConfigurator.EDITOR;\r
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;\r
 import eu.etaxonomy.cdm.model.common.Annotation;\r
 import eu.etaxonomy.cdm.model.common.AnnotationType;\r
@@ -120,19 +120,31 @@ public abstract class BerlinModelImportBase extends CdmImportBase<BerlinModelImp
                return success;\r
        }\r
        \r
-       protected boolean doIdCreatedUpdatedNotes(BerlinModelImportState state, IdentifiableEntity identifiableEntity, ResultSet rs, long id, String namespace)\r
-                       throws SQLException{\r
+       protected boolean doIdCreatedUpdatedNotes(BerlinModelImportState state, IdentifiableEntity identifiableEntity, ResultSet rs, long id, String namespace, boolean excludeUpdated) \r
+                               throws SQLException{\r
                boolean success = true;\r
                //id\r
                success &= ImportHelper.setOriginalSource(identifiableEntity, state.getConfig().getSourceReference(), id, namespace);\r
                //createdUpdateNotes\r
-               success &= doCreatedUpdatedNotes(state, identifiableEntity, rs);\r
+               success &= doCreatedUpdatedNotes(state, identifiableEntity, rs, excludeUpdated);\r
                return success;\r
        }\r
+\r
        \r
+       protected boolean doIdCreatedUpdatedNotes(BerlinModelImportState state, IdentifiableEntity identifiableEntity, ResultSet rs, long id, String namespace)\r
+                       throws SQLException{\r
+               boolean excludeUpdated = false;\r
+               return doIdCreatedUpdatedNotes(state, identifiableEntity, rs, id, namespace, excludeUpdated);\r
+       }\r
        \r
        protected boolean doCreatedUpdatedNotes(BerlinModelImportState state, AnnotatableEntity annotatableEntity, ResultSet rs)\r
                        throws SQLException{\r
+               boolean excludeUpdated = false;\r
+               return doCreatedUpdatedNotes(state, annotatableEntity, rs, excludeUpdated);\r
+       }\r
+       \r
+       protected boolean doCreatedUpdatedNotes(BerlinModelImportState state, AnnotatableEntity annotatableEntity, ResultSet rs, boolean excludeUpdated)\r
+                       throws SQLException{\r
 \r
                BerlinModelImportConfigurator config = state.getConfig();\r
                Object createdWhen = rs.getObject("Created_When");\r
@@ -140,11 +152,13 @@ public abstract class BerlinModelImportBase extends CdmImportBase<BerlinModelImp
                createdWho = handleHieraciumPilosella(createdWho);\r
                Object updatedWhen = null;\r
                String updatedWho = null;\r
-               try {\r
-                       updatedWhen = rs.getObject("Updated_When");\r
-                       updatedWho = rs.getString("Updated_who");\r
-               } catch (SQLException e) {\r
-                       //Table "Name" has no updated when/who\r
+               if (excludeUpdated == false){\r
+                       try {\r
+                               updatedWhen = rs.getObject("Updated_When");\r
+                               updatedWho = rs.getString("Updated_who");\r
+                       } catch (SQLException e) {\r
+                               //Table "Name" has no updated when/who\r
+                       }\r
                }\r
                String notes = rs.getString("notes");\r
                \r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java
index c9f8c00cd5e6e08d39f2580892f3dd78ffb13120..b917b0b7305639d658eb41e00cc55c4b296d30f4 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java
@@ -221,7 +221,8 @@ public class BerlinModelTaxonNameImport extends BerlinModelImportBase {
                                        }\r
                                        \r
                                        //created, notes\r
-                                       success &= doIdCreatedUpdatedNotes(state, taxonNameBase, rs, nameId, NAMESPACE);\r
+                                       boolean excludeUpdated = true;\r
+                                       success &= doIdCreatedUpdatedNotes(state, taxonNameBase, rs, nameId, NAMESPACE, excludeUpdated);\r
        \r
                                        //NonViralName\r
                                        if (taxonNameBase instanceof NonViralName){\r