Skip to content
This repository has been archived by the owner on Jun 17, 2023. It is now read-only.

Commit

Permalink
Merge pull request #477 from GlobalNamesArchitecture/472-prefix-zur
Browse files Browse the repository at this point in the history
Fix #472 add author prefix 'zur'
  • Loading branch information
alexander-myltsev committed Dec 12, 2018
2 parents 629c172 + 69c5d58 commit 36ae26b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ output.json
logs/
.ensime*
.vim.custom
.vscode

# Play Framework
RUNNING_PID
4 changes: 4 additions & 0 deletions parser-render/src/test/resources/test_data.txt
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,10 @@ Phora sororcula v d Wulp 1871
{"quality":1,"parsed":true,"verbatim":"Phora sororcula v d Wulp 1871","surrogate":false,"normalized":"Phora sororcula v d Wulp 1871","canonicalName":{"value":"Phora sororcula","valueRanked":"Phora sororcula"},"virus":false,"positions":[["genus",0,5],["specificEpithet",6,15],["authorWord",16,19],["authorWord",20,24],["year",25,29]],"nameStringId":"dad2ef8b-4f74-5de5-844b-29b6ee09ce68","parserVersion":"test_version","hybrid":false,"details":[{"genus":{"value":"Phora"},"specificEpithet":{"value":"sororcula","authorship":{"value":"v d Wulp 1871","basionymAuthorship":{"authors":["v d Wulp"],"years":[{"value":"1871"}]}}}}],"bacteria":false}
dad2ef8b-4f74-5de5-844b-29b6ee09ce68|Phora sororcula v d Wulp 1871|Phora sororcula|Phora sororcula|v d Wulp 1871|1871|1

Aeolothrips andalusiacus zur Strassen 1973
{"quality":1,"parsed":true,"verbatim":"Aeolothrips andalusiacus zur Strassen 1973","surrogate":false,"normalized":"Aeolothrips andalusiacus zur Strassen 1973","canonicalName":{"value":"Aeolothrips andalusiacus","valueRanked":"Aeolothrips andalusiacus"},"virus":false,"positions":[["genus",0,11],["specificEpithet",12,24],["authorWord",25,28],["authorWord",29,37],["year",38,42]],"nameStringId":"1e99cbcb-7fc9-5454-a40b-4786d3e35751","parserVersion":"test_version","hybrid":false,"details":[{"genus":{"value":"Aeolothrips"},"specificEpithet":{"value":"andalusiacus","authorship":{"value":"zur Strassen 1973","basionymAuthorship":{"authors":["zur Strassen"],"years":[{"value":"1973"}]}}}}],"bacteria":false}
1e99cbcb-7fc9-5454-a40b-4786d3e35751|Aeolothrips andalusiacus zur Strassen 1973|Aeolothrips andalusiacus|Aeolothrips andalusiacus|zur Strassen 1973|1973|1

Orthosia kindermannii Fischer v. Roslerstamm, 1837
{"quality":1,"parsed":true,"verbatim":"Orthosia kindermannii Fischer v. Roslerstamm, 1837","surrogate":false,"normalized":"Orthosia kindermannii Fischer v. Roslerstamm 1837","canonicalName":{"value":"Orthosia kindermannii","valueRanked":"Orthosia kindermannii"},"virus":false,"positions":[["genus",0,8],["specificEpithet",9,21],["authorWord",22,29],["authorWord",30,32],["authorWord",33,44],["year",46,50]],"nameStringId":"53abecc3-4083-5cdc-966c-09648fe9383d","parserVersion":"test_version","hybrid":false,"details":[{"genus":{"value":"Orthosia"},"specificEpithet":{"value":"kindermannii","authorship":{"value":"Fischer v. Roslerstamm 1837","basionymAuthorship":{"authors":["Fischer v. Roslerstamm"],"years":[{"value":"1837"}]}}}}],"bacteria":false}
53abecc3-4083-5cdc-966c-09648fe9383d|Orthosia kindermannii Fischer v. Roslerstamm, 1837|Orthosia kindermannii|Orthosia kindermannii|Fischer v. Roslerstamm 1837|1837|1
Expand Down
2 changes: 1 addition & 1 deletion parser/src/main/scala/org/globalnames/parser/Parser.scala
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ class Parser(preprocessorResult: Preprocessor.Result,

def authorPrefix: RuleNodeMeta[AuthorWord] = rule {
capturePos((("ab" | "af" | "bis" | "da" | "der" | "des" | "den" | "del" | "della" | "dela" |
"de" | "di" | "du" | "el" | "la" | "le" | "ter" | "van" |
"de" | "di" | "du" | "el" | "la" | "le" | "ter" | "van" | "zur" |
("von" ~ (space ~ "dem").?) |
("v" ~ (space ~ "d").?) | "d'" | "in't") ~ &(spaceCharsEOI)) |
("v." ~ (space.? ~ "d.").?) | "'t") ~> {
Expand Down

0 comments on commit 36ae26b

Please sign in to comment.