Changeset 5007

Timestamp:

4 Feb 2010, 12:57:32 (15 years ago)

Author:

uli

Message:

• Move academics-related catalog components into university subpackage.
• Move interface into interfaces.py where it belongs.
• Update pages.py to reflect the changes above.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• browser/pages.py (modified) (1 diff)
• catalog.py (modified) (3 diffs)
• interfaces.py (modified) (1 diff)
• university/catalog.py (added)

main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py

@@ -16 +16 @@
     IUniversity, IFacultyContainer, IFaculty, IDepartment, ICourse,
     ICertificate, ICertificateCourse)
-from waeup.sirp.catalog import search, search_context
+from waeup.sirp.university.catalog import search
+from waeup.sirp.catalog import search_context
 from waeup.sirp.interfaces import(
     IWAeUPObject, IUserContainer, IUserAccount, IDataCenter,

main/waeup.sirp/trunk/src/waeup/sirp/catalog.py

@@ -5 +5 @@
 from hurry.query import Eq
 from waeup.sirp.app import University
-from waeup.sirp.university.interfaces import ICourse, ICertificateCourse
+from waeup.sirp.interfaces import IQueryResultItem
 from waeup.sirp.student.interfaces import IStudent
-from zope.app.catalog.interfaces import ICatalog
-from zope.app.intid.interfaces import IIntIds
-from zope.component import getUtility
-from zope.component.interfaces import ComponentLookupError
 
 
@@ -18 +14 @@
      grok.context(IStudent)
 
-     name = index.Field(attribute='name')
+     name = grok.index.Field(attribute='name')
 
-
-class CourseIndexes(grok.Indexes):
-     grok.site(University)
-     grok.name('courses_catalog')
-     grok.context(ICourse)
-
-     code = index.Field(attribute='code')
-     title = index.Text(attribute='title')
-
-class CourseCertificatesIndexes(grok.Indexes):
-     grok.site(University)
-     grok.name('certcourses_catalog')
-     grok.context(ICertificateCourse)
-
-     course_code = index.Field(attribute='getCourseCode')
-
-@grok.subscribe(ICourse, grok.IObjectAddedEvent)
-def handleCourseAdd(obj, event):
-     """Index an added course with the local catalog.
-
-     Courses are not indexed automatically, as they are not a
-     dictionary subitem of the accompanied site object
-     (`IUniversity`). I.e. one cannot get them by asking for
-     ``app['FACCODE']['DEPTCODE']['COURSECODE']`` but one has to ask for
-     ``app.faculties['FACCODE']['DEPTCODE'].courses['COURSECODE']``.
-
-     Once, a course is indexed we can leave the further handling to
-     the default component architechture. At least removals will
-     be handled correctly then (and the course unindexed).
-     """
-     try:
-          cat = getUtility(ICatalog, name='courses_catalog')
-     except ComponentLookupError:
-          # catalog not available. This might happen during tests.
-          return
-     intids = getUtility(IIntIds)
-     index = cat['code']
-     index.index_doc(intids.getId(obj), obj)
-
-from zope.interface import Interface
-from zope import schema
-
-class IQueryResultItem(Interface):
-     url = schema.TextLine(
-          title = u'URL that links to the found item')
-     title = schema.TextLine(
-          title = u'Title displayed in search results.')
-     description = schema.Text(
-          title = u'Longer description of the item found.')
-     
-     
 class QueryResultItem(object):
      grok.implements(IQueryResultItem)
@@ -82 +27 @@
           self.title = context.title
           self.description = ''
-     
-class CourseQueryResultItem(QueryResultItem):
-     def __init__(self, context, view):
-          self.context = context
-          self.url = view.url(context)
-          self.title = "COURSE: " + context.title
-          self.description = 'code: %s' % context.code
-
-def search(query=None, view=None):
-     if not query:
-          return []
-     cat = getUtility(ICatalog, name='courses_catalog')
-     results = list(cat.searchResults(code=(query, query)))
-          
-     hitlist = []
-     results = Query().searchResults(
-          Eq(('courses_catalog', 'code'), query))
-     for result in results:
-          hitlist.append(CourseQueryResultItem(result, view=view))
-
-     results = Query().searchResults(
-          Text(('courses_catalog', 'title'), query))
-          
-     for result in results:
-          hitlist.append(CourseQueryResultItem(result, view=view))
-
-     return hitlist
 
 def search_context(query):

main/waeup.sirp/trunk/src/waeup/sirp/interfaces.py

@@ -202 +202 @@
     """Emitted, when the storage of a datacenter changes.
     """
+
+class IQueryResultItem(Interface):
+    """An item in a search result.
+    """
+    url = schema.TextLine(
+        title = u'URL that links to the found item')
+    title = schema.TextLine(
+        title = u'Title displayed in search results.')
+    description = schema.Text(
+        title = u'Longer description of the item found.')
+