From 034d48a619adb660aa850854194424e86daaa36b Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 21 Jan 2010 19:37:42 +0000 Subject: [PATCH] no checking of old item names git-svn-id: http://svn.parisson.org/svn/crem@142 3bf09e05-f825-4182-b9bc-eedd7160adf0 --- trunk/import/audio_import/crem_checker.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/trunk/import/audio_import/crem_checker.py b/trunk/import/audio_import/crem_checker.py index c2714ee..e27a6ee 100755 --- a/trunk/import/audio_import/crem_checker.py +++ b/trunk/import/audio_import/crem_checker.py @@ -38,7 +38,7 @@ import xlrd import logging import scikits.audiolab as audiolab -ITEM_OLD_PATTERN = [ +COLLECTION_OLD_PATTERN = [ { 'format': 'BM.aaa.nnn.mmm', 'regex': r'^(BM)\.([0-9]{3})\.([0-9]{3})\.([0-9]{3})$'}, { 'format': 'BM.aaaa.nnn.mmm/pp', 'regex': r'^(BM)\.([0-9]{4})\.([0-9]{3})\.([0-9]{3})/[0-9]{2}$'}, { 'format': 'BM.aaaa.nnn.mmm', 'regex': r'^(BM)\.([0-9]{4})\.([0-9]{3})\.([0-9]{3})$'}, @@ -161,12 +161,8 @@ class CremXLS: if len(self.original_refs) == 0 or len(self.new_refs) == 0: break else: - if not 'BM' in self.original_refs[0].encode('utf8') \ - and not 'CY' in self.original_refs[0].encode('utf8') \ - and not 'DI' in self.original_refs[0].encode('utf8') \ - and not 'FA' in self.original_refs[0].encode('utf8'): - #print self.new_refs[0].encode('utf8') - #print self.original_refs[0].encode('utf8') + if not 'CNRS' in self.new_refs[0].encode('utf8') \ + and not self.original_refs[0].encode('utf8') == '': self.original_refs = self.original_refs[1:] self.new_refs = self.new_refs[1:] else: @@ -288,9 +284,9 @@ class CremCheck: msg = 'Ligne ' + str(i+xls.first_row+1) + ' : la référence d\'item ' + item.encode('utf8') + ' est multiple' self.logger.write_error(collection.dir, msg) - if not check_name(ITEM_OLD_PATTERN, item_old): - msg = 'Ligne ' + str(i+xls.first_row+1) + ' : l\'ancienne référence d\'item ' + item_old.encode('utf8') + ' est mal formatée' - self.logger.write_error(collection.dir, msg) + #if not check_name(ITEM_OLD_PATTERN, item_old): + #msg = 'Ligne ' + str(i+xls.first_row+1) + ' : l\'ancienne référence d\'item ' + item_old.encode('utf8') + ' est mal formatée' + #self.logger.write_error(collection.dir, msg) if not check_name(ITEM_NEW_PATTERN, item): msg = 'Ligne ' + str(i+xls.first_row+1) + ' : la nouvelle référence d\'item ' + item.encode('utf8') + ' est mal formatée' -- 2.39.5