commit 9e2583cf100bdd381db772658d98a1a8e46bbc91
Author: Patrick Plitzner
Date: Mon Jul 25 16:42:57 2016 +0200
#5448 Enhance taxon name check
diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenImportNames.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenImportNames.java
index e1f2dc4b..46708870 100644
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenImportNames.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenImportNames.java
@@ -498,13 +498,13 @@ public class RedListGefaesspflanzenImportNames extends DbImportBase taxonBase) {
String nameCache = HibernateProxyHelper.deproxy(taxonBase.getName(), NonViralName.class).getNameCache().trim();
taxNameString = taxNameString.trim();
- taxNameString.replaceAll(" +", " ");
+ taxNameString = taxNameString.replaceAll(" +", " ");
if(taxNameString.endsWith("agg.")){
taxNameString = taxNameString.replace("agg.", "aggr.");
}
- if(hybString.equals(RedListUtil.HYB_X)){
+ if(hybString.equals(RedListUtil.HYB_X) || hybString.equals(RedListUtil.HYB_N)){
taxNameString = taxNameString.replace(" "+RedListUtil.HYB_SIGN+" ", " "+RedListUtil.HYB_SIGN);//hybrid sign has no space after it in titleCache for binomial hybrids
taxNameString = taxNameString.replace(" x ", " "+RedListUtil.HYB_SIGN);//in some cases a standard 'x' is used
}
@@ -523,6 +523,9 @@ public class RedListGefaesspflanzenImportNames extends DbImportBase Column "+RedListUtil.TAXNAME+": "+nameCache+" <-> "+taxNameString, logger);
diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenTransformer.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenTransformer.java
index 256b4f01..6c3d2bc2 100644
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenTransformer.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenTransformer.java
@@ -57,6 +57,7 @@ public final class RedListGefaesspflanzenTransformer extends InputTransformerBas
@Override
public NomenclaturalStatusType getNomenclaturalStatusByKey(String key) throws UndefinedTransformerMethodException {
if (key == null){return null;}
+ key = key.trim();
if (key.equals("nom. cons.")){return NomenclaturalStatusType.CONSERVED();}
else if (key.equals("nom. illeg.")){return NomenclaturalStatusType.ILLEGITIMATE();}
else if (key.equals("nom. inval.")){return NomenclaturalStatusType.INVALID();}