Revision 9605e435
Added by Anahit Babadshanjan almost 16 years ago
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategy.java | ||
|---|---|---|
| 210 | 210 |
Iterator<NomenclaturalStatus> iterator = ncStati.iterator(); |
| 211 | 211 |
while (iterator.hasNext()) {
|
| 212 | 212 |
NomenclaturalStatus ncStatus = (NomenclaturalStatus)iterator.next(); |
| 213 |
ncStatusCache = ncStatus.getType().getRepresentation(Language.LATIN()).getAbbreviatedLabel(); |
|
| 213 |
ncStatusCache = ", " + ncStatus.getType().getRepresentation(Language.LATIN()).getAbbreviatedLabel();
|
|
| 214 | 214 |
} |
| 215 |
|
|
| 216 |
result = CdmUtils.concat(" ", titleCache, referenceBaseCache);
|
|
| 217 |
result = CdmUtils.concat(", ", result, ncStatusCache);
|
|
| 215 |
String refConcat = " "; |
|
| 216 |
if (referenceBaseCache != null && ! referenceBaseCache.trim().startsWith("in ")){
|
|
| 217 |
refConcat = ", "; |
|
| 218 |
} |
|
| 219 |
result = CdmUtils.concat(refConcat, titleCache, referenceBaseCache); |
|
| 220 |
result = CdmUtils.concat("", result, ncStatusCache);
|
|
| 218 | 221 |
return result; |
| 219 | 222 |
} |
| 220 | 223 |
|
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImpl.java | ||
|---|---|---|
| 705 | 705 |
private void makeEmpty(NonViralName nameToBeFilled){
|
| 706 | 706 |
nameToBeFilled.setRank(null); |
| 707 | 707 |
nameToBeFilled.setTitleCache(null, false); |
| 708 |
nameToBeFilled.setFullTitleCache(null, false); |
|
| 708 | 709 |
nameToBeFilled.setNameCache(null); |
| 709 | 710 |
|
| 710 | 711 |
nameToBeFilled.setAppendedPhrase(null); |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/BotanicNameCacheStrategyTest.java | ||
|---|---|---|
| 187 | 187 |
@Test |
| 188 | 188 |
public final void testGetFullTitleCache() {
|
| 189 | 189 |
assertNull(speciesNameString, strategy.getFullTitleCache(null)); |
| 190 |
assertEquals("Abies alba app phrase Gard. Dict. ed. 8, 1. 1768, nom. illeg.", strategy.getFullTitleCache(speciesName));
|
|
| 190 |
assertEquals("Abies alba app phrase, Gard. Dict. ed. 8, 1. 1768, nom. illeg.", strategy.getFullTitleCache(speciesName));
|
|
| 191 |
|
|
| 192 |
// assertNull(subSpeciesNameString, strategy.getFullTitleCache(null)); |
|
| 193 |
// assertEquals("Abies alba app phrase L. Gard. Dict. ed. 8, 1. 1768, nom. illeg.", strategy.getFullTitleCache(speciesName));
|
|
| 191 | 194 |
} |
| 192 | 195 |
|
| 193 | 196 |
/** |
Also available in: Unified diff
Fixed makeEmpty()