minor

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 a149bd86c67da1d07e0b9c8b7f9d0540f8f247cc..e84d681295979f6736c949cc6ac426a6d4765806 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
@@ -147,6 +147,8 @@ public class BerlinModelTaxonNameImport extends BerlinModelImportBase {
                                Object exBasAuthorFk = rs.getObject("ExBasAuthorTeamFk");\r
                                String strCultivarGroupName = rs.getString("CultivarGroupName");\r
                                String strCultivarName = rs.getString("CultivarName");\r
+                               String nameCache = rs.getString("NameCache");\r
+                               String fullNameCache = rs.getString("FullNameCache");\r
                                \r
                                try {\r
                                        boolean useUnknownRank = true;\r
@@ -265,11 +267,11 @@ public class BerlinModelTaxonNameImport extends BerlinModelImportBase {
                                        Boolean preliminaryFlag = rs.getBoolean("PreliminaryFlag");\r
                                        if (preliminaryFlag == true){\r
                                                //Computes all caches and sets \r
+                                               taxonNameBase.setTitleCache(fullNameCache, true);\r
                                                taxonNameBase.setFullTitleCache(taxonNameBase.getFullTitleCache(), true);\r
-                                               taxonNameBase.setTitleCache(taxonNameBase.getTitleCache(), true);\r
                                                if (taxonNameBase instanceof NonViralName){\r
                                                        NonViralName nvn = (NonViralName)taxonNameBase;\r
-                                                       nvn.setNameCache(nvn.getNameCache(), true);\r
+                                                       nvn.setNameCache(nameCache, true);\r
                                                        nvn.setAuthorshipCache(nvn.getAuthorshipCache(), true);\r
                                                }\r
                                        }\r
@@ -302,6 +304,8 @@ public class BerlinModelTaxonNameImport extends BerlinModelImportBase {
                        result = getRank(state, BerlinModelTransformer.uuidRankProles, rankStr, "Rank Proles", rankAbbrev, Rank.SPECIES().getVocabulary());\r
                }else if(CdmUtils.nullSafeEqual(rankAbbrev, "race")){\r
                        result = getRank(state, BerlinModelTransformer.uuidRankRace, rankStr, "Rank Race", rankAbbrev, Rank.SPECIES().getVocabulary());\r
+//             }else if(CdmUtils.nullSafeEqual(rankAbbrev, "taxon")){\r
+//                     result = getRank(state, BerlinModelTransformer.uuidRankTaxon, rankStr, "Rank [taxon]", rankAbbrev, Rank.SPECIES().getVocabulary());\r
                }else{\r
                        result = rank;\r
                        logger.warn("Unhandled rank: " + rankAbbrev);\r