Index: /main/waeup.kofa/trunk/src/waeup/kofa/catalog.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/catalog.py	(revision 9766)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/catalog.py	(revision 9767)
@@ -22,14 +22,16 @@
 from hurry.query.query import Query
 from zope.catalog.catalog import ResultSet
-from zope.component import getUtility
+from zope.catalog.interfaces import ICatalog
+from zope.component import getUtility, queryUtility
+from zope.interface import implementer
 from zope.intid.interfaces import IIntIds
-from waeup.kofa.interfaces import IQueryResultItem
+from waeup.kofa.interfaces import (
+    IQueryResultItem, IFilteredQuery, IFilteredCatalogQuery)
 
 # not yet used
+@implementer(IQuery)
 class KofaQuery(Query):
     """A hurry.query-like query that supports also ``apply``.
     """
-    grok.implements(IQuery)
-
     def apply(self, query):
         """Get a catalog's BTree set of intids conforming to a query.
@@ -49,6 +51,6 @@
 
 # not yet used
+@implementer(IQueryResultItem)
 class QueryResultItem(object):
-    grok.implements(IQueryResultItem)
     url = None
     title = None
@@ -60,2 +62,38 @@
         self.title = context.title
         self.description = ''
+
+@implementer(IFilteredQuery)
+class FilteredQueryBase(object):
+    """A filter to find objects that match certain parameters.
+    """
+    defaults = dict()
+
+    def __init__(self, **kw):
+        self._kw = dict(self.defaults)
+        self._kw.update(kw)
+        return
+
+    def query(self, context=None):
+        err_msg = 'class %s does not implement the query() method.' % (
+            self.__class__.__name__, )
+        raise NotImplementedError(err_msg)
+
+@implementer(IFilteredCatalogQuery)
+class FilteredCatalogQueryBase(FilteredQueryBase):
+    cat_name = None
+
+    def query_catalog(self, catalog):
+        query = dict()
+        for idx_name, value in self._kw.items():
+            if not isinstance(value, tuple):
+                value = (value, value)
+            query[idx_name] = value
+        result = catalog.searchResults(**query)
+        return result
+
+    def query(self):
+        catalog = queryUtility(
+            ICatalog, name=self.cat_name, default=None)
+        if catalog is None:
+            return []
+        return self.query_catalog(catalog)
