bugfix for empty annotations in BM import

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 03605161366f37085c37ca530dda7e84a75c19b8..9a527be61b6cf433c3314fe1c1fcc6935c64fffc 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
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.cdm.io.berlinModel.in;\r
 \r
-import java.lang.reflect.InvocationTargetException;\r
 import java.lang.reflect.Method;\r
 import java.sql.ResultSet;\r
 import java.sql.ResultSetMetaData;\r
@@ -24,18 +23,13 @@ import org.joda.time.DateTime;
 \r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.io.common.CdmImportBase;\r
-import eu.etaxonomy.cdm.io.common.CdmIoBase;\r
 import eu.etaxonomy.cdm.io.common.ICdmIO;\r
-import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
 import eu.etaxonomy.cdm.io.common.ImportHelper;\r
-import eu.etaxonomy.cdm.io.common.ImportStateBase;\r
-import eu.etaxonomy.cdm.io.common.MapWrapper;\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
-import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.common.ExtensionType;\r
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
@@ -95,7 +89,7 @@ public abstract class BerlinModelImportBase extends CdmImportBase<BerlinModelImp
                } catch (SQLException e) {\r
                        //Table "Name" has no updated when/who\r
                }\r
-               Object notes = rs.getObject("notes");\r
+               String notes = rs.getString("notes");\r
                \r
                boolean success  = true;\r
                \r
@@ -126,11 +120,11 @@ public abstract class BerlinModelImportBase extends CdmImportBase<BerlinModelImp
                \r
                \r
                //notes\r
-               if (notes != null){\r
+               if (CdmUtils.isNotEmpty(notes)){\r
                        String notesString = String.valueOf(notes);\r
-                       if (notesString.length() > 3999 ){\r
-                               notesString = notesString.substring(0, 3996) + "...";\r
-                               logger.warn("Notes string is longer than 3999 and was truncated: " + annotatableEntity);\r
+                       if (notesString.length() > 65530 ){\r
+                               notesString = notesString.substring(0, 65530) + "...";\r
+                               logger.warn("Notes string is longer than 65530 and was truncated: " + annotatableEntity);\r
                        }\r
                        Annotation notesAnnotation = Annotation.NewInstance(notesString, null);\r
                        //notesAnnotation.setAnnotationType(AnnotationType.EDITORIAL());\r