Merge pull request #301 from vplan-fr/main

add some excluded chars to sep in form regex
vplan-fr · Mar 25, 2024 · cd36bd1 · cd36bd1
2 parents 9e109ab + da8e484
commit cd36bd1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/backend/vplan_utils.py b/backend/vplan_utils.py
@@ -10,7 +10,7 @@
 _parse_form_pattern = re.compile(
     r"(?<!\S)(?:"
     r"(?P<major>\d{1,2}(?!\d)|[A-Za-zÄÖÜäöüß]+(?![A-Za-zÄÖÜäöüß]))"
-    r"(?P<sep> |[/._]|[^A-Za-zÄÖÜäöüß0-9() \n]?)(?:(?<! ) )?"
+    r"(?P<sep> |[/._]|[^A-Za-zÄÖÜäöüß0-9():;\[\]{} \n]?)(?:(?<! ) )?"
     r"(?P<minor>"
     r"(?:\d{1,2}[A-Za-zÄÖÜäöüß]?|[A-Za-zÄÖÜäöüß]+\d{0,2})"
     r"(?:,(?:\d{1,2}[A-Za-zÄÖÜäöüß]?|[A-Za-zÄÖÜäöüß]+\d{0,2}))*"
@@ -20,7 +20,7 @@
 _loose_parse_form_pattern = re.compile(
     r"(?<!\S)(?:"
     r"(?P<major>\d{1,2}(?!\d)|[A-Za-zÄÖÜäöüß]+(?![A-Za-zÄÖÜäöüß]))"
-    r"(?P<sep> |[/._]|[^A-Za-zÄÖÜäöüß0-9() \n]?)(?:(?<! ) )?"
+    r"(?P<sep> |[/._]|[^A-Za-zÄÖÜäöüß0-9():;\[\]{} \n]?)(?:(?<! ) )?"
     r"(?P<minor>"
     r"(?:\d{1,2}[A-Za-zÄÖÜäöüß]?|[A-Za-zÄÖÜäöüß]+\d{0,2})"
     r"(?:,(?:\d{1,2}[A-Za-zÄÖÜäöüß]?|[A-Za-zÄÖÜäöüß]+\d{0,2}))*"