kallithea Changeset - 9773b46e239f

Changeset - 9773b46e239f

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 15 years ago 2011-05-02 15:01:29
marcin@python-works.com

whoosh errors don't crash entire app now, just display an error and log exception instead

1 file changed with 6 insertions and 1 deletions:

rhodecode/controllers/search.py

0 comments (0 inline, 0 general)

rhodecode/controllers/search.py

➞

Show inline comments

@@ @@ -28,25 +28,25 @@ import traceback @@
 from pylons.i18n.translation import _
 from pylons import request, config, session, tmpl_context as c
 from rhodecode.lib.auth import LoginRequired
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.indexers import SCHEMA, IDX_NAME, ResultWrapper
 from webhelpers.paginate import Page
 from webhelpers.util import update_params
 from whoosh.index import open_dir, EmptyIndexError
 from whoosh.qparser import QueryParser, QueryParserError
 from whoosh.query import Phrase
+from whoosh.query import Phrase, Wildcard, Term, Prefix
 log = logging.getLogger(__name__)
 class SearchController(BaseController):
     @LoginRequired()
     def __before__(self):
         super(SearchController, self).__before__()
     def index(self, search_repo=None):
         c.repo_name = search_repo
@@ @@ -70,24 +70,26 @@ class SearchController(BaseController): @@
                 idx = open_dir(config['app_conf']['index_dir'],
                                indexname=IDX_NAME)
                 searcher = idx.searcher()
                 qp = QueryParser(search_type, schema=SCHEMA)
                 if c.repo_name:
                     cur_query = u'repository:%s %s' % (c.repo_name, cur_query)
                 try:
                     query = qp.parse(unicode(cur_query))
                     if isinstance(query, Phrase):
                         highlight_items.update(query.words)
                     elif isinstance(query, Prefix):
                         highlight_items.add(query.text)
                     else:
                         for i in query.all_terms():
                             if i[0] == 'content':
                                 highlight_items.add(i[1])
                     matcher = query.matcher(searcher)
                     log.debug(query)
                     log.debug(highlight_items)
                     results = searcher.search(query)
                     res_ln = len(results)
                     c.runtime = '%s results (%.3f seconds)' \
@@ @@ -102,15 +104,18 @@ class SearchController(BaseController): @@
                                               highlight_items),
                                 page=p, item_count=res_ln,
                                 items_per_page=10, url=url_generator)
                 except QueryParserError:
                     c.runtime = _('Invalid search query. Try quoting it.')
                 searcher.close()
             except (EmptyIndexError, IOError):
                 log.error(traceback.format_exc())
                 log.error('Empty Index data')
                 c.runtime = _('There is no index to search in. '
                               'Please run whoosh indexer')
             except (Exception):
                 log.error(traceback.format_exc())
                 c.runtime = _('An error occurred during this search operation')
         # Return a rendered template
         return render('/search/search.html')

0 comments (0 inline, 0 general)