use uuid for BMNameImport

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java
index e303f918a5eb47ecc1ec93cf67435d3d825e3c79..918f06bc0c3276c54eb34c4855ecae2cdbd99b3f 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java
@@ -73,9 +73,6 @@ public class BerlinModelTaxonNameImport extends BerlinModelImportBase {
        }\r
 \r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportBase#getIdQuery(eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportState)\r
-        */\r
        @Override\r
        protected String getIdQuery(BerlinModelImportState state) {\r
                if (state.getConfig().getNameIdTable()==null ){\r
@@ -85,10 +82,6 @@ public class BerlinModelTaxonNameImport extends BerlinModelImportBase {
                }\r
        }\r
        \r
-       \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportBase#getRecordQuery()\r
-        */\r
        @Override\r
        protected String getRecordQuery(BerlinModelImportConfigurator config) {\r
                Source source = config.getSource();\r
@@ -142,10 +135,7 @@ public class BerlinModelTaxonNameImport extends BerlinModelImportBase {
                }\r
        }\r
 \r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#doPartition(eu.etaxonomy.cdm.io.berlinModel.in.ResultSetPartitioner, eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportState)\r
-        */\r
+       @Override\r
        public boolean doPartition(ResultSetPartitioner partitioner, BerlinModelImportState state) {\r
                String dbAttrName;\r
                String cdmAttrName;\r
@@ -173,6 +163,10 @@ public class BerlinModelTaxonNameImport extends BerlinModelImportBase {
                                String strCultivarName = rs.getString("CultivarName");\r
                                String nameCache = rs.getString("NameCache");\r
                                String fullNameCache = rs.getString("FullNameCache");\r
+                               String uuid = null;\r
+                               if (resultSetHasColumn(rs,"UUID")){\r
+                                       uuid = rs.getString("UUID");\r
+                               }\r
                                \r
                                try {\r
                                        \r
@@ -203,6 +197,9 @@ public class BerlinModelTaxonNameImport extends BerlinModelImportBase {
                                        }else{\r
                                                taxonNameBase = NonViralName.NewInstance(rank);\r
                                        }\r
+                                       if (uuid != null){\r
+                                               taxonNameBase.setUuid(UUID.fromString(uuid));\r
+                                       }\r
                                        \r
                                        if (rank == null){\r
                                                //TODO rank should never be null or a more sophisticated algorithm has to be implemented for genus/supraGenericName\r
@@ -343,6 +340,7 @@ public class BerlinModelTaxonNameImport extends BerlinModelImportBase {
                }\r
                return result;\r
        }\r
+       \r
        @Override\r
        public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, BerlinModelImportState state) {\r
                String nameSpace;\r
@@ -514,18 +512,12 @@ public class BerlinModelTaxonNameImport extends BerlinModelImportBase {
                }\r
        }\r
        \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IImportConfigurator)\r
-        */\r
        @Override\r
        protected boolean doCheck(BerlinModelImportState state){\r
                IOValidator<BerlinModelImportState> validator = new BerlinModelTaxonNameImportValidator();\r
                return validator.validate(state);\r
        }\r
        \r
-       /* (non-Javadoc)\r
-        * @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().isDoTaxonNames();\r
        }\r