fix person titleCache handling in BerlinModel import

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelUserImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelUserImport.java
index e15d67f52af4e78cb3e559440a71972514310a17..1654276fc74e799f35a878ee060c539655ab7cdb 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelUserImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelUserImport.java
@@ -24,7 +24,6 @@ import org.springframework.transaction.TransactionStatus;
 import eu.etaxonomy.cdm.config.Configuration;\r
 import eu.etaxonomy.cdm.io.berlinModel.in.validation.BerlinModelUserImportValidator;\r
 import eu.etaxonomy.cdm.io.common.IOValidator;\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.model.agent.Person;\r
@@ -64,7 +63,6 @@ public class BerlinModelUserImport extends BerlinModelImportBase {
                BerlinModelImportConfigurator config = state.getConfig();\r
                Source source = config.getSource();\r
                String dbAttrName;\r
-               String cdmAttrName;\r
 \r
                logger.info("start make "+pluralString+" ...");\r
 \r
@@ -100,12 +98,8 @@ public class BerlinModelUserImport extends BerlinModelImportBase {
                                        dbAttrName = "RealName";\r
                                        String realName = rs.getString(dbAttrName);\r
                                        if (isNotBlank(realName)){\r
-                                           cdmAttrName = "TitleCache";\r
                                            Person person = Person.NewInstance();\r
-                                           success &= ImportHelper.addStringValue(rs, person, dbAttrName, cdmAttrName, false);\r
-                                           //only to make deduplication work, due to issue that nomenclaturalTitle does not match because set automatically during save\r
-                                           cdmAttrName = "nomenclaturalTitle";\r
-                                           success &= ImportHelper.addStringValue(rs, person, dbAttrName, cdmAttrName, false);\r
+                                           person.setTitleCache(realName, true);\r
 \r
                                            Person dedupPerson = deduplicatePerson(state, person);\r
                                    if (dedupPerson != person){\r
@@ -144,7 +138,7 @@ public class BerlinModelUserImport extends BerlinModelImportBase {
 \r
                this.commitTransaction(tx);\r
 \r
-               logger.info("end make "+pluralString+" ..." + getSuccessString(success));;\r
+               logger.info("end make "+pluralString+" ..." + getSuccessString(success));\r
                if (!success){\r
                        state.setUnsuccessfull();\r
                }\r