From ee3ef9cf6ae9fbdff3f8e990c15782293925e399 Mon Sep 17 00:00:00 2001 From: "J.-S. Caux" <J.S.Caux@uva.nl> Date: Sun, 22 Sep 2019 20:11:10 +0200 Subject: [PATCH] Correct failing regexes: . matched any char --- journals/regexes.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/journals/regexes.py b/journals/regexes.py index 209d603d2..1a37e4c5c 100644 --- a/journals/regexes.py +++ b/journals/regexes.py @@ -10,10 +10,10 @@ REGEX_CHOICES = '|'.join([j.doi_label for j in Journal.objects.all()]) # Regex used for URLs of specific Publications and for # doi validation during the publication process. -PUBLICATION_DOI_REGEX = '({})'.format(REGEX_CHOICES) -PUBLICATION_DOI_REGEX += '(.\w+(.[0-9]+(.[0-9]{3,})?)?)?' +PUBLICATION_DOI_REGEX = r'({})'.format(REGEX_CHOICES) +PUBLICATION_DOI_REGEX += r'(\.\w+(\.[0-9]+(\.[0-9]{3,})?)?)?' PUBLICATION_DOI_VALIDATION_REGEX = PUBLICATION_DOI_REGEX -DOI_DISPATCH_REGEX = '(?P<journal_tag>{})'.format(REGEX_CHOICES) -DOI_DISPATCH_REGEX += '(.(?P<part_1>\w+)(.(?P<part_2>[0-9]+)(.(?P<part_3>[0-9]{3,}))?)?)?' +DOI_DISPATCH_REGEX = r'(?P<journal_tag>{})'.format(REGEX_CHOICES) +DOI_DISPATCH_REGEX += r'(\.(?P<part_1>\w+)(\.(?P<part_2>[0-9]+)(\.(?P<part_3>[0-9]{3,}))?)?)?' -DOI_ISSUE_REGEX = '(?P<doi_label>({}).\w+(.[0-9]+)?)'.format(REGEX_CHOICES) +DOI_ISSUE_REGEX = r'(?P<doi_label>({})\.\w+(\.[0-9]+)?)'.format(REGEX_CHOICES) -- GitLab