Changeset 8b42d0d

Timestamp:

10/25/11 12:09:48 (19 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test

Children:

c4ed73d

Parents:

994ebb4 (diff), 785d13a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

yomguy <yomguy@…> (10/25/11 12:09:48)

git-committer:

yomguy <yomguy@…> (10/25/11 12:09:48)

Message:

Merge branch 'master' into crem

Files:

• telemeta/models/query.py (modified) (1 diff)
• .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/query.py

@@ -65 +65 @@
             self.by_fuzzy_collector_q(pattern) )
         
-        print q
         return self.filter(q)
 

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)