diff --git a/journals/regexes.py b/journals/regexes.py index 209d603d20f84a77a000d3ba1e7bb33f6ef55cb1..1a37e4c5cacf109122d1ffbb897cfaed5466d300 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)