Changeset 6913

Timestamp:

19 Oct 2011, 17:17:23 (13 years ago)

Author:

Henrik Bettermann

Message:

Extend certificates_catalog and let's search for certificates too.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/university/catalog.py (modified) (3 diffs)

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

@@ -35 +35 @@
     code = grok.index.Field(attribute='code')
     application_category = grok.index.Field(attribute='application_category')
+    title = grok.index.Text(attribute='title')
 
 class CertificateCoursesIndexes(grok.Indexes):
@@ -118 +119 @@
         self.type = 'Course'
 
+class CertificatesQueryResultItem(object):
+    grok.implements(IQueryResultItem)
+
+    def __init__(self, context, view):
+        self.context = context
+        self.url = view.url(context)
+        self.title = context.title
+        self.code = context.code
+        self.type = 'Certificate'
+
 class CertificateCoursesQueryResultItem(object):
     grok.implements(IQueryResultItem)
@@ -143 +154 @@
         for result in results:
             hitlist.append(CoursesQueryResultItem(result, view=view))
-
+        results = Query().searchResults(
+            Eq(('certificates_catalog', 'code'), query))
+        for result in results:
+            hitlist.append(CertificatesQueryResultItem(result, view=view))
+        results = Query().searchResults(
+            Text(('certificates_catalog', 'title'), query))
+        for result in results:
+            hitlist.append(CertificatesQueryResultItem(result, view=view))
         results = Query().searchResults(
             Eq(('certcourses_catalog', 'course_code'), query))