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

[nobody at svn.erp5.org]

Author: alex
Date: Tue Sep 19 13:36:44 2006
New Revision: 10148

URL: http://svn.erp5.org?rev=10148&view=rev
Log:
* getUidForPath now returns a long
* log messages made more explicit

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=10148&r1=10147&r2=10148&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py Tue Sep 19 13:36:44 2006
@@ -1052,7 +1052,7 @@
           raise CatalogError, 'A negative uid %d is used for %s. Your catalog is broken. Recreate your catalog.' % (index, path)
         if index:
           if uid != index:
-            LOG('SQLCatalog', WARNING, 'uid of %r changed from %r to %r !!! This can be fatal. You should reindex the whole site immediately.' % (object, uid, index))
+            LOG('SQLCatalog', WARNING, 'uid of %r changed from %r (property) to %r (catalog, by path) !!! This can be fatal. You should reindex the whole site immediately.' % (object, uid, index))
             uid = index
             object.uid = uid
         else:
@@ -1089,7 +1089,7 @@
 
             object.uid = self.newUid()
             LOG('SQLCatalog', WARNING,
-                'uid of %r changed from %r to %r !!! This can be fatal. You should reindex the whole site immediately.' % (object, uid, object.uid))
+                'uid of %r changed from %r to %r as old one is assigned to %s in catalog !!! This can be fatal. You should reindex the whole site immediately.' % (object, uid, object.uid, catalog_path))
 
     if method_id_list is None:
       method_id_list = self.sql_catalog_object_list
@@ -1258,7 +1258,7 @@
       search_result = method(path = path, uid_only=1)
       # If not empty, return first record
       if len(search_result) > 0:
-        return search_result[0].uid
+        return long(search_result[0].uid)
       else:
         return None
     except ConflictError: