Project

General

Profile

Revision f995ae78

IDf995ae780ff6105b24d16c8f3f296965a5eb825d
Parent f380413e
Child 5ef16029

Added by Andreas Müller about 4 years ago

Add Vorabdr. to parsable volume

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplRegExBase.java
186 186
    protected static String detail = pDetailAlternatives;
187 187

  
188 188
    //reference
189
    protected static String volume = nr4 + "[a-z]?" + fWs + "(\\("+ nr4 + "[a-z]?"  + "([-\u2013]" + nr4 + ")?\\))?" + "(\\((Suppl|Beibl|App|Beil|Misc)\\.\\))?";
189
    protected static String volume = nr4 + "[a-z]?" + fWs + "(\\("+ nr4 + "[a-z]?"  + "([-\u2013]" + nr4 + ")?\\))?" + "(\\((Suppl|Beibl|App|Beil|Misc|Vorabdr)\\.\\))?";
190 190
    //this line caused problem https://dev.e-taxonomy.eu/trac/ticket/1556 in its original form: "([\u005E:\\.]" + fWs + ")";
191 191
    protected static String anySepChar = "([\u005E:a-zA-Z]" + fWs + ")"; //all characters except for the detail separator, a stricter version would be [,\\-\\&] and some other characters
192 192
//  protected static String anySepChar = "([,\\-\\&\\.\\+\\']" + fWs + ")";
cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplTest.java
2036 2036
        Team team = (Team)name.getCombinationAuthorship();
2037 2037
        assertEquals( "Oliveira-e-Silva", team.getTeamMembers().get(0).getNomenclaturalTitle());
2038 2038

  
2039
        //Vorabdr.
2040
        name = parser.parseReferencedName("Ophrys hystera  Kreutz & Ruedi Peter in J. Eur. Orchideen 30(Vorabdr.): 128. 1997");
2041
        Assert.assertFalse("Name should be parsable", name.isProtectedTitleCache());
2042
        assertEquals( "30(Vorabdr.)", ((Reference)name.getNomenclaturalReference()).getVolume());
2043

  
2039 2044
 }
2040 2045

  
2041 2046
}

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)