--- a/src/ldt/ldt/indexation/__init__.py	Wed Jan 25 15:47:19 2012 +0100
+++ b/src/ldt/ldt/indexation/__init__.py	Wed Jan 25 17:57:01 2012 +0100
@@ -46,30 +46,30 @@
     
     return hits.scoreDocs
 
-def highlight_documents(doc_list, query, field):
+def highlight_documents(results_list, query, field):
     searcher = get_searcher()
     analyzer = lucene.FrenchAnalyzer(lucene.Version.LUCENE_CURRENT)
     formatter = lucene.SimpleHTMLFormatter('<span class="highlight">', '</span>')
     query = get_query_parser(field).parse(query)
     highlighter = lucene.Highlighter(formatter, lucene.QueryScorer (query))
     
-    for project in doc_list:
+    for project in results_list:
         for segment in project['list']:
-            lucene_doc = searcher.doc(segment['lucene_id'])
-            segment['context'] = get_highlighted_text(lucene_doc, analyzer, highlighter, 'abstract')
+            lucene_doc = searcher.doc(segment.lucene_id)
+            segment.context = get_highlighted_text(lucene_doc, analyzer, highlighter, 'abstract')
             tags = get_highlighted_text(lucene_doc, analyzer, highlighter, 'tags')
-            segment['title'] = get_highlighted_text(lucene_doc, analyzer, highlighter, 'title')
+            segment.title = get_highlighted_text(lucene_doc, analyzer, highlighter, 'title')
             
-            if segment['context'] == u'':
-                segment['context'] = lucene_doc.getField('abstract').stringValue()
+            if segment.context == u'':
+                segment.context = lucene_doc.getField('abstract').stringValue()
             if tags == u'':
                 tags = lucene_doc.getField('tags').stringValue()
-            if segment['title'] == u'':
-                segment['title'] = lucene_doc.getField('title').stringValue() 
+            if segment.title == u'':
+                segment.title = lucene_doc.getField('title').stringValue() 
                 
-            segment['tags'] = tags[tags.find(';')+1:]          
+            segment.context_tags = tags[tags.find(';')+1:]          
             
-    return doc_list    
+    return results_list    
 
 def get_highlighted_text(doc, analyzer, highlighter, field):
     res = doc.getField(field).stringValue()