# HG changeset patch
# User verrierj
# Date 1318337200 -7200
# Node ID 202107fff250747e0e78d6b4247c271bee6c2608
# Parent  6dfdc12e338aadae927e5aa7f2ac5b30dda0175c
Fixed minor bugs

diff -r 6dfdc12e338a -r 202107fff250 src/ldt/ldt/indexation/__init__.py
--- a/src/ldt/ldt/indexation/__init__.py	Mon Oct 10 15:31:56 2011 +0200
+++ b/src/ldt/ldt/indexation/__init__.py	Tue Oct 11 14:46:40 2011 +0200
@@ -49,19 +49,25 @@
     query = get_query_parser(field).parse(query)
     highlighter = lucene.Highlighter(formatter, lucene.QueryScorer (query))
     
+    import logging
+    
     for project in doc_list:
         for segment in project['list']:
             lucene_doc = searcher.doc(segment['lucene_id'])
             segment['context'] = get_highlighted_text(lucene_doc, analyzer, highlighter, 'abstract')
-            segment['tags'] = get_highlighted_text(lucene_doc, analyzer, highlighter, 'tags')
+            tags = get_highlighted_text(lucene_doc, analyzer, highlighter, 'tags')
             segment['title'] = get_highlighted_text(lucene_doc, analyzer, highlighter, 'title')
             
             if segment['context'] == u'':
                 segment['context'] = lucene_doc.getField('abstract').stringValue()
-            if segment['tags'] == u'':
-                segment['tags'] = lucene_doc.getField('tags').stringValue()
+            if tags == u'':
+                tags = lucene_doc.getField('tags').stringValue()
             if segment['title'] == u'':
                 segment['title'] = lucene_doc.getField('title').stringValue() 
+                
+            segment['tags'] = tags[tags.find(';')+1:]
+                
+            
             
     return doc_list    
 
diff -r 6dfdc12e338a -r 202107fff250 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/init_ldt.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/init_ldt.html	Mon Oct 10 15:31:56 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/init_ldt.html	Tue Oct 11 14:46:40 2011 +0200
@@ -7,7 +7,7 @@
 <meta http-equiv="Expires" content="-1" />
 <title>Ligne de Temps - IRI</title>
 <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jquery.min.js"></script>
-<script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}/js/jquery.nyroModal.min.js"></script-->
+<script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jquery.nyroModal.min.js"></script>
 <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/projectscontents.js"></script>
 <script type="text/javascript">
 
diff -r 6dfdc12e338a -r 202107fff250 src/ldt/ldt/ldt_utils/views.py
--- a/src/ldt/ldt/ldt_utils/views.py	Mon Oct 10 15:31:56 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/views.py	Tue Oct 11 14:46:40 2011 +0200
@@ -283,10 +283,9 @@
             return render_to_response('ldt/ldt_utils/search_results.html', {'results': results, 'nb_results' : paginator.count, 'search' : search, 'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'colorurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/color.xml', 'i18nurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/i18n', 'language': language_code, 'baseurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/'}, context_instance=RequestContext(request))   
         
     else:
-        msg = _("Please enter valid keywords.")
-        return render_to_response('ldt/ldt_utils/search_results.html', {'msg' : msg}, context_instance=RequestContext(request))
-
-
+        return HttpResponseRedirect(reverse('ldt.ldt_utils.views.published_project'))
+        
+        
 def display_highlighted_seg(request, project_id, content_id, ensemble_id, cutting_id, segment_id, full=False):
     
     url = settings.WEB_URL + reverse("ldt.ldt_utils.views.init_segment", args=[project_id, content_id, ensemble_id, cutting_id, segment_id])
@@ -846,7 +845,6 @@
                     res[0].set("abstract", project.description)
                     project.ldt = lxml.etree.tostring(ldt, pretty_print=True)
                     project.save()
-                    update = 'yes'
     else:
         form = AddProjectForm({'title':unicode(project.title), 'description':unicode(project.get_description())})
         form_status = 'none'
diff -r 6dfdc12e338a -r 202107fff250 src/ldt/ldt/test/client.py
--- a/src/ldt/ldt/test/client.py	Mon Oct 10 15:31:56 2011 +0200
+++ b/src/ldt/ldt/test/client.py	Tue Oct 11 14:46:40 2011 +0200
@@ -7,7 +7,7 @@
 from django.utils.encoding import smart_str
 from django.utils.http import urlencode
 from ldt.utils import Property
-from oauth2 import Request, Consumer, Token, SignatureMethod_HMAC_SHA1
+from oauth2 import Request, Consumer, Token, SignatureMethod_HMAC_SHA1#@UnresolvedImport
 from urlparse import urlsplit, urlunsplit, urlparse, urlunparse, parse_qs
 import httplib2
 try: