[Erp5-report] r7237 - /erp5/trunk/products/ZSQLCatalog/SQLCatalog.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri May 12 11:31:54 CEST 2006
Author: romain
Date: Fri May 12 11:31:52 2006
New Revision: 7237
URL: http://svn.erp5.org?rev=7237&view=rev
Log:
Modify code layout.
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=7237&r1=7236&r2=7237&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py Fri May 12 11:31:52 2006
@@ -599,7 +599,8 @@
except ConflictError:
raise
except:
- LOG('SQLCatalog', WARNING, 'could not clear catalog with %s' % method_name, error=sys.exc_info())
+ LOG('SQLCatalog', WARNING,
+ 'could not clear catalog with %s' % method_name, error=sys.exc_info())
pass
# Reserved uids have been removed.
@@ -624,7 +625,15 @@
"""
method_id = self.sql_catalog_clear_reserved
method = getattr(self, method_id)
- method()
+ try:
+ method()
+ except ConflictError:
+ raise
+ except:
+ LOG('SQLCatalog', WARNING,
+ 'could not clear reserved catalog with %s' % \
+ method_id, error=sys.exc_info())
+ raise
self._last_clear_reserved_time += 1
def __getitem__(self, uid):
@@ -899,19 +908,22 @@
'Total time: %s<br>'
'Total CPU time: %s' % (`elapse`, `c_elapse`)))
- def manage_catalogClear(self, REQUEST=None, RESPONSE=None, URL1=None, sql_catalog_id=None):
+ def manage_catalogClear(self, REQUEST=None, RESPONSE=None,
+ URL1=None, sql_catalog_id=None):
""" clears the whole enchilada """
self.clear()
if RESPONSE and URL1:
- RESPONSE.redirect(URL1 + '/manage_catalogAdvanced?manage_tabs_message=Catalog%20Cleared')
+ RESPONSE.redirect('%s/manage_catalogAdvanced?' \
+ 'manage_tabs_message=Catalog%20Cleared' % URL1)
def manage_catalogClearReserved(self, REQUEST=None, RESPONSE=None, URL1=None):
""" clears the whole enchilada """
self.clearReserved()
if RESPONSE and URL1:
- RESPONSE.redirect(URL1 + '/manage_catalogAdvanced?manage_tabs_message=Catalog%20Cleared')
+ RESPONSE.redirect('%s/manage_catalogAdvanced?' \
+ 'manage_tabs_message=Catalog%20Cleared' % URL1)
def manage_catalogFoundItems(self, REQUEST, RESPONSE, URL2, URL1,
obj_metatypes=None,
More information about the Erp5-report
mailing list