exception handling for missing occurrence tables in BM import

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceImport.java
index 38990e0e9379e38e84a43c0a76d6a7d5efcac586..437028374184a751e137c4583ff58df0ea047e8e 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceImport.java
@@ -348,7 +348,16 @@ public class BerlinModelOccurrenceImport  extends BerlinModelImportBase {
         * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)\r
         */\r
        protected boolean isIgnore(BerlinModelImportState state){\r
-               return ! state.getConfig().isDoOccurrence();\r
+               if (! state.getConfig().isDoOccurrence()){\r
+                       return true;\r
+               }else{\r
+                       if (!this.checkSqlServerColumnExists(state.getConfig().getSource(), "emOccurrence", "OccurrenceId")){\r
+                               logger.error("emOccurrence table or emOccurrenceId does not exist. Must ignore occurrence import");\r
+                               return true;\r
+                       }else{\r
+                               return false;\r
+                       }\r
+               }\r
        }\r
        \r
 }\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceSourceImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceSourceImport.java
index eadea4b90f814ad4aa672066cff2bb0d3601a143..75526d1c26db30b462757a8e17fa43848a5160c9 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceSourceImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceSourceImport.java
@@ -336,7 +336,16 @@ public class BerlinModelOccurrenceSourceImport  extends BerlinModelImportBase {
         * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)\r
         */\r
        protected boolean isIgnore(BerlinModelImportState state){\r
-               return ! state.getConfig().isDoOccurrence();\r
+               if (! state.getConfig().isDoOccurrence()){\r
+                       return true;\r
+               }else{\r
+                       if (!this.checkSqlServerColumnExists(state.getConfig().getSource(), "emOccurrenceSource", "OccurrenceSourceId")){\r
+                               logger.error("emOccurrenceSource table or emOccurrenceSourceId does not exist. Must ignore occurrence import");\r
+                               return true;\r
+                       }else{\r
+                               return false;\r
+                       }\r
+               }\r
        }\r
        \r
 }\r