[Erp5-report] r17682 - /erp5/trunk/products/ZSQLCatalog/SQLCatalog.py

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Nov 19 14:08:15 2007
New Revision: 17682

URL: http://svn.erp5.org?rev=17682&view=rev
Log:
also ignore empty strings for related keys, unless `ignore_empty_string` is
false.
+ remove a unused variable "dynamic_kw"


Modified:
    erp5/trunk/products/ZSQLCatalog/SQLCatalog.py

Modified: erp5/trunk/products/ZSQLCatalog/SQLCatalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/SQLCatalog.py?rev=17682&r1=17681&r2=17682&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py Mon Nov 19 14:08:15 2007
@@ -2036,7 +2036,6 @@
     # Do not generate dynamic related key for acceptable_keys
     dynamic_key_list = [k for k in key_list \
         if k not in self.getColumnMap().keys()]
-    dynamic_kw = {}
 
     dynamic_list = self.getDynamicRelatedKeyList(dynamic_key_list)
     full_list = list(dynamic_list) + list(self.sql_catalog_related_keys)
@@ -2241,6 +2240,10 @@
       t_tuple = t.split('|')
       key = t_tuple[0].strip()
       if key in key_list:
+        if ignore_empty_string \
+            and kw.get(key, '') in ('', [], ()):
+              # we don't ignore 0
+          continue
         join_tuple = t_tuple[1].strip().split('/')
         related_keys[key] = None
         method_id = join_tuple[2]