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

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Jun 21 11:17:22 2006
New Revision: 8117

URL: http://svn.erp5.org?rev=8117&view=rev
Log:
fix undefined names, formating % and unappropriate warning message.


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=8117&r1=8116&r2=8117&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py Wed Jun 21 11:17:22 2006
@@ -43,6 +43,7 @@
 import os
 import md5
 import threading
+import types
 
 try:
   from Products.PageTemplates.Expressions import SecureModuleImporter
@@ -918,12 +919,12 @@
                         'manage_tabs_message=Catalog%%20Cleared' % URL1)
 
   def manage_catalogClearReserved(self, REQUEST=None, RESPONSE=None, URL1=None):
-    """ clears the whole enchilada """
+    """ clears reserved uids """
     self.clearReserved()
 
     if RESPONSE and URL1:
       RESPONSE.redirect('%s/manage_catalogAdvanced?' \
-                        'manage_tabs_message=Catalog%20Cleared' % URL1)
+                        'manage_tabs_message=Catalog%%20Cleared' % URL1)
 
   def manage_catalogFoundItems(self, REQUEST, RESPONSE, URL2, URL1,
                  obj_metatypes=None,
@@ -1189,7 +1190,6 @@
     for method_name in methods:
       method = getattr(self, method_name)
       try:
-        #if 1:
         method(uid = uid)
       except ConflictError:
         raise
@@ -1296,8 +1296,6 @@
   def getMetadataForPath(self, path):
     """ Accesses a single record for a given path """
     try:
-      if uid is None:
-        return None
       # Get the appropriate SQL Method
       method = getattr(self, self.sql_getitem_by_path)
       brain = method(path = path)[0]
@@ -1310,7 +1308,8 @@
     except:
       # This is a real LOG message
       # which is required in order to be able to import .zexp files
-      LOG('SQLCatalog', WARNING, "could not find uid from path %s" % (path,))
+      LOG('SQLCatalog', WARNING,
+          "could not find metadata from path %s" % (path,))
       return None
 
   def getIndexDataForPath(self, path):