Changeset 6447 for main/waeup.sirp/trunk/src/waeup/sirp/university

Timestamp:

21 Jun 2011, 11:09:33 (14 years ago)

Author:

Henrik Bettermann

Message:

Implement search function for academic section. The courses_catalog and the certcourses_catalog are searched.

Remove search pages for students. Student search will be done in the upcoming student package.

File:

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

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

@@ -2 +2 @@
 """
 import grok
-from hurry.query import Eq
+from hurry.query import Eq, Text
+from hurry.query.query import Query
 from zope.catalog.interfaces import ICatalog
 from zope.component import getUtility
 from zope.component.interfaces import ComponentLookupError
+from zope.index.text.parsetree import ParseError
 from zope.intid import IIntIds
-from waeup.sirp.catalog import QueryResultItem
+#from waeup.sirp.catalog import QueryResultItem
 from waeup.sirp.index import UniqueField
-from waeup.sirp.interfaces import IUniversity
+from waeup.sirp.interfaces import IUniversity, IQueryResultItem
 from waeup.sirp.university.interfaces import (
     ICourse, ICertificateCourse, IDepartment,
     ICertificate,
     )
-
 
 class CourseIndexes(grok.Indexes):
@@ -92 +93 @@
     return
 
-class CourseQueryResultItem(QueryResultItem):
+class CoursesQueryResultItem(object):
+    grok.implements(IQueryResultItem)
+
     def __init__(self, context, view):
         self.context = context
         self.url = view.url(context)
-        self.title = "COURSE: " + context.title
-        self.description = 'code: %s' % context.code
+        self.title = context.title
+        self.code = context.code
+        self.type = 'Course'
+
+class CertificateCoursesQueryResultItem(object):
+    grok.implements(IQueryResultItem)
+
+    def __init__(self, context, view):
+        self.context = context
+        self.url = view.url(context)
+        self.title = context.course.title
+        self.code = context.getCourseCode
+        self.type = 'Course Referrer'
 
 def search(query=None, view=None):
     if not query:
-        return []
-    cat = getUtility(ICatalog, name='courses_catalog')
-    results = list(cat.searchResults(code=(query, query)))
+        view.flash('Empty search string.')
+        return
 
     hitlist = []
-    results = Query().searchResults(
-        Eq(('courses_catalog', 'code'), query))
-    for result in results:
-        hitlist.append(CourseQueryResultItem(result, view=view))
+    try:
+        results = Query().searchResults(
+            Eq(('courses_catalog', 'code'), query))
+        for result in results:
+            hitlist.append(CoursesQueryResultItem(result, view=view))
+        results = Query().searchResults(
+            Text(('courses_catalog', 'title'), query))
+        for result in results:
+            hitlist.append(CoursesQueryResultItem(result, view=view))
 
-    results = Query().searchResults(
-        Text(('courses_catalog', 'title'), query))
-
-    for result in results:
-        hitlist.append(CourseQueryResultItem(result, view=view))
-
+        results = Query().searchResults(
+            Eq(('certcourses_catalog', 'course_code'), query))
+        for result in results:
+            hitlist.append(CertificateCoursesQueryResultItem(result, view=view))
+    except ParseError:
+        view.flash('Search string not allowed.')
+        return
     return hitlist