kallithea Changeset - 8b6e87245e57

Changeset - 8b6e87245e57

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 7 years ago 2018-12-23 21:16:07
mads@kiilerich.com

search: Actually raise EmptyIndexError if the index hasn't been built yet

It would only log a generic error with:
OSError: [Errno 2] No such file or directory: '.../data/index'

1 file changed with 6 insertions and 4 deletions:

kallithea/controllers/search.py

0 comments (0 inline, 0 general)

kallithea/controllers/search.py

➞

Show inline comments

@@ @@ -22,25 +22,25 @@ Original author and date, and relevant c @@
 :created_on: Aug 7, 2010
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 import logging
 import traceback
 import urllib
 from tg.i18n import ugettext as _
 from tg import request, config, tmpl_context as c
 from whoosh.index import open_dir, EmptyIndexError
+from whoosh.index import open_dir, exists_in, EmptyIndexError
 from whoosh.qparser import QueryParser, QueryParserError
 from whoosh.query import Phrase, Prefix
 from webhelpers.util import update_params
 from kallithea.lib.auth import LoginRequired
 from kallithea.lib.base import BaseRepoController, render
 from kallithea.lib.indexers import CHGSETS_SCHEMA, SCHEMA, CHGSET_IDX_NAME, \
     IDX_NAME, WhooshResultWrapper
 from kallithea.lib.page import Page
 from kallithea.lib.utils2 import safe_str, safe_int
 from kallithea.model.repo import RepoModel
@@ @@ -75,27 +75,29 @@ class SearchController(BaseRepoControlle @@
         }.get(c.cur_type, SCHEMA)
         log.debug('IDX: %s', index_name)
         log.debug('SCHEMA: %s', schema_defn)
         if c.cur_query:
             cur_query = c.cur_query.lower()
             log.debug(cur_query)
         if c.cur_query:
             p = safe_int(request.GET.get('page'), 1)
             highlight_items = set()
             index_dir = config['app_conf']['index_dir']
             try:
                 idx = open_dir(config['app_conf']['index_dir'],
                                indexname=index_name)
                 if not exists_in(index_dir, index_name):
                     raise EmptyIndexError
                 idx = open_dir(index_dir, indexname=index_name)
                 searcher = idx.searcher()
                 qp = QueryParser(search_type, schema=schema_defn)
                 if c.repo_name:
                     # use "repository_rawname:" instead of "repository:"
                     # for case-sensitive matching
                     cur_query = u'repository_rawname:%s %s' % (c.repo_name, cur_query)
                 try:
                     query = qp.parse(unicode(cur_query))
                     # extract words for highlight
                     if isinstance(query, Phrase):
                         highlight_items.update(query.words)
@@ @@ -124,23 +126,23 @@ class SearchController(BaseRepoControlle @@
                     c.formated_results = Page(
                         WhooshResultWrapper(search_type, searcher, matcher,
                                             highlight_items, repo_location),
                         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):
             except EmptyIndexError:
                 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 search operation.')
         # Return a rendered template
         return render('/search/search.html')

0 comments (0 inline, 0 general)