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

[nobody at svn.erp5.org]

Author: seb
Date: Fri Jan 12 10:56:04 2007
New Revision: 12039

URL: http://svn.erp5.org?rev=12039&view=rev
Log:
it is possible to use only one test instead of 2

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=12039&r1=12038&r2=12039&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py Fri Jan 12 10:56:04 2007
@@ -1915,9 +1915,8 @@
           table_index += 1
         where_expression_list.append(related_method(**table_id))
     # Concatenate expressions
-    if kw.get('where_expression',None) is not None:
-      if len(kw['where_expression']) > 0:
-        where_expression_list.append(kw['where_expression'])
+    if kw.get('where_expression',None) not in (None,''):
+      where_expression_list.append(kw['where_expression'])
     where_expression = join(where_expression_list, ' AND ')
     select_expression= join(select_expression_list,',')