From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 9 Jan 2014 14:18:47 +0000 (+0100)
Subject: Merge branch 'crem2' into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1bf282515db306998ad9644f9adc5fc963c002b8;p=telemeta.git

Merge branch 'crem2' into diadems

Conflicts:
	telemeta/models/media.py
---

1bf282515db306998ad9644f9adc5fc963c002b8
diff --cc telemeta/models/media.py
index ad4095ea,d72b36eb..59a06511
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@@ -55,15 -55,26 +55,27 @@@ from django.db import model
  from django.conf import settings
  
  
- collection_published_code_regex   = '[A-Za-z0-9._-]*'
- collection_unpublished_code_regex = '[A-Za-z0-9._-]*'
- collection_code_regex             = '(?:%s|%s)' % (collection_published_code_regex,
-                                                     collection_unpublished_code_regex)
+ # Special code regex of collections for the branch
+ collection_published_code_regex = getattr(settings, 'COLLECTION_PUBLISHED_CODE_REGEX', '[A-Za-z0-9._-]*')
+ collection_unpublished_code_regex = getattr(settings, 'COLLECTION_UNPUBLISHED_CODE_REGEX', '[A-Za-z0-9._-]*')
+ 
+ # CREM
+ #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)
+ 
+ item_published_code_regex = getattr(settings, 'ITEM_PUBLISHED_CODE_REGEX', '[A-Za-z0-9._-]*')
+ item_unpublished_code_regex = getattr(settings, 'ITEM_UNPUBLISHED_CODE_REGEX', '[A-Za-z0-9._-]*')
+ 
+ # CREM
+ # item_published_code_regex    = collection_published_code_regex + '(?:_[0-9]{2,3}){1,2}'
+ # item_unpublished_code_regex  = collection_unpublished_code_regex + '_[0-9]{2,3}(?:_[0-9]{2,3}){0,2}'
+ 
+ item_code_regex = '(?:%s|%s)' % (item_published_code_regex, item_unpublished_code_regex)
  
- item_published_code_regex    = '[A-Za-z0-9._-]*'
- item_unpublished_code_regex  = '[A-Za-z0-9._-]*'
- item_code_regex              = '(?:%s|%s)' % (item_published_code_regex, item_unpublished_code_regex)
 +
  PUBLIC_ACCESS_CHOICES = (('none', _('none')), ('metadata', _('metadata')),
                           ('mixed', _('mixed')), ('full', _('full')))