# HG changeset patch # User ymh # Date 1329166404 -3600 # Node ID b67fc0fd2389d58e93ffd4e7d66ab58a17e8ebf7 # Parent 715f117b0415716e856b97a073edce42a38997b4 small correction on indexation + version bum diff -r 715f117b0415 -r b67fc0fd2389 src/ldt/ldt/__init__.py --- a/src/ldt/ldt/__init__.py Mon Feb 13 18:04:28 2012 +0100 +++ b/src/ldt/ldt/__init__.py Mon Feb 13 21:53:24 2012 +0100 @@ -1,4 +1,4 @@ -VERSION = (1, 1, 0, "final", 0) +VERSION = (1, 2, 0, "final", 0) def get_version(): diff -r 715f117b0415 -r b67fc0fd2389 src/ldt/ldt/indexation/__init__.py --- a/src/ldt/ldt/indexation/__init__.py Mon Feb 13 18:04:28 2012 +0100 +++ b/src/ldt/ldt/indexation/__init__.py Mon Feb 13 21:53:24 2012 +0100 @@ -11,8 +11,9 @@ ANALYZER.addAnalyzer("all", lucene.FrenchAnalyzer(lucene.Version.LUCENE_CURRENT)) def get_results_with_context(field, query): - res = get_results_list(field, query) + searcher = get_searcher() + res = get_results_list(field, query, searcher) query = get_query_parser(field).parse(query) contexts = [] @@ -38,8 +39,9 @@ searcher.close() return contexts -def get_results_list(field, query): - indexSearcher = get_searcher() +def get_results_list(field, query, indexSearcher=None): + if indexSearcher is None: + indexSearcher = get_searcher() queryParser = get_query_parser(field) queryObj = queryParser.parse(query) hits = indexSearcher.search(queryObj, settings.LDT_MAX_SEARCH_NUMBER) diff -r 715f117b0415 -r b67fc0fd2389 web/ldtplatform/__init__.py --- a/web/ldtplatform/__init__.py Mon Feb 13 18:04:28 2012 +0100 +++ b/web/ldtplatform/__init__.py Mon Feb 13 21:53:24 2012 +0100 @@ -1,4 +1,4 @@ -VERSION = (1, 1, 0, "final", 0) +VERSION = (1, 2, 0, "final", 0) VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))