Changeset 994ebb4

Timestamp:

10/25/11 00:29:36 (19 months ago)

Author:

yomguy <yomguy@…>

Branches:

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

Children:

8b42d0d

Parents:

451866d (diff), 95ce89e4 (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 00:29:36)

git-committer:

yomguy <yomguy@…> (10/25/11 00:29:36)

Message:

yomguy 2011-10-24 test modified item.file, add import script for new collections

Files:

• tools/scripts/telemeta-crem-import-new.py (added)
• tools/scripts/telemeta-crem-import.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)

tools/scripts/telemeta-crem-import.py

@@ -72 +72 @@
                             print item.old_code + ' : id = ' + str(item.id) + " : title = " + item.title
                             if os.path.exists(wav_file):
-                                f = open(wav_file, 'r')
-                                file_content = ContentFile(f.read())
-                                item.file.save(filename, file_content)
-                                f.close()
-                                item.code = new_ref
-                                item.save()
+                                if not item.file :
+                                    f = open(wav_file, 'r')
+                                    file_content = ContentFile(f.read())
+                                    item.file.save(filename, file_content)
+                                    f.close()
+                                    item.code = new_ref
+                                    item.save()
+                                else:
+                                    msg = old_ref + ' : fichier ' + wav_file + ' déjà ajouté !'
+                                    print msg
+                                    self.logger.write_error(collection, msg)
                             else:
                                 msg = old_ref + ' : fichier audio ' + wav_file + ' inexistant !'

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)