From 331d8800251f04957b5a05d4a1b9676eb8e4b6b2 Mon Sep 17 00:00:00 2001 From: yomguy Date: Mon, 16 May 2011 19:09:02 +0200 Subject: [PATCH] update item and collection regex for the CREM, now ignore media.py against telemeta generic or unstable --- .bzrignore | 1 + telemeta/models/media.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 .bzrignore diff --git a/.bzrignore b/.bzrignore new file mode 100644 index 00000000..69213d73 --- /dev/null +++ b/.bzrignore @@ -0,0 +1 @@ +telemeta/models/media.py diff --git a/telemeta/models/media.py b/telemeta/models/media.py index 4138c068..9df60131 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -72,8 +72,8 @@ class MediaResource(ModelCore): abstract = True -collection_published_code_regex = '[A-Za-z0-9._-]*' -collection_unpublished_code_regex = '[A-Za-z0-9._-]*' +collection_published_code_regex = 'CNRSMH_E_[0-9]{4}(?:_[0-9]{3}){2}' +collection_unpublished_code_regex = 'CNRSMH_I_[0-9]{4}_[0-9]{3}' collection_code_regex = '(?:%s|%s)' % (collection_published_code_regex, collection_unpublished_code_regex) @@ -214,8 +214,8 @@ class MediaCollectionForm(ModelForm): model = MediaCollection -item_published_code_regex = '[A-Za-z0-9._-]*' -item_unpublished_code_regex = '[A-Za-z0-9._-]*' +item_published_code_regex = collection_published_code_regex + '(?:_[0-9]{2}){1,2}' +item_unpublished_code_regex = collection_unpublished_code_regex + '_[0-9]{2,3}(?:_[0-9]{2}){0,2}' item_code_regex = '(?:%s|%s)' % (item_published_code_regex, item_unpublished_code_regex) class MediaItem(MediaResource): -- 2.39.5