(no commit message)

[cdmlib.git] / cdmlib-io / src / main / java / eu / etaxonomy / cdm / io / tcs / TcsTaxonIO.java

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcs/TcsTaxonIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcs/TcsTaxonIO.java
index 84342b9ec90417c394cd54380d0b70e9437c85d6..f0781fd40ec88ba58fa231f8a68d2e32f5d5acbc 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcs/TcsTaxonIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcs/TcsTaxonIO.java
@@ -106,20 +106,12 @@ public class TcsTaxonIO  extends TcsIoBase implements ICdmIO {
                TcsImportConfigurator tcsConfig = (TcsImportConfigurator)config;\r
                Element root = tcsConfig.getSourceRoot();\r
                boolean success =true;\r
-               INameService nameService = cdmApp.getNameService();\r
                \r
-               String prefix;\r
-               Namespace rdfNamespace = root.getNamespace();\r
-               prefix = "tc";\r
-               Namespace taxonConceptNamespace = root.getNamespace(prefix);\r
-               prefix = "tcom";\r
-               Namespace commonNamespace = root.getNamespace(prefix);\r
-               prefix = "tgeo";\r
-               Namespace geoNamespace = root.getNamespace(prefix);\r
-\r
+               Namespace rdfNamespace = tcsConfig.getRdfNamespace();\r
+               \r
                String idNamespace = "TaxonConcept";\r
                xmlElementName = "TaxonConcept";\r
-               elementNamespace = taxonConceptNamespace;\r
+               elementNamespace = tcsConfig.getTcNamespace();\r
                List<Element> elTaxonConcepts = root.getChildren(xmlElementName, elementNamespace);\r
 \r
                ITaxonService taxonService = cdmApp.getTaxonService();\r
@@ -134,7 +126,7 @@ public class TcsTaxonIO  extends TcsIoBase implements ICdmIO {
                        \r
                        //hasName\r
                        xmlElementName = "hasName";\r
-                       elementNamespace = taxonConceptNamespace;\r
+                       elementNamespace = tcsConfig.getTcNamespace();\r
                        xmlAttributeName = "resource";\r
                        attributeNamespace = rdfNamespace;\r
                        String strNameResource= XmlHelp.getChildAttributeValue(elTaxonConcept, xmlElementName, elementNamespace, xmlAttributeName, attributeNamespace);\r
@@ -142,7 +134,7 @@ public class TcsTaxonIO  extends TcsIoBase implements ICdmIO {
                                \r
                        //accordingTo\r
                        xmlElementName = "accordingTo";\r
-                       elementNamespace = taxonConceptNamespace;\r
+                       elementNamespace = tcsConfig.getTcNamespace();\r
                        xmlAttributeName = "resource";\r
                        attributeNamespace = rdfNamespace;\r
                        //String strAccordingTo = elTaxonConcept.getChildTextTrim(xmlElementName, elementNamespace);\r
@@ -161,13 +153,16 @@ public class TcsTaxonIO  extends TcsIoBase implements ICdmIO {
                        \r
                        //FIXME or synonym\r
                        TaxonBase taxonBase;\r
+                       Namespace geoNamespace = tcsConfig.getGeoNamespace();\r
                        if (hasIsSynonymRelation(elTaxonConcept, rdfNamespace)){\r
+                               //Synonym\r
                                taxonBase = Synonym.NewInstance(taxonNameBase, sec);\r
                                List<DescriptionElementBase> geo = makeGeo(elTaxonConcept, geoNamespace, rdfNamespace);\r
                                if (geo.size() > 0){\r
                                        logger.warn("Synonym (" + taxonAbout + ") has geo description!");\r
                                }\r
                        }else{\r
+                               //Taxon\r
                                Taxon taxon = Taxon.NewInstance(taxonNameBase, sec);\r
                                List<DescriptionElementBase> geoList = makeGeo(elTaxonConcept, geoNamespace, rdfNamespace);\r
                                TaxonDescription description = TaxonDescription.NewInstance(taxon);\r