# HG changeset patch
# User verrierj
# Date 1329470624 -3600
# Node ID 0f892a78b75c9cb67f142d9760553ae9a1541acc
# Parent  361ecea621e05798748e111b1157228cb6bb5c6c# Parent  fe5289a8d8290a85e20f8623ecd2b620baf77866
Merge with fe5289a8d8290a85e20f8623ecd2b620baf77866

diff -r 361ecea621e0 -r 0f892a78b75c .hgtags
--- a/.hgtags	Wed Feb 15 14:52:39 2012 +0100
+++ b/.hgtags	Fri Feb 17 10:23:44 2012 +0100
@@ -32,3 +32,4 @@
 1c589f1393c800ab5c5c4ea84a085980d55512fe V01.00
 0696566c7dc4a17db9b1e7ee549f18d304f2d76b V01.00
 ea8c12f58302dc6c443b89a6949c4b21997aecb9 V01.01
+b67fc0fd2389d58e93ffd4e7d66ab58a17e8ebf7 V01.02
diff -r 361ecea621e0 -r 0f892a78b75c src/ldt/ldt/__init__.py
--- a/src/ldt/ldt/__init__.py	Wed Feb 15 14:52:39 2012 +0100
+++ b/src/ldt/ldt/__init__.py	Fri Feb 17 10:23:44 2012 +0100
@@ -1,4 +1,4 @@
-VERSION = (1, 1, 0, "final", 0)
+VERSION = (1, 2, 0, "final", 0)
 
 
 def get_version():
diff -r 361ecea621e0 -r 0f892a78b75c src/ldt/ldt/indexation/__init__.py
--- a/src/ldt/ldt/indexation/__init__.py	Wed Feb 15 14:52:39 2012 +0100
+++ b/src/ldt/ldt/indexation/__init__.py	Fri Feb 17 10:23:44 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 361ecea621e0 -r 0f892a78b75c web/ldtplatform/__init__.py
--- a/web/ldtplatform/__init__.py	Wed Feb 15 14:52:39 2012 +0100
+++ b/web/ldtplatform/__init__.py	Fri Feb 17 10:23:44 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])))