Revision 53827035
Added by Katja Luther about 10 years ago
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategy.java | ||
|---|---|---|
| 596 | 596 |
tags = getSpeciesTaggedNameCache(nonViralName); |
| 597 | 597 |
|
| 598 | 598 |
//author |
| 599 |
String authorCache = getAuthorshipCache(nonViralName); |
|
| 600 |
if (StringUtils.isNotBlank(authorCache)){
|
|
| 601 |
tags.add(new TaggedText(TagEnum.authors, authorCache)); |
|
| 602 |
} |
|
| 599 |
|
|
| 603 | 600 |
|
| 604 | 601 |
|
| 605 | 602 |
//infra species marker |
| ... | ... | |
| 618 | 615 |
if (StringUtils.isNotBlank(infraSpeciesPart)){
|
| 619 | 616 |
tags.add(new TaggedText(TagEnum.name, infraSpeciesPart)); |
| 620 | 617 |
} |
| 618 |
String authorCache = getAuthorshipCache(nonViralName); |
|
| 619 |
if (StringUtils.isNotBlank(authorCache)){
|
|
| 620 |
tags.add(new TaggedText(TagEnum.authors, authorCache)); |
|
| 621 |
} |
|
| 621 | 622 |
} else if (nonViralName.isInfraGeneric()){
|
| 622 | 623 |
//genus part |
| 623 | 624 |
tags =getGenusOrUninomialTaggedNameCache(nonViralName); |
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplRegExBase.java | ||
|---|---|---|
| 78 | 78 |
//marker |
| 79 | 79 |
protected static String InfraGenusMarker = "(subgen.|subg.|sect.|subsect.|ser.|subser.|t.infgen.|\\[unranked\\])"; |
| 80 | 80 |
protected static String aggrOrGroupMarker = "(aggr.|agg.|group)"; |
| 81 |
protected static String infraSpeciesMarker = "(subsp.|convar.|var.|subvar.|f.|subf.|f.spec.|\\[unranked\\]|tax." + fWs + "infrasp.)";
|
|
| 81 |
protected static String infraSpeciesMarker = "(subsp.|convar.|var.|subvar.|f.|subf.|f. sp.|f.spec.|f.sp.|\\[unranked\\]|tax." + fWs + "infrasp.)";
|
|
| 82 | 82 |
protected static String oldInfraSpeciesMarker = "(prol.|proles|race|taxon|sublusus)"; |
| 83 | 83 |
|
| 84 | 84 |
|
| 85 | 85 |
//AuthorString |
| 86 |
protected static String authorPart = "(" + "(d'|D'|L'|'t|ten\\s||le\\s)?" + capitalDotWord + "('" + nonCapitalDotWord + ")?" + "|v[ao]n(\\sder)?|da|du|de(n|l|\\sla)?)" ;
|
|
| 87 |
protected static String author = "(" + authorPart + "(" + fWs + "|-)" + ")+" + "(f.|fil.|secundus)?";
|
|
| 86 |
protected static String authorPart = "(" + "(d'|D'|L'|'t|ten\\s||le\\s)?" + capitalDotWord + "('" + nonCapitalDotWord + ")?" + "|[vV][ao]n(\\sder)?|da|du|de(n|l|\\sla)?)" ;
|
|
| 87 |
protected static String author = "(" + authorPart + "(" + fWs + "|-)" + ")+" + "(f.|fil.|secundus)?" ;
|
|
| 88 | 88 |
protected static String finalTeamSplitter = fWs + "(&)" + fWs; |
| 89 | 89 |
protected static String notFinalTeamSplitter = "(" + fWs + "," + fWs + "|" + finalTeamSplitter + ")";
|
| 90 |
protected static String authorTeam = fWs + "((" + author + notFinalTeamSplitter + ")*" + author + finalTeamSplitter + ")?" + author + "(" + finalTeamSplitter + "al.)?" + fWs;
|
|
| 90 |
protected static String authorTeam = fWs + "((" + author + notFinalTeamSplitter + ")*" + author + finalTeamSplitter + ")?" + author + "(" + finalTeamSplitter + "al.)?" + fWs;
|
|
| 91 | 91 |
protected static String exString = "(ex.?)"; |
| 92 | 92 |
protected static String authorAndExTeam = "(" + authorTeam + oWs + exString + oWs + ")?" + authorTeam;
|
| 93 | 93 |
protected static String basStart = "\\(";
|
Also available in: Unified diff