BinomialSearch allow numbers in cultivar parts

RoDuth · Nov 20, 2024 · d9d3e37 · d9d3e37
1 parent b478e68
commit d9d3e37
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/bauble/plugins/plants/species.py b/bauble/plugins/plants/species.py
@@ -253,8 +253,8 @@ def invoke(self, search_strategy: SearchStrategy) -> list[Query]:
 
 
 _BINOMIAL_RGX = re.compile(
-    "^[A-Z]+[a-z-]* +([a-z]+[a-z-]*$|'[A-Za-z-]*$|'[A-Za-z- ]*'$|"
-    "[a-z]+[a-z-]* ('[A-Za-z-]*$|'[A-Za-z- ]*'$))"
+    "^[A-Z]+[a-z-]* +([a-z]+[a-z-]*$|'[A-Za-z0-9-]*$|'[A-Za-z0-9- ]*'$|"
+    "[a-z]+[a-z-]* ('[A-Za-z0-9-]*$|'[A-Za-z0-9- ]*'$))"
 )
 
 
@@ -269,7 +269,7 @@ class BinomialSearch(SearchStrategy):
 
     genus = Word(caps, lowers).set_name("Genus epithet or partial epithet")
     species = Word(lowers).set_name("species epithet or partial epithet")
-    cultivar = Regex("'[A-Za-z- ]*'?").set_name(
+    cultivar = Regex("'[A-Za-z0-9- ]*'?").set_name(
         "cultivar epithet or partial epithet"
     )
 

diff --git a/bauble/plugins/plants/test_plants.py b/bauble/plugins/plants/test_plants.py
@@ -3106,6 +3106,9 @@ def test_use(self):
         s = "Hibiscus rosa-sinensis"
         self.assertEqual(strategy.use(s), "include")
 
+        s = "Cyn dac 'DT-1"
+        self.assertEqual(strategy.use(s), "include")
+
     def test_sp_cultivar_also_matches(self):
         strategy = search.strategies.get_strategy("BinomialSearch")
         self.assertTrue(isinstance(strategy, BinomialSearch))
@@ -3195,6 +3198,15 @@ def test_hyphenated_name_search(self):
             results.extend(i)
         self.assertEqual(results, [self.sp5])
 
+        self.sp5.cultivar_epithet = "Test-10"
+        self.session.commit()
+
+        s = "Ixo ros 'Test-1"
+        results = []
+        for i in strategy.search(s, self.session):
+            results.extend(i)
+        self.assertEqual(results, [self.sp5])
+
 
 class GeographyTests(BaubleClassTestCase):
     @classmethod