(no commit message)

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelFactsIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelFactsIO.java
index 5e2dd6488513db86ca4f9424ee75be2d9d8bf5b0..7ca1383db2ef513514d8a8bac689fbc307994e41 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelFactsIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelFactsIO.java
@@ -10,7 +10,6 @@ import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.FACT_OBSERV
 import java.sql.ResultSet;\r
 import java.sql.SQLException;\r
 import java.util.Collection;\r
-import java.util.HashMap;\r
 import java.util.HashSet;\r
 import java.util.Map;\r
 import java.util.Set;\r
@@ -26,7 +25,6 @@ import eu.etaxonomy.cdm.io.common.ICdmIO;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
 import eu.etaxonomy.cdm.io.common.MapWrapper;\r
 import eu.etaxonomy.cdm.io.common.Source;\r
-import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
@@ -131,9 +129,6 @@ public class BerlinModelFactsIO  extends BerlinModelIOBase {
                Source source = bmiConfig.getSource();\r
                ITaxonService taxonService = cdmApp.getTaxonService();\r
                \r
-               String dbAttrName;\r
-               String cdmAttrName;\r
-               \r
                logger.info("start makeFacts ...");\r
                \r
                MapWrapper<Feature> featureMap = invokeFactCategories(bmiConfig, cdmApp);\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcs/TcsTransformer.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcs/TcsTransformer.java
index d911f0808d16559dd9ac08bf8b27187a29f0cd47..cc5fccdfb946406bea55348882cb85229cb9cbc6 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcs/TcsTransformer.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcs/TcsTransformer.java
@@ -50,11 +50,19 @@ public final class TcsTransformer {
                String tcsRoot = "http://rs.tdwg.org/ontology/voc/TaxonRank#";\r
                String tcsGenus = tcsRoot + "Genus";\r
                String tcsSpecies = tcsRoot + "Species";\r
-//             String tcsGenus = tcsRoot + "Genus";\r
+               String tcsVariety = tcsRoot + "Variety";\r
+               String tcsSubVariety = tcsRoot + "Sub-Variety";\r
+               String tcsForm = tcsRoot + "Form";\r
+               String tcsSubSpecies = tcsRoot + "Subspecies";\r
+               \r
                \r
                if (strRank == null){return null;\r
                }else if (tcsGenus.equals(strRank)){return Rank.GENUS();\r
                }else if (tcsSpecies.equals(strRank)){return Rank.SPECIES();\r
+               }else if (tcsVariety.equals(strRank)){return Rank.VARIETY();\r
+               }else if (tcsSubVariety.equals(strRank)){return Rank.SUBVARIETY();\r
+               }else if (tcsSubSpecies.equals(strRank)){return Rank.SUBSPECIES();\r
+               }else if (tcsForm.equals(strRank)){return Rank.FORM();\r
                }       \r
                else {\r
                        throw new UnknownCdmTypeException("Unknown Rank " + strRank);\r