[Erp5-report] r26566 - /erp5/trunk/products/ZSQLCatalog/SQLCatalog.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Apr 21 17:01:06 CEST 2009
Author: vincent
Date: Tue Apr 21 17:01:05 2009
New Revision: 26566
URL: http://svn.erp5.org?rev=26566&view=rev
Log:
Reduce the verbosity of empty-value-related log messages, by displaying all discarded columns at once instead of once per discarded column.
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=26566&r1=26565&r2=26566&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] Tue Apr 21 17:01:05 2009
@@ -1998,6 +1998,9 @@
# column names with empty values. This is for backward compatibility. See
# comment about empty values.
implicit_table_list = []
+ # empty_value_dict: contains all keys whose value causes them to be
+ # discarded.
+ empty_value_dict = {}
for key, value in kw.iteritems():
result = None
if isinstance(value, dict_type_list):
@@ -2019,7 +2022,7 @@
# resulting where-expression)
if '.' in key:
implicit_table_list.append(key)
- LOG('SQLCatalog', WARNING, 'Discarding empty value for key %r: %r' % (key, value))
+ empty_value_dict[key] = value
else:
script = self.getScriptableKeyScript(key)
if isinstance(value, _Query):
@@ -2057,6 +2060,8 @@
unknown_column_dict[key] = value
else:
append(result)
+ if len(empty_value_dict):
+ LOG('SQLCatalog', WARNING, 'Discarding columns with empty values: %r' % (empty_value_dict, ))
if len(unknown_column_dict):
LOG('SQLCatalog', WARNING, 'Unknown columns %r, skipped.' % (unknown_column_dict.keys(), ))
return ComplexQuery(query_list, logical_operator=operator, unknown_column_dict=unknown_column_dict, implicit_table_list=implicit_table_list)
More information about the Erp5-report
mailing list