[Erp5-report] r33321 nicolas.dumazet - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Wed Mar  3 11:21:20 2010
New Revision: 33321

URL: http://svn.erp5.org?rev=33321&view=rev
Log:
Pass dictionaries instead of tuples to indexing methods

Modified:
    erp5/trunk/products/ERP5/Document/Measure.py
    erp5/trunk/products/ERP5/Document/Resource.py

Modified: erp5/trunk/products/ERP5/Document/Measure.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Measure.py?rev=33321&r1=33320&r2=33321&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Measure.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Measure.py [utf8] Wed Mar  3 11:21:20 2010
@@ -217,7 +217,9 @@
           management_unit_quantity = getQuantity(management_unit_value)
 
         if (not default or quantity == management_unit_quantity):
-          return (uid, resource_uid, '^', metric_type_uid, quantity),
+          return (dict(uid=uid, resource_uid=resource_uid,
+                       variation='^', metric_type_uid=metric_type_uid,
+                       quantity=quantity)),
       return ()
 
     if default:
@@ -302,10 +304,10 @@
         if quantity is None:
           continue
         cell = quantity
-      row_list.append((uid,
-                       resource_uid,
-                       '^%s$' % ''.join(regex_list),
-                       metric_type_uid,
-                       cell * quantity_unit))
+      row_list.append(dict(uid=uid,
+                       resource_uid=resource_uid,
+                       variation='^%s$' % ''.join(regex_list),
+                       metric_type_uid=metric_type_uid,
+                       quantity=cell * quantity_unit))
 
     return row_list

Modified: erp5/trunk/products/ERP5/Document/Resource.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Resource.py?rev=33321&r1=33320&r2=33321&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Resource.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Resource.py [utf8] Wed Mar  3 11:21:20 2010
@@ -967,7 +967,10 @@
       row_list = []
       for unit_uid, value in self._getQuantityUnitDefinitionDict().iteritems():
         definition_uid, quantity = value
-        row_list.append((definition_uid, uid, unit_uid, quantity))
+        row_list.append(dict(uid=definition_uid,
+                             resource_uid=uid,
+                             quantity_unit_uid=unit_uid,
+                             quantity=quantity))
 
       return row_list
 
@@ -1062,7 +1065,9 @@
                                   .getCategoryUid(metric_type, 'metric_type')
             if quantity and metric_type_uid:
               uid = self.getUid()
-              insert_list += (uid, uid, '^', metric_type_uid, float(quantity)),
+              insert_list.append(dict(uid=uid, resource_uid=uid, variation='^',
+                                  metric_type_uid=metric_type_uid,
+                                  quantity=float(quantity)))
 
       return insert_list