From: yomguy <yomguy@parisson.com>
Date: Wed, 7 Dec 2011 16:25:12 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.3.9~3^2~1^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7e668e178eb724aaade8e10183d4ef765063c88a;p=telemeta.git

Merge branch 'master' into crem

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

7e668e178eb724aaade8e10183d4ef765063c88a
diff --cc telemeta/models/media.py
index 0fa544b2,f641e361..5788bde0
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@@ -50,14 -50,14 +50,13 @@@ from telemeta.models.instrument import 
  from telemeta.models.enum import *
  from django.db.models.fields import URLField
  
-         
 -
 -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_code_regex             = '(?:%s|%s)' % (collection_published_code_regex,
                                                      collection_unpublished_code_regex)
  
 -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,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)
  
  PUBLIC_ACCESS_CHOICES = (('none', 'none'), ('metadata', 'metadata'), ('full', 'full'))