no checking of old item names

git-svn-id: http://svn.parisson.org/svn/crem@142 3bf09e05-f825-4182-b9bc-eedd7160adf0

diff --git a/trunk/import/audio_import/crem_checker.py b/trunk/import/audio_import/crem_checker.py
index c2714ee07bc1afee02ba3e380d3d6665ab5f6f5d..e27a6ee9979ccd965a602e05dd6fdafb3abd63b4 100755 (executable)
--- 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'