--- a/ztfy/utils/catalog/__init__.py Sun May 22 22:37:32 2011 +0200
+++ b/ztfy/utils/catalog/__init__.py Mon May 23 00:39:14 2011 +0200
@@ -27,7 +27,7 @@
# import local interfaces
# import Zope3 packages
-from zope.app import zapi
+from zope.component import queryUtility, getAllUtilitiesRegisteredFor
# import local packages
from ztfy.utils import request as request_utils
@@ -45,7 +45,7 @@
request = request_utils.getRequest()
intids = request_utils.getRequestData('IntIdsUtility::' + name, request)
if intids is None:
- intids = zapi.queryUtility(IIntIds, name, context=context)
+ intids = queryUtility(IIntIds, name, context=context)
if intids is not None:
request_utils.setRequestData('IntIdsUtility::' + name, intids, request)
return intids
@@ -81,7 +81,7 @@
def queryCatalog(name='', context=None):
"""Look for a registered catalog"""
- return zapi.queryUtility(ICatalog, name, context=context)
+ return queryUtility(ICatalog, name, context=context)
def indexObject(object, catalog_name='', index_name='', request=None, context=None):
@@ -157,8 +157,8 @@
"""Reindex a whole container properties and contents (including annotations) into site's catalogs"""
if context is None:
context = object
- intids = zapi.queryUtility(IIntIds, context=context)
+ intids = queryUtility(IIntIds, context=context)
if intids is not None:
- catalogs = zapi.getAllUtilitiesRegisteredFor(ICatalog, context)
+ catalogs = getAllUtilitiesRegisteredFor(ICatalog, context)
if catalogs:
_indexAllObject(object, intids, catalogs)