bugfixes for TCS Import

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlImportBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlImportBase.java
index 8a0bb616ac4f73f0d522c44a102e178a4da968c5..8a3883d769ed7757c9983f116140d081872238c3 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlImportBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlImportBase.java
@@ -262,10 +262,12 @@ public abstract class TcsXmlImportBase  extends CdmImportBase<TcsXmlImportConfig
                        childName = "MicroReference";\r
                        obligatory = false;\r
                        Element elMicroReference = XmlHelp.getSingleChildElement(success, elAccordingToDetailed, childName, tcsNamespace, obligatory);\r
-                       String microReference = elMicroReference.getTextNormalize();\r
-                       if (CdmUtils.Nz(microReference).equals("")){\r
-                               //TODO\r
-                               logger.warn("MicroReference not yet implemented for AccordingToDetailed");      \r
+                       if (elMicroReference != null){\r
+                               String microReference = elMicroReference.getTextNormalize();\r
+                               if (CdmUtils.Nz(microReference).equals("")){\r
+                                       //TODO\r
+                                       logger.warn("MicroReference not yet implemented for AccordingToDetailed");      \r
+                               }\r
                        }\r
                }\r
                return result;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonNameImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonNameImport.java
index 9c40b51715dcd3eb4a7b9eb03afa6f799f4f8b95..a41332b5bf1b1c7f6430013eb6994265b5f76954 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonNameImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonNameImport.java
@@ -12,8 +12,8 @@ package eu.etaxonomy.cdm.io.tcsxml.in;
 import java.util.ArrayList;\r
 import java.util.Collection;\r
 import java.util.List;\r
-import java.util.Map;\r
 \r
+import org.apache.commons.lang.StringUtils;\r
 import org.apache.log4j.Logger;\r
 import org.jdom.Element;\r
 import org.jdom.Namespace;\r
@@ -22,21 +22,18 @@ import org.springframework.stereotype.Component;
 import eu.etaxonomy.cdm.common.ResultWrapper;\r
 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.io.tcsxml.TcsXmlTransformer;\r
 import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor;\r
 import eu.etaxonomy.cdm.model.agent.Person;\r
 import eu.etaxonomy.cdm.model.agent.Team;\r
-import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.name.CultivarPlantName;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\r
 import eu.etaxonomy.cdm.model.name.NonViralName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.name.ZoologicalName;\r
-import eu.etaxonomy.cdm.model.reference.IGeneric;\r
 import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;\r
@@ -264,7 +261,7 @@ public class TcsXmlTaxonNameImport extends TcsXmlImportBase implements ICdmIO<Tc
                        obligatory = false;\r
                        Element elUninomial = XmlHelp.getSingleChildElement(success, elCanonicalName, childName, ns, obligatory);\r
                        String uninomial = (elUninomial == null)? "" : elUninomial.getTextNormalize();\r
-                       if (! uninomial.trim().equals("")){\r
+                       if (StringUtils.isNotBlank(uninomial)){\r
                                nonViralName.setGenusOrUninomial(uninomial);\r
                                if (nonViralName.getRank() != null && nonViralName.getRank().isLower(Rank.GENUS())){  // TODO check\r
                                        logger.warn("Name " + simple + " lower then 'genus' but has a canonical name part 'Uninomial'.");\r
@@ -275,13 +272,15 @@ public class TcsXmlTaxonNameImport extends TcsXmlImportBase implements ICdmIO<Tc
                        childName = "Genus";\r
                        obligatory = false;\r
                        Element elGenus = XmlHelp.getSingleChildElement(success, elCanonicalName, childName, ns, obligatory);\r
-                       String genus = (elGenus == null)? "" : elGenus.getTextNormalize();\r
-                       //TODO do Attributes reference\r
-                       makeGenusReferenceType(name, elGenus, taxonNameMap, success);\r
-                       if (! genus.trim().equals("")){\r
-                               nonViralName.setGenusOrUninomial(genus);\r
-                               if (nonViralName.getRank() != null &&  ! nonViralName.getRank().isLower(Rank.GENUS() )){  // TODO check\r
-                                       logger.warn("Name " + simple + " is not lower then 'genus' but has canonical name part 'Genus'.");\r
+                       if (elGenus != null){\r
+                               //TODO do Attributes reference\r
+                               makeGenusReferenceType(name, elGenus, taxonNameMap, success);\r
+                               String genus = elGenus.getTextNormalize();\r
+                               if (StringUtils.isNotBlank(genus)){\r
+                                       nonViralName.setGenusOrUninomial(genus);\r
+                                       if (nonViralName.getRank() != null &&  ! nonViralName.getRank().isLower(Rank.GENUS() )){  // TODO check\r
+                                               logger.warn("Name " + simple + " is not lower then 'genus' but has canonical name part 'Genus'.");\r
+                                       }\r
                                }\r
                        }\r
                        \r