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

@@ @@ -31,7 +31,7 @@ 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
@@ @@ -84,9 +84,11 @@ class SearchController(BaseRepoControlle @@
         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)
@@ @@ -133,7 +135,7 @@ class SearchController(BaseRepoControlle @@
                 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. '

0 comments (0 inline, 0 general)