# HG changeset patch
# User cavaliet
# Date 1329152668 -3600
# Node ID 715f117b0415716e856b97a073edce42a38997b4
# Parent  ef63e64297f9d8235b4ba28679c30573a8cdf231
correct search function. change two default tags in embed player.

diff -r ef63e64297f9 -r 715f117b0415 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html	Mon Feb 13 16:17:25 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html	Mon Feb 13 18:04:28 2012 +0100
@@ -17,6 +17,7 @@
   
   IriSP.widgetsDefaults["AnnotationsListWidget"] = {};
   IriSP.widgetsDefaults["AnnotationsListWidget"].platform_url = "{{WEB_URL}}{% url segment_api iri_id='{content}' begin='{begin}' end='{end}' %}";
+  IriSP.widgetsDefaults["createAnnotationWidget"].keywords = ["#amateur", "#digital-humanities"];
   
   IriSP.platform_url = "{{WEB_URL}}{{BASE_URL}}";
   IriSP.user = {name: '{{request.user.username}}',
diff -r ef63e64297f9 -r 715f117b0415 src/ldt/ldt/ldt_utils/views/front.py
--- a/src/ldt/ldt/ldt_utils/views/front.py	Mon Feb 13 16:17:25 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/front.py	Mon Feb 13 18:04:28 2012 +0100
@@ -127,20 +127,16 @@
     page = int(request.GET.get('page', '-1'))        
     search = request.GET.get('search', '')
     field = request.GET.get('field', 'all')
-    
+
     if page >= 0 and search != '':
         results, nb = get_search_results(request, search, field, page)
-        
         return render_to_response('front/front_search_results.html', {'results': results, 'nb_results' : nb, 'search' : search, 'field': field, '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))   
-    
+
     sform = SearchForm(request.POST)
     if sform.is_valid():
         search = sform.cleaned_data["search"]
-        queryStr = base64.urlsafe_b64encode(search.encode('utf8'))
         field = request.POST["field"]
-                                                   
         results, nb = get_search_results(request, search, field, 1)            
-            
         return render_to_response('front/front_search_results.html', {'results': results, 'nb_results' : nb, 'search' : search, 'field': field, '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))
     return HttpResponseRedirect('ldt.ldt_utils.views.front.home')
     
diff -r ef63e64297f9 -r 715f117b0415 src/ldt/ldt/ldt_utils/views/workspace.py
--- a/src/ldt/ldt/ldt_utils/views/workspace.py	Mon Feb 13 16:17:25 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/workspace.py	Mon Feb 13 18:04:28 2012 +0100
@@ -179,8 +179,6 @@
         
     else:
         return HttpResponseRedirect(reverse('ldt.ldt_utils.views.workspace.published_project'))
-
-        
 def get_search_results(request, search, field, page):
     results = get_results_with_context(field, search) 
             
@@ -197,34 +195,34 @@
         if content.description is None:
             content.description = ''
                     
-            all_related_segments = list(item)
+        all_related_segments = list(item)
+                
+        valid_segments = []
+        for s in all_related_segments:
+            segment = [seg for seg in all_segments if seg.element_id == s['element_id'] and seg.project_id == s['project_id'] and seg.iri_id == s['iri_id'] and seg.cutting_id == s['decoupage_id'] and seg.ensemble_id == s['ensemble_id'] ][0]
                 
-            valid_segments = []
-            for s in all_related_segments:
-                segment = [seg for seg in all_segments if seg.element_id == s['element_id'] and seg.project_id == s['project_id'] and seg.iri_id == s['iri_id'] and seg.cutting_id == s['decoupage_id'] and seg.ensemble_id == s['ensemble_id'] ][0]
-                    
-                segment.score = s['score']
-                segment.lucene_id = s['lucene_id']
-                segment.context = s['context']
-                segment.context_tags = s['tags']
-                                        
-                if not s['project_id']:
-                    segment.project_id = '_'
-                    valid_segments.append(segment)
-                elif s['project_id'] in viewable_projects_id:
-                    valid_segments.append(segment)
-                
-            # If all segments found belong to unpublished projects or projects
-            # the current user is not allowed to see
-            if not valid_segments:
-                continue
-                
-            score = sum([seg.score for seg in valid_segments])
-            complete_results.append({
-                                     'list': valid_segments,
-                                     'score': score,
-                                     'content': content,                                         
-                                     })                
+            segment.score = s['score']
+            segment.lucene_id = s['lucene_id']
+            segment.context = s['context']
+            segment.context_tags = s['tags']
+                                    
+            if not s['project_id']:
+                segment.project_id = '_'
+                valid_segments.append(segment)
+            elif s['project_id'] in viewable_projects_id:
+                valid_segments.append(segment)
+            
+        # If all segments found belong to unpublished projects or projects
+        # the current user is not allowed to see
+        if not valid_segments:
+            continue
+            
+        score = sum([seg.score for seg in valid_segments])
+        complete_results.append({
+                                 'list': valid_segments,
+                                 'score': score,
+                                 'content': content,                                         
+                                 })                
       
     complete_results.sort(key=lambda k: k['score'])