[gnue] r9157 - trunk/gnue-forms/src/GFObjects

[reinhard]

Author: reinhard
Date: 2006-12-12 14:48:43 -0600 (Tue, 12 Dec 2006)
New Revision: 9157

Modified:
   trunk/gnue-forms/src/GFObjects/GFBlock.py
Log:
Better implementation for get_data().


Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2006-12-12 20:29:11 UTC (rev 
9156)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2006-12-12 20:48:43 UTC (rev 
9157)
@@ -1199,17 +1199,11 @@
         else:
             fields = [self._fieldMap[fld] for fld in fieldnames]
 
-        for r in self.__resultset:
+        for recno in xrange(0, self.__resultset.getRecordCount() - 1):
+            offset = recno - self.__resultset.getRecordNumber()
             add = {}
             for field in fields:
-                fname = field.field
-                if hasattr(field, 'fk_source'):
-                    value = field._allowedValues.get(r[fname])
-                else:
-                    value = r[fname]
-
-                add[fname] = value
-
+                add[field.name] = field.get_value(offset)
             result.append(add)
 
         return result