add CREM special parameters

diff --git a/app/sandbox/settings.py b/app/sandbox/settings.py
index d86be7123fdadf3eab8926b76f336c2cec7dd914..5ec17b94b273d5fb6cc902b0284351c0f1f7c778 100644 (file)
--- a/app/sandbox/settings.py
+++ b/app/sandbox/settings.py
@@ -184,10 +184,11 @@ AUTHENTICATION_BACKENDS = (
 
 SESSION_ENGINE = "django.contrib.sessions.backends.signed_cookies"
 
-TELEMETA_ORGANIZATION = 'Telemeta'
-TELEMETA_SUBJECTS = ('Telemeta', 'web', 'platform', 'audio', 'semantics')
-TELEMETA_DESCRIPTION = "Open web audio platform with semantics"
-TELEMETA_LOGO = STATIC_URL + 'telemeta/images/logo_telemeta_2.png'
+
+TELEMETA_ORGANIZATION = 'CREM-CNRS'
+TELEMETA_SUBJECTS = ('Ethnomusicology', 'Research')
+TELEMETA_DESCRIPTION = "Sound archives of the CNRS and the Musee de l'Homme. Research Centre of Ethnomusicology (CREM), University of Paris 10"
+TELEMETA_LOGO = STATIC_URL + 'telemeta/images/logo_crem.png'
 
 TELEMETA_GMAP_KEY = 'ABQIAAAArg7eSfnfTkBRma8glnGrlxRVbMrhnNNvToCbZQtWdaMbZTA_3RRGObu5PDoiBImgalVnnLU2yN4RMA'
 
@@ -203,10 +204,10 @@ TELEMETA_DOWNLOAD_FORMATS = ('wav', 'mp3', 'ogg', 'flac')
 TELEMETA_PUBLIC_ACCESS_PERIOD = 51
 
 TELEMETA_STRICT_CODE = False
-COLLECTION_PUBLISHED_CODE_REGEX = '*'
-COLLECTION_UNPUBLISHED_CODE_REGEX = '*'
-ITEM_PUBLISHED_CODE_REGEX = COLLECTION_PUBLISHED_CODE_REGEX + ''
-ITEM_UNPUBLISHED_CODE_REGEX = COLLECTION_UNPUBLISHED_CODE_REGEX + ''
+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}'
+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}'
 
 AUTH_PROFILE_MODULE = 'telemeta.userprofile'
 SESSION_EXPIRE_AT_BROWSER_CLOSE = False

diff --git a/telemeta/pages b/telemeta/pages
index db808781ec542f93af7d4be788b75a8cd1bddb1b..4fcb6022f8a1cf0780fc526737e84b8e690c1f88 160000 (submodule)
--- a/telemeta/pages
+++ b/telemeta/pages
@@ -1 +1 @@
-Subproject commit db808781ec542f93af7d4be788b75a8cd1bddb1b
+Subproject commit 4fcb6022f8a1cf0780fc526737e84b8e690c1f88