Changeset 8b42d0d


Ignore:
Timestamp:
Oct 25, 2011 12:09:48 PM (3 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, dev, dev2, diadems, dj1.6, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, forma, generic, instru_search, lam, lam2, mapsv3, merge, nlivemulti, production, release/1.4.4, sabiod, security, server, social, storage, telecaster, 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@…> (25/10/2011 12:09:48)
git-committer:
yomguy <yomguy@…> (25/10/2011 12:09:48)
Message:

Merge branch 'master' into crem

Files:
6 added
2 edited

Legend:

Unmodified
Added
Removed
  • telemeta/models/query.py

    r8e62947 r785d13a  
    6565            self.by_fuzzy_collector_q(pattern) ) 
    6666         
    67         print q 
    6867        return self.filter(q) 
    6968 
  • telemeta/models/media.py

    r86d17e9 r451866d  
    7474 
    7575 
    76 collection_published_code_regex   = '[A-Za-z0-9._-]*' 
    77 collection_unpublished_code_regex = '[A-Za-z0-9._-]*' 
     76collection_published_code_regex   = 'CNRSMH_E_[0-9]{4}(?:_[0-9]{3}){2}' 
     77collection_unpublished_code_regex = 'CNRSMH_I_[0-9]{4}_[0-9]{3}' 
    7878collection_code_regex             = '(?:%s|%s)' % (collection_published_code_regex,  
    7979                                                    collection_unpublished_code_regex) 
     
    218218         
    219219 
    220 item_published_code_regex    = '[A-Za-z0-9._-]*' 
    221 item_unpublished_code_regex  = '[A-Za-z0-9._-]*' 
     220item_published_code_regex    = collection_published_code_regex + '(?:_[0-9]{2,3}){1,2}' 
     221item_unpublished_code_regex  = collection_unpublished_code_regex + '_[0-9]{2,3}(?:_[0-9]{2,3}){0,2}' 
    222222item_code_regex              = '(?:%s|%s)' % (item_published_code_regex, item_unpublished_code_regex) 
    223223 
Note: See TracChangeset for help on using the changeset viewer.