BGBM BDI Projects
/
cdmlib-apps.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
06b01c2
)
Fix import of misapplied names
author
Patrick Plitzner
<p.plitzner@bgbm.org>
Mon, 4 Apr 2016 08:49:58 +0000
(10:49 +0200)
committer
Patrick Plitzner
<p.plitzner@bgbm.org>
Mon, 4 Apr 2016 08:49:58 +0000
(10:49 +0200)
app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenImportClassification.java
patch
|
blob
|
history
app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenImportNames.java
patch
|
blob
|
history
diff --git
a/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenImportClassification.java
b/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenImportClassification.java
index 12974ff156749c568634fbff555d62acb8b76000..82b6fe2b1e38349afbd87d52abad52755ebe05ee 100644
(file)
--- a/
app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenImportClassification.java
+++ b/
app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenImportClassification.java
@@
-130,8
+130,8
@@
public class RedListGefaesspflanzenImportClassification extends DbImportBase<Red
//taxon
if(taxonBase.isInstanceOf(Taxon.class)){
//misapplied name
//taxon
if(taxonBase.isInstanceOf(Taxon.class)){
//misapplied name
- String appendedPhrase = taxonBase.get
Name().get
AppendedPhrase();
- if(appendedPhrase!=null && appendedPhrase.
contain
s(RedListUtil.AUCT)){
+ String appendedPhrase = taxonBase.getAppendedPhrase();
+ if(appendedPhrase!=null && appendedPhrase.
equal
s(RedListUtil.AUCT)){
parent.addMisappliedName((Taxon) taxonBase, null, null);
}
else{
parent.addMisappliedName((Taxon) taxonBase, null, null);
}
else{
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 38a116f869ad4408e9992db9f50b424e07e267fe..b1a1f3cf5529b3e282ea16772dd6ee0ff40721a5 100644
(file)
--- 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
@@
-167,7
+167,7
@@
public class RedListGefaesspflanzenImportNames extends DbImportBase<RedListGefae
}
}
}
}
}
}
- else if(authorKombString.trim().
equal
s(RedListUtil.AUCT)){
+ else if(authorKombString.trim().
contain
s(RedListUtil.AUCT)){
RedListUtil.logMessage(id, "AUCT information in "+RedListUtil.AUTOR_KOMB+" column", logger);
}
else if(CdmUtils.isNotBlank(authorKombString)){
RedListUtil.logMessage(id, "AUCT information in "+RedListUtil.AUTOR_KOMB+" column", logger);
}
else if(CdmUtils.isNotBlank(authorKombString)){
@@
-240,9
+240,12
@@
public class RedListGefaesspflanzenImportNames extends DbImportBase<RedListGefae
//---TAXON---
TaxonBase taxonBase = null;
//---TAXON---
TaxonBase taxonBase = null;
- if(gueltString.equals(RedListUtil.GUELT_ACCEPTED_TAXON) || (name.getAppendedPhrase()!=null && authorBasiString.trim().equals(RedListUtil.AUCT))){
+ if(authorBasiString.trim().contains(RedListUtil.AUCT)){
+ taxonBase = Taxon.NewInstance(name, null);
+ taxonBase.setAppendedPhrase(RedListUtil.AUCT);
+ }
+ else if(gueltString.equals(RedListUtil.GUELT_ACCEPTED_TAXON)){
taxonBase = Taxon.NewInstance(name, null);
taxonBase = Taxon.NewInstance(name, null);
- taxonBase.setAppendedPhrase(authorBasiString);
}
else if(gueltString.equals(RedListUtil.GUELT_SYNONYM) || gueltString.equals(RedListUtil.GUELT_BASIONYM)){
taxonBase = Synonym.NewInstance(name, null);
}
else if(gueltString.equals(RedListUtil.GUELT_SYNONYM) || gueltString.equals(RedListUtil.GUELT_BASIONYM)){
taxonBase = Synonym.NewInstance(name, null);