From 0e6f259fb241c183cc8505806c49e0cd7e6fb431 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Thu, 23 Sep 2010 02:24:17 +0000
Subject: [PATCH] bugfixes for TCS Import

---
 .../cdm/io/tcsxml/in/TcsXmlImportBase.java    | 10 ++++----
 .../io/tcsxml/in/TcsXmlTaxonNameImport.java   | 23 +++++++++----------
 2 files changed, 17 insertions(+), 16 deletions(-)

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 8a0bb616ac..8a3883d769 100644
--- 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";
 			obligatory = false;
 			Element elMicroReference = XmlHelp.getSingleChildElement(success, elAccordingToDetailed, childName, tcsNamespace, obligatory);
-			String microReference = elMicroReference.getTextNormalize();
-			if (CdmUtils.Nz(microReference).equals("")){
-				//TODO
-				logger.warn("MicroReference not yet implemented for AccordingToDetailed");	
+			if (elMicroReference != null){
+				String microReference = elMicroReference.getTextNormalize();
+				if (CdmUtils.Nz(microReference).equals("")){
+					//TODO
+					logger.warn("MicroReference not yet implemented for AccordingToDetailed");	
+				}
 			}
 		}
 		return result;
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 9c40b51715..a41332b5bf 100644
--- 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;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.jdom.Element;
 import org.jdom.Namespace;
@@ -22,21 +22,18 @@ import org.springframework.stereotype.Component;
 import eu.etaxonomy.cdm.common.ResultWrapper;
 import eu.etaxonomy.cdm.common.XmlHelp;
 import eu.etaxonomy.cdm.io.common.ICdmIO;
-import eu.etaxonomy.cdm.io.common.IImportConfigurator;
 import eu.etaxonomy.cdm.io.common.ImportHelper;
 import eu.etaxonomy.cdm.io.common.MapWrapper;
 import eu.etaxonomy.cdm.io.tcsxml.TcsXmlTransformer;
 import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.name.CultivarPlantName;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.name.ZoologicalName;
-import eu.etaxonomy.cdm.model.reference.IGeneric;
 import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;
@@ -264,7 +261,7 @@ public class TcsXmlTaxonNameImport extends TcsXmlImportBase implements ICdmIO<Tc
 			obligatory = false;
 			Element elUninomial = XmlHelp.getSingleChildElement(success, elCanonicalName, childName, ns, obligatory);
 			String uninomial = (elUninomial == null)? "" : elUninomial.getTextNormalize();
-			if (! uninomial.trim().equals("")){
+			if (StringUtils.isNotBlank(uninomial)){
 				nonViralName.setGenusOrUninomial(uninomial);
 				if (nonViralName.getRank() != null && nonViralName.getRank().isLower(Rank.GENUS())){  // TODO check
 					logger.warn("Name " + simple + " lower then 'genus' but has a canonical name part 'Uninomial'.");
@@ -275,13 +272,15 @@ public class TcsXmlTaxonNameImport extends TcsXmlImportBase implements ICdmIO<Tc
 			childName = "Genus";
 			obligatory = false;
 			Element elGenus = XmlHelp.getSingleChildElement(success, elCanonicalName, childName, ns, obligatory);
-			String genus = (elGenus == null)? "" : elGenus.getTextNormalize();
-			//TODO do Attributes reference
-			makeGenusReferenceType(name, elGenus, taxonNameMap, success);
-			if (! genus.trim().equals("")){
-				nonViralName.setGenusOrUninomial(genus);
-				if (nonViralName.getRank() != null &&  ! nonViralName.getRank().isLower(Rank.GENUS() )){  // TODO check
-					logger.warn("Name " + simple + " is not lower then 'genus' but has canonical name part 'Genus'.");
+			if (elGenus != null){
+				//TODO do Attributes reference
+				makeGenusReferenceType(name, elGenus, taxonNameMap, success);
+				String genus = elGenus.getTextNormalize();
+				if (StringUtils.isNotBlank(genus)){
+					nonViralName.setGenusOrUninomial(genus);
+					if (nonViralName.getRank() != null &&  ! nonViralName.getRank().isLower(Rank.GENUS() )){  // TODO check
+						logger.warn("Name " + simple + " is not lower then 'genus' but has canonical name part 'Genus'.");
+					}
 				}
 			}
 			
-- 
2.34.1