Revision bdd00895
Added by Andreas Müller over 9 years ago
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategy.java | ||
|---|---|---|
| 722 | 722 |
if (rank != null){
|
| 723 | 723 |
try {
|
| 724 | 724 |
infraGenericMarker = rank.getInfraGenericMarker(); |
| 725 |
if (rank.equals(Rank.SECTION_BOTANY()) || rank.equals(Rank.SUBSECTION_BOTANY())){
|
|
| 726 |
infraGenericMarker = infraGenericMarker.replace("(bot.)", "");
|
|
| 727 |
} |
|
| 725 | 728 |
} catch (UnknownCdmTypeException e) {
|
| 726 | 729 |
infraGenericMarker = "'unhandled infrageneric rank'"; |
| 727 | 730 |
} |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java | ||
|---|---|---|
| 169 | 169 |
unrankedCache = strategy.getNameCache(unrankedName); |
| 170 | 170 |
Assert.assertEquals("Correct unranked cache expected", "Genus [infragen.] Infrageneric", unrankedCache);
|
| 171 | 171 |
|
| 172 |
|
|
| 172 |
//bot. specific ranks |
|
| 173 |
botName = BotanicalName.NewInstance(Rank.SECTION_BOTANY()); |
|
| 174 |
botName.setGenusOrUninomial("Genus");
|
|
| 175 |
botName.setInfraGenericEpithet("Infragenus");
|
|
| 176 |
Assert.assertEquals("", "Genus sect. Infragenus", botName.getNameCache());
|
|
| 177 |
botName.setRank(Rank.SUBSECTION_BOTANY()); |
|
| 178 |
Assert.assertEquals("", "Genus subsect. Infragenus", botName.getNameCache());
|
|
| 179 |
|
|
| 180 |
//zool. specific ranks (we don't have markers here therefore no problem should exist |
|
| 181 |
ZoologicalName zooName = ZoologicalName.NewInstance(Rank.SECTION_ZOOLOGY()); |
|
| 182 |
zooName.setGenusOrUninomial("Genus");
|
|
| 183 |
zooName.setInfraGenericEpithet("Infragenus");
|
|
| 184 |
Assert.assertEquals("", "Genus", zooName.getNameCache());
|
|
| 185 |
zooName.setRank(Rank.SUBSECTION_ZOOLOGY()); |
|
| 186 |
Assert.assertEquals("", "Genus", zooName.getNameCache());
|
|
| 187 |
|
|
| 173 | 188 |
} |
| 174 | 189 |
|
| 175 | 190 |
/** |
Also available in: Unified diff
remove (bot.) for name creation in botanical names of rank section #4122 and #4279