Project

General

Profile

« Previous | Next » 

Revision a96a9d32

Added by Andreas Müller over 7 years ago

ref #5983 and ref #6410 parsing of hybrid formulas with missing name parts

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplRegExBase.java
87 87 
    //marker
88 88 
    protected static String InfraGenusMarker = "(n|notho)?(subgen\\.|subg\\.|sect\\.|subsect\\.|ser\\.|subser\\.|t\\.infgen\\.|\\[unranked\\])";
89 89 
    protected static String aggrOrGroupMarker = "(aggr\\.|agg\\.|group)";
90 
    protected static String infraSpeciesMarker = "(n|notho)?(subsp\\.|convar\\.|var\\.|subvar\\.|f\\.|subf\\.|f\\.\\ssp\\.|f\\.spec\\.|f\\.sp\\.|\\[unranked\\]|tax\\." + fWs + "infrasp\\.)";
90 
    protected static String infraSpeciesMarkerNoNotho = "(subsp\\.|convar\\.|var\\.|subvar\\.|f\\.|subf\\.|f\\.\\ssp\\.|f\\.spec\\.|f\\.sp\\.|\\[unranked\\]|tax\\." + fWs + "infrasp\\.)";
91 
    protected static String infraSpeciesMarker = "(n|notho)?" + infraSpeciesMarkerNoNotho;
91 92 
    protected static String oldInfraSpeciesMarker = "(prol\\.|proles|race|taxon|sublusus)";
92 93 

  		




  93
  94
  
    

  		




  ......




  287
  288
  
    
    protected static String anyBotanicFullName = "(" + autonym2 + "|" + anyBotanicName + oWs + fullBotanicAuthorString + ")"  ;


  		




  288
  289
  
    
    protected static String anyZooFullName = anyZooName + oWs + fullZooAuthorString ;


  		




  289
  290
  
    
    protected static String anyFullName = "(" + anyBotanicFullName + "|" + anyZooFullName + ")";


  		




  290
  
  
    
    protected static String hybridFullName = "(" + anyFullName  + "|" +  anyBotanicName + "|" + anyZooName + ")" + hybridFormularSeparator + "(" + anyFullName  + "|" +  anyBotanicName + "|" + anyZooName + ")";


  		




  
  291
  
    
    protected static String abbrevHybridGenus = "([A-Z](\\.\\s*|\\s+))";


  		




  
  292
  
    
    protected static String abbrevHybridSecondPartWithSpecies = abbrevHybridGenus + "?" + nonCapitalEpiWord + "(" + oWs + infraSpeciesMarkerNoNotho + oWs + nonCapitalEpiWord + ")?";  //#5983 first step but still to strict


  		




  
  293
  
    
    protected static String abbrevHybridSecondPartOnlyInfraSpecies = infraSpeciesMarkerNoNotho + oWs + nonCapitalEpiWord;


  		




  
  294
  
    
    protected static String abbrevHybridSecondPart = "(" + abbrevHybridSecondPartWithSpecies + "|" + abbrevHybridSecondPartOnlyInfraSpecies + ")";


  		




  
  295
  
    

  		




  
  296
  
    
    protected static String hybridSecondPart = "(" + anyFullName  + "|" +  anyBotanicName + "|" + anyZooName + "|" + abbrevHybridSecondPart + ")";


  		




  
  297
  
    
    protected static String hybridFullName = "(" + anyFullName  + "|" +  anyBotanicName + "|" + anyZooName + ")" + hybridFormularSeparator + hybridSecondPart ;


  		




  291
  298
  
    

  		




  292
  299
  
    
    //Pattern


  		




  293
  300
  
    
    protected static Pattern oWsPattern = Pattern.compile(oWs);


  		












Also available in:  Unified diff