kallithea Changeset - 4c239e0dcbb7

Changeset - 4c239e0dcbb7

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-05-20 16:38:00
marcin@python-works.com

fixes issue #454 Search results under Windows include preceeding backslash

2 files changed with 12 insertions and 8 deletions:

rhodecode/controllers/search.py

rhodecode/lib/indexers/__init__.py

0 comments (0 inline, 0 general)

rhodecode/controllers/search.py

➞

Show inline comments

@@ @@ -27,20 +27,21 @@ import traceback @@
 from pylons.i18n.translation import _
 from pylons import request, config, 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 rhodecode.lib.indexers import SCHEMA, IDX_NAME, WhooshResultWrapper
 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, Wildcard, Term, Prefix
 from rhodecode.model.repo import RepoModel
 log = logging.getLogger(__name__)
 class SearchController(BaseController):
@@ @@ -96,16 +97,16 @@ class SearchController(BaseController): @@
                         res_ln, results.runtime
+                    )
                     def url_generator(**kw):
                         return update_params("?q=%s&type=%s" \
                                            % (c.cur_query, c.cur_search), **kw)
+                    repo_location = RepoModel().repos_path
                     c.formated_results = Page(
                         ResultWrapper(search_type, searcher, matcher,
                                       highlight_items),
                         WhooshResultWrapper(search_type, searcher, matcher,
                                             highlight_items, repo_location),
                         page=p,
                         item_count=res_ln,
                         items_per_page=10,
                         url=url_generator
+                    )

rhodecode/lib/indexers/__init__.py

➞

Show inline comments

@@ @@ -126,19 +126,21 @@ class MakeIndex(BasePasterCommand): @@
                           dest='full_index',
                           help="Specifies that index should be made full i.e"
                                 " destroy old and build from scratch",
                           default=False)
 class ResultWrapper(object):
     def __init__(self, search_type, searcher, matcher, highlight_items):
 class WhooshResultWrapper(object):
     def __init__(self, search_type, searcher, matcher, highlight_items,
                  repo_location):
         self.search_type = search_type
         self.searcher = searcher
         self.matcher = matcher
         self.highlight_items = highlight_items
         self.fragment_size = 200
         self.repo_location = repo_location
     @LazyProperty
     def doc_ids(self):
         docs_id = []
         while self.matcher.is_active():
             docnum = self.matcher.id()
@@ @@ -175,14 +177,15 @@ class ResultWrapper(object): @@
         for docid in self.doc_ids[i:j]:
             slices.append(self.get_full_content(docid))
         return slices
     def get_full_content(self, docid):
         res = self.searcher.stored_fields(docid[0])
         f_path = res['path'][res['path'].find(res['repository']) \
                              + len(res['repository']):].lstrip('/')
         full_repo_path = jn(self.repo_location, res['repository'])
         f_path = res['path'].split(full_repo_path)[-1]
         f_path = f_path.lstrip(os.sep)
         content_short = self.get_short_content(res, docid[1])
         res.update({'content_short': content_short,
                     'content_short_hl': self.highlight(content_short),
                     'f_path': f_path})

0 comments (0 inline, 0 general)