Index: /main/waeup.sirp/trunk/src/waeup/sirp/hostels/catalog.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/hostels/catalog.py	(revision 6972)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/hostels/catalog.py	(revision 6972)
@@ -0,0 +1,34 @@
+"""Cataloging and searching components for hostels.
+"""
+import grok
+from grok import index
+from hurry.query import Eq, Text
+from hurry.query.query import Query
+from zope.catalog.interfaces import ICatalog
+from zope.component import queryUtility
+from waeup.sirp.interfaces import IUniversity, IQueryResultItem
+from waeup.sirp.hostels.interfaces import IBed
+
+class BedIndexes(grok.Indexes):
+    """A catalog for beds.
+    """
+    grok.site(IUniversity)
+    grok.name('beds_catalog')
+    grok.context(IBed)
+
+    bed_number = index.Field(attribute='bed_number')
+    bed_type = index.Field(attribute='bed_type')
+    owner = index.Field(attribute='owner')
+
+class BedQueryResultItem(object):
+    grok.implements(IQueryResultItem)
+
+    title = u'Bed Query Item'
+    description = u'Some bed found in a search'
+
+    def __init__(self, context, view):
+        self.context = context
+        self.url = view.url(context)
+        self.bed_id = context.bed_id
+        self.bed_type = context.bed_type
+        self.bed_number = context.bed_number
Index: /main/waeup.sirp/trunk/src/waeup/sirp/hostels/tests.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/hostels/tests.py	(revision 6971)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/hostels/tests.py	(revision 6972)
@@ -23,4 +23,6 @@
 from zope.testbrowser.testing import Browser
 from zope.security.interfaces import Unauthorized
+from zope.catalog.interfaces import ICatalog
+from zope.component import queryUtility
 from waeup.sirp.app import University
 from waeup.sirp.hostels.interfaces import (
@@ -90,4 +92,16 @@
         setSite(app)
 
+        # Create a hostel
+        hostel = Hostel()
+        hostel.hostel_id = u'hall_x'
+        self.app['hostels'][hostel.hostel_id] = hostel
+
+        # Create a bed
+        bed = Bed()
+        bed.bed_id = u'xyz'
+        bed.bed_number = 1
+        bed.bed_type = u'abc'
+        self.app['hostels'][hostel.hostel_id][bed.bed_id] = bed
+
         self.container_path = 'http://localhost/app/hostels'
         self.manage_container_path = self.container_path + '/@@manage'
@@ -103,4 +117,21 @@
         clearSite()
         shutil.rmtree(self.dc_root)
+
+class BedCatalogTests(HostelsFullSetup):
+
+    layer = FunctionalLayer
+
+    def test_get_catalog(self):
+        # We can get an students catalog if we wish
+        cat = queryUtility(ICatalog, name='beds_catalog')
+        assert cat is not None
+
+    def test_search_by_type(self):
+        # We can find a certain bed
+        cat = queryUtility(ICatalog, name='beds_catalog')
+        results = cat.searchResults(bed_type=('abc', 'abc'))
+        results = [x for x in results] # Turn results generator into list
+        assert len(results) == 1
+        assert results[0] is self.app['hostels']['hall_x']['xyz']
 
 class HostelsUITests(HostelsFullSetup):
