Changeset 4667 for waeup/branches/ulif-layout

Timestamp:

5 Jan 2010, 09:50:36 (15 years ago)

Author:

uli

Message:

Use catalog methods to get search results.

File:

• waeup/branches/ulif-layout/src/waeup/browser/pages.py (modified) (4 diffs)

waeup/branches/ulif-layout/src/waeup/browser/pages.py

@@ -6 +6 @@
 from hurry.query.query import Query, Text
 from waeup.browser import WAeUPPage, WAeUPEditFormPage, WAeUPAddFormPage
+from waeup.catalog import search, search_context
 from waeup.interfaces import (IUniversity, IWAeUPObject, IUserContainer,
                               IUserAccount, IFacultyContainer)
@@ -199 +200 @@
         self.search_result = []
         if query is not None:
-            self.search_result = self.search_context(query)
+            self.search_result = search_context(query)
             print "RESULT: ", list(self.search_result)
 
-    def search_context(self, query):
-        result = Query().searchResults(
-            Eq(('students_catalog', 'name'), query)
-            )
-        return result
-
-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)
-     url = None
-     title = None
-     description = None
-     
-     def __init__(self, context, view):
-          self.context = context
-          self.url = view.url(context)
-          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
-
-
-#from waeup.viewlets import Search, MainArea
-from hurry.query.query import Query, Text, Eq
-from zope.app.catalog.interfaces import ICatalog
 
 class SearchPage(WAeUPPage):
@@ -251 +211 @@
 
      def update(self, *args, **kw):
-          #print "UPDATE: ", args, kw
-          #print self.request.form
           form = self.request.form
           self.hitlist = []
@@ -260 +218 @@
           query = form['query']
           self.query = query
-          cat = getUtility(ICatalog, name='courses_catalog')
-          #print "CODES: ",  cat['code'].documentCount()
-          #print "TITLES: ", cat['title'].documentCount()
-          results = list(cat.searchResults(code=(query, query)))#
-          #title=(query, query)))
-          hitlist = []
-          results = Query().searchResults(
-               Eq(('courses_catalog', 'code'), query))
-          for result in results:
-               hitlist.append(CourseQueryResultItem(result, view=self))
-
-          results = Query().searchResults(
-               Text(('courses_catalog', 'title'), query))
-          
-          for result in results:
-               hitlist.append(CourseQueryResultItem(result, view=self))
-
-          self.hitlist = hitlist
+          self.hitlist = search(query=self.query, view=self)
+          return