(no commit message)

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcs/TcsIoBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcs/TcsIoBase.java
index f0b79e417de087bdfa500e9fb045c347d7c882de..2da8a6fd5895b1be2c9f5f3afa7389a77e14f6c0 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcs/TcsIoBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcs/TcsIoBase.java
@@ -12,6 +12,8 @@ package eu.etaxonomy.cdm.io.tcs;
 import static eu.etaxonomy.cdm.io.common.ImportHelper.OBLIGATORY;\r
 import static eu.etaxonomy.cdm.io.common.ImportHelper.OVERWRITE;\r
 \r
+import java.sql.ResultSet;\r
+import java.sql.SQLException;\r
 import java.util.ArrayList;\r
 import java.util.Arrays;\r
 import java.util.Collections;\r
@@ -26,8 +28,12 @@ import org.jdom.Namespace;
 import org.jdom.Text;\r
 \r
 import eu.etaxonomy.cdm.io.common.CdmIoBase;\r
+import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
 import eu.etaxonomy.cdm.io.common.ImportHelper;\r
+import eu.etaxonomy.cdm.model.common.Annotation;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
+import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
+import eu.etaxonomy.cdm.model.common.Language;\r
 \r
 /**\r
  * @author a.mueller\r
@@ -63,7 +69,6 @@ public abstract class TcsIoBase  extends CdmIoBase {
                return true;\r
        }\r
        \r
-       \r
        private Object getValue(CdmIoXmlMapperBase mapper, Element parentElement){\r
                String sourceAttribute = mapper.getSourceAttribute();\r
                Namespace sourceNamespace = mapper.getSourceNamespace(parentElement);\r
@@ -77,8 +82,6 @@ public abstract class TcsIoBase  extends CdmIoBase {
                Object value = child.getTextTrim();\r
                return value;\r
        }\r
-\r
-\r
        \r
        protected boolean checkAdditionalContents(Element parentElement, CdmIoXmlMapperBase[] classMappers, CdmIoXmlMapperBase[] operationalMappers, CdmIoXmlMapperBase[] unclearMappers){\r
                List<Content> additionalContentList = new ArrayList<Content>();\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcs/TcsReferenceIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcs/TcsReferenceIO.java
index df620812845917c3e9dc0ca71c68f17b7bcd815f..2076aa551e20c516a24692dd8181ea55abdc0d23 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcs/TcsReferenceIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcs/TcsReferenceIO.java
@@ -170,7 +170,7 @@ public class TcsReferenceIO extends TcsIoBase implements ICdmIO {
                Namespace publicationNamespace = root.getNamespace(prefix);\r
 \r
                \r
-               \r
+               String idNamespace = "PublicationCitation";\r
                tcsElementName = "PublicationCitation";\r
                tcsNamespace = publicationNamespace;\r
                List<Element> elPublicationCitations = root.getChildren(tcsElementName, tcsNamespace);\r
@@ -241,6 +241,7 @@ public class TcsReferenceIO extends TcsIoBase implements ICdmIO {
                                String strShortTitle = elPublicationCitation.getChildText(tcsElementName, tcsNamespace);\r
                                if (! CdmUtils.Nz(strShortTitle).trim().equals("")){\r
                                        ref.setTitle(strShortTitle);\r
+                                       ImportHelper.setOriginalSource(ref, config.getSourceReference(), strAbout, idNamespace);\r
                                        nomRefMap.put(strAbout, ref);\r
                                        nomRefCount++;\r
                                        nomRefExists = true;\r
@@ -254,10 +255,12 @@ public class TcsReferenceIO extends TcsIoBase implements ICdmIO {
                                        //TODO\r
                                        StrictReferenceBase biblioRef = (StrictReferenceBase)ref.clone();\r
                                        biblioRef.setTitle(strTitle);\r
+                                       ImportHelper.setOriginalSource(ref, config.getSourceReference(), strAbout, idNamespace);\r
                                        referenceMap.put(strAbout, biblioRef);\r
                                        biblioRefsCount++;\r
                                }\r
-\r
+                               \r
+                               \r
                                checkAdditionalContents(elPublicationCitation, standardMappers, operationalMappers, unclearMappers);\r
 \r
                                \r

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 f1011778acb4ae28c439ccb39745e6f042a775c7..84342b9ec90417c394cd54380d0b70e9437c85d6 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
@@ -22,6 +22,7 @@ import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.common.XmlHelp;\r
 import eu.etaxonomy.cdm.io.common.ICdmIO;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
+import eu.etaxonomy.cdm.io.common.ImportHelper;\r
 import eu.etaxonomy.cdm.io.common.MapWrapper;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
@@ -99,9 +100,7 @@ public class TcsTaxonIO  extends TcsIoBase implements ICdmIO {
                String xmlAttributeName;\r
                Namespace elementNamespace;\r
                Namespace attributeNamespace;\r
-               String cdmAttrName;\r
-               String value;\r
-\r
+               \r
                logger.info("start makeTaxa ...");\r
                \r
                TcsImportConfigurator tcsConfig = (TcsImportConfigurator)config;\r
@@ -118,7 +117,7 @@ public class TcsTaxonIO  extends TcsIoBase implements ICdmIO {
                prefix = "tgeo";\r
                Namespace geoNamespace = root.getNamespace(prefix);\r
 \r
-               \r
+               String idNamespace = "TaxonConcept";\r
                xmlElementName = "TaxonConcept";\r
                elementNamespace = taxonConceptNamespace;\r
                List<Element> elTaxonConcepts = root.getChildren(xmlElementName, elementNamespace);\r
@@ -182,7 +181,7 @@ public class TcsTaxonIO  extends TcsIoBase implements ICdmIO {
                        Set<String> omitAttributes = null;\r
                        makeStandardMapper(elTaxonConcept, taxonBase, omitAttributes, standardMappers);\r
 \r
-                       \r
+                       ImportHelper.setOriginalSource(taxonBase, config.getSourceReference(), taxonAbout, idNamespace);\r
                        checkAdditionalContents(elTaxonConcept, standardMappers, operationalMappers, unclearMappers);\r
                        \r
                        taxonMap.put(taxonAbout, taxonBase);\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcs/TcsTaxonNameIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcs/TcsTaxonNameIO.java
index c7b65c8e53aa148d302b7477f415da8977579e48..d745609d8c2d887d761e9ec58105ed769b89d7ee 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcs/TcsTaxonNameIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcs/TcsTaxonNameIO.java
@@ -106,9 +106,10 @@ public class TcsTaxonNameIO  extends TcsIoBase implements ICdmIO {
                Namespace commonNamespace = root.getNamespace(prefix);\r
                //String strTnNamespace = "http://rs.tdwg.org/ontology/voc/TaxonName#";\r
                //Namespace taxonNameNamespace = Namespace.getNamespace("tn", strTnNamespace);\r
+\r
+               String idNamespace = "TaxonName";\r
                \r
                List<Element> elTaxonNames = root.getChildren("TaxonName", taxonNameNamespace);\r
-\r
                \r
                int i = 0;\r
                //for each taxonName\r
@@ -207,6 +208,7 @@ public class TcsTaxonNameIO  extends TcsIoBase implements ICdmIO {
                                        }\r
                                                \r
                                }\r
+                               ImportHelper.setOriginalSource(nameBase, config.getSourceReference(), nameAbout, idNamespace);\r
                                \r
                                checkAdditionalContents(elTaxonName, standardMappers, operationalMappers, unclearMappers);\r
                                \r