[Erp5-report] r30313 - /erp5/trunk/products/ERP5/Document/Resource.py

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Thu Nov  5 05:29:45 2009
New Revision: 30313

URL: http://svn.erp5.org?rev=30313&view=rev
Log:
getMeasureRowList: call asCatalogRowList only if we later keep the measure

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

Modified: erp5/trunk/products/ERP5/Document/Resource.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Resource.py?rev=30313&r1=30312&r2=30313&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Resource.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Resource.py [utf8] Thu Nov  5 05:29:45 2009
@@ -874,15 +874,16 @@
       for measure in self.getMeasureList():
         metric_type = measure.getMetricType()
         if metric_type in metric_type_map:
-          metric_type_map[metric_type] = ()
+          metric_type_map[metric_type] = None
         else:
-          metric_type_map[metric_type] = measure.asCatalogRowList()
+          metric_type_map[metric_type] = measure
         if measure.getRelativeUrl() == default:
           quantity_unit = ''
 
       insert_list = []
-      for measure_list in metric_type_map.itervalues():
-        insert_list += measure_list
+      for measure in metric_type_map.itervalues():
+        if measure is not None:
+          insert_list += measure.asCatalogRowList()
 
       metric_type = quantity_unit.split('/', 1)[0]
       if metric_type and metric_type not in metric_type_map: