[Erp5-report] r25887 - /erp5/trunk/products/ZSQLCatalog/ColumnMap.py

[nobody at svn.erp5.org]

Author: vincent
Date: Thu Mar  5 16:17:03 2009
New Revision: 25887

URL: http://svn.erp5.org?rev=25887&view=rev
Log:
Rename TRACE file global into MAPPING_TRACE to avoid collision with zLOG constants.

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

Modified: erp5/trunk/products/ZSQLCatalog/ColumnMap.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/ColumnMap.py?rev=25887&r1=25886&r2=25887&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/ColumnMap.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/ColumnMap.py [utf8] Thu Mar  5 16:17:03 2009
@@ -35,7 +35,7 @@
 
 DEFAULT_GROUP_ID = None
 
-TRACE = False
+MAPPING_TRACE = False
 
 # TODO: handle left joins
 # TODO: handle straight joins
@@ -202,7 +202,7 @@
           best_count += 1
       if best_count:
         LOG('ColumnMap', 100, 'Mapping vote led to a tie. Mapping to %r' % (best_choice, ))
-      if TRACE:
+      if MAPPING_TRACE:
         LOG('ColumnMap', 0, 'Mapping by vote %r to %r' % (column_name, best_choice))
       mapping_dict[column_name] = best_choice
       column_name_set.remove(column_name)
@@ -254,7 +254,7 @@
                 break
           if use_allowed:
             for column_name in common_column_set:
-              if TRACE:
+              if MAPPING_TRACE:
                 LOG('ColumnMap', 0, 'Mapping by default %r to %r' % \
                     (column_name, table_name))
               mapping_dict[column_name] = table_name
@@ -281,7 +281,7 @@
     # Do the actual mapping
     for column_name, table_name in mapping_dict.iteritems():
       # Mark this column as resolved
-      if TRACE:
+      if MAPPING_TRACE:
         LOG('ColumnMap', 0, 'Mapping column %s to table %s' % (column_name, table_name))
       self.registerTable(table_name, group=group)
       self.resolveColumn(column_name, table_name, group=group)
@@ -383,7 +383,7 @@
         table_alias_number_dict[alias_table_name] = table_alias_number
       self.resolveTable(table_name, alias, group=group)
 
-    if TRACE:
+    if MAPPING_TRACE:
       # Key: group
       # Value: 2-tuple
       #  dict