Changes in / [95ce89e4:994ebb4]

Files:

• .bzrignore (added)
• telemeta/htdocs/timeside/js/controller.js (added)
• telemeta/htdocs/timeside/js/core.js (added)
• telemeta/htdocs/timeside/js/markerlist.js (added)
• telemeta/htdocs/timeside/js/soundprovider.js (added)
• telemeta/htdocs/timeside/js/util.js (added)
• telemeta/models/media.py (modified) (2 diffs)

telemeta/models/media.py

@@ -74 +74 @@
 
 
-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)
@@ -218 +218 @@
         
 
-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)