[Erp5-report] r32729 nicolas.dumazet - /erp5/trunk/products/ERP5Type/XMLMatrix.py

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Thu Feb 18 09:55:05 2010
New Revision: 32729

URL: http://svn.erp5.org?rev=32729&view=rev
Log:
use keyToId instead of re-inventing the wheel =)

Modified:
    erp5/trunk/products/ERP5Type/XMLMatrix.py

Modified: erp5/trunk/products/ERP5Type/XMLMatrix.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/XMLMatrix.py?rev=32729&r1=32728&r2=32729&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/XMLMatrix.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/XMLMatrix.py [utf8] Thu Feb 18 09:55:05 2010
@@ -75,15 +75,9 @@
       if not self.index.has_key(base_id):
         return None
 
-      cell_id_list = [base_id]
-      append = cell_id_list.append
-      index = self.index[base_id]
-      for i, my_id in enumerate(kw):
-        try:
-          append(str(index[i][my_id]))
-        except KeyError:
-          return None
-      cell_id = '_'.join(cell_id_list)
+      cell_id = self.keyToId(kw, base_id = base_id)
+      if cell_id is None:
+        return None
       return self.get(cell_id)
 
     security.declareProtected( Permissions.AccessContentsInformation,
@@ -493,15 +487,9 @@
       if not self.index.has_key(base_id):
         return None
 
-      cell_id_list = [base_id]
-
-      base_item = self.index[base_id]
-      try:
-        cell_id_list.extend(base_item[i][my_id] for i, my_id in enumerate(kw))
-      except KeyError:
+      cell_id = self.keyToId(kw, base_id = base_id)
+      if cell_id is None:
         raise KeyError, 'Invalid key: %s' % str(kw)
-
-      cell_id = "_".join(cell_id_list)
 
       cell = self.get(cell_id)
       if cell is not None: