From 4fd864ef99777c671a885d2e2dcc36ff8a6ab437 Mon Sep 17 00:00:00 2001
From: olivier <>
Date: Fri, 22 Jan 2010 18:58:12 +0000
Subject: [PATCH] allow unpublished item codes to contain either 2 or 3 digits
 in the 3rd numeric group ; consolidate codes regex's

---
 telemeta/models/crem.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/telemeta/models/crem.py b/telemeta/models/crem.py
index caeff312..eafac6d1 100755
--- a/telemeta/models/crem.py
+++ b/telemeta/models/crem.py
@@ -239,7 +239,7 @@ class MediaCollection(MediaResource):
     def is_valid_code(self, code):
         "Check if the collection code is well formed"
         if self.is_published:
-            regex = '^CNRSMH_E_[0-9]{4}_[0-9]{3}_[0-9]{3}$'
+            regex = '^CNRSMH_E_[0-9]{4}(_[0-9]{3}){2}$'
         else:
             regex = '^CNRSMH_I_[0-9]{4}_[0-9]{3}$'
            
@@ -354,9 +354,9 @@ class MediaItem(MediaResource):
     def is_valid_code(self, code):
         "Check if the item code is well formed"
         if self.collection.is_published:
-            regex = '^' + self.collection.code + '_[0-9]{2}(_[0-9]{2})?$'
+            regex = '^' + self.collection.code + '(_[0-9]{2}){1,2}$'
         else:
-            regex = '^' + self.collection.code + '_[0-9]{3}(_[0-9]{2})?(_[0-9]{2})?$'
+            regex = '^' + self.collection.code + '_[0-9]{2,3}(_[0-9]{2}){0,2}$'
 
         if re.match(regex, self.code):
             return True
-- 
2.39.5