[gnue-contrib] r287 - address/forms

[reinhard]

Author: reinhard
Date: 2008-10-14 11:32:19 -0500 (Tue, 14 Oct 2008)
New Revision: 287

Modified:
   address/forms/address.gfd
Log:
Fixed export filtering.


Modified: address/forms/address.gfd
===================================================================
--- address/forms/address.gfd   2008-07-29 09:10:14 UTC (rev 286)
+++ address/forms/address.gfd   2008-10-14 16:32:19 UTC (rev 287)
@@ -393,24 +393,15 @@
            u"ASP/Filter2",
            u"ASP/Filter3"]
 
-   master = blk_company.get_data(['id'])
-   flist = ['FID']
-   flist.extend(fieldnames)
-   detail = blk_csv.get_data(flist)
+   valid_masters = [row['id'] for row in blk_company.get_data(['id'])]
+   print valid_masters
 
-   dmap = {}
-   for row in detail:
-       dmap[int(row['FID'])] = row
+   flist = ['FID'] + fieldnames
 
-   neu = []
-   for row in master:
-       mid = int(row['id'])
+   data = [row for row in blk_csv.get_data(flist)
+           if row['FID'] in valid_masters]
 
-       drow = dmap.get(mid)
-       if drow:
-           neu.append(drow)
-
-   ucsv.write_file(fieldnames, neu, fname,
+   ucsv.write_file(fieldnames, data, fname,
            dialect="excel-tab", encoding="cp1250")
    form.status_message("")
    form.show_message("Datenexport beendet")