Revision 7f5ffbcf
Added by Andreas Müller over 2 years ago
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplRegExBase.java | ||
|---|---|---|
| 57 | 57 |
protected static String obligateDotWord = "(" + capitalWord + "|" + nonCapitalWord + ")\\.+"; //word (capital or non-capital) with obligate '.' at the end
|
| 58 | 58 |
|
| 59 | 59 |
//Words used in an epithet/name part for a TaxonName |
| 60 |
protected static String nonCapitalEpiWord = "[a-z\u00EF\u00EB\u00F6\\-]+"; //a-z + diaeresis for ieo
|
|
| 60 |
protected static String nonCapitalEpiWord = "[a-z\u00EF\u00EB\u00F6\u00FC\\-]+"; //a-z + diaeresis for ieou
|
|
| 61 | 61 |
protected static String capitalEpiWord = "[A-Z]"+ nonCapitalEpiWord; |
| 62 | 62 |
|
| 63 | 63 |
//years |
| ... | ... | |
| 103 | 103 |
protected static String author = "((" + authorPart + "(" + fWs + "|-)" + ")+" + "(f(il)?\\.|secundus|jun\\.|ter|bis)?|Man in "+qm+"t Veld|Sant"+qm+"Anna)" ;
|
| 104 | 104 |
protected static String finalTeamSplitter = "(" + fWs + "(&)" + fWs + "|" + oWs + "et" + oWs + ")";
|
| 105 | 105 |
protected static String notFinalTeamSplitter = "(?:" + fWs + "," + fWs + "|" + finalTeamSplitter + ")"; |
| 106 |
protected static String authorTeam = fWs + "((?>" + author + notFinalTeamSplitter + ")*" + author + finalTeamSplitter + ")?(?:" + author + "|al\\.)" + fWs;
|
|
| 106 |
protected static String authorTeam = fWs + "(((?>" + author + notFinalTeamSplitter + ")*" + author + finalTeamSplitter + ")?(?:" + author + "|al\\.)|hort\\.)" + fWs;
|
|
| 107 | 107 |
protected static String exString = "(ex\\.?)"; |
| 108 | 108 |
protected static String authorAndExTeam = "(" + authorTeam + oWs + exString + oWs + ")?" + authorTeam;
|
| 109 | 109 |
protected static String basStart = "\\(";
|
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplTest.java | ||
|---|---|---|
| 2970 | 2970 |
|
| 2971 | 2971 |
} |
| 2972 | 2972 |
|
| 2973 |
@Test |
|
| 2974 |
public final void testHort(){
|
|
| 2975 |
String nameStr = "Epidendrum ciliare var. minor hort. ex Stein"; |
|
| 2976 |
TaxonName name = parser.parseReferencedName(nameStr); |
|
| 2977 |
Assert.assertFalse("Name should be parsable", name.isProtectedTitleCache());
|
|
| 2978 |
Assert.assertEquals("Epidendrum ciliare var. minor", name.getNameCache());
|
|
| 2979 |
Assert.assertEquals("hort.", name.getExCombinationAuthorship().getNomenclaturalTitleCache());
|
|
| 2980 |
Assert.assertEquals("Stein", name.getCombinationAuthorship().getNomenclaturalTitleCache());
|
|
| 2981 |
} |
|
| 2982 |
|
|
| 2973 | 2983 |
@Test |
| 2974 | 2984 |
@Ignore |
| 2975 | 2985 |
public final void openIssues(){
|
Also available in: Unified diff
ref #7646 , ref #9752 make "hort." parseable