Implement searchin in context/source/translation

ftsearch/models.py

@@ -7,7 +7,7 @@ from trans.models import Unit
 
 class Word(models.Model):
     word = models.CharField(max_length=255, db_index=True)
-    origin = models.ForeignKey(Language, null = True, blank = True)
+    language = models.ForeignKey(Language, null = True, blank = True)
 
     def __unicode__(self):
         return "%s: %s" % (self.language.name, self.word)

trans/managers.py

@@ -163,14 +163,14 @@ class UnitManager(models.Manager):
         self.__index_item('\n'.join(unit.get_source_plurals()), Language.objects.get(code = 'en'), unit)
         # Index translation
         self.__index_item('\n'.join(unit.get_target_plurals()), unit.translation.language, unit)
+        # Index context
+        if unit.context != '':
+            self.__index_item(unit.context, None, unit)
 
-    def __get_match_rows(self, query, language = None):
+    def __get_match_rows(self, query, language):
         from ftsearch.models import Word
         # Grab relevant words
-        if language is None:
-            word_objects = Word.objects.filter(word__in = query)
-        else:
-            word_objects = Word.objects.filter(word__in = query, language = language)
+        word_objects = Word.objects.filter(word__in = query, language = language)
 
         field_list = 'w0.unit_id'
         table_list = ''
@@ -202,7 +202,7 @@ class UnitManager(models.Manager):
 
         return [row for row in rows]
 
-    def search(self, query):
+    def search(self, query, language):
         from trans.models import Unit
         if isinstance(query, str) or isinstance(query, unicode):
             # split the string into a list of search terms
@@ -215,7 +215,7 @@ class UnitManager(models.Manager):
         stemmed_query = [p.stem(s.lower()) for s in query if s != '']
 
         # get a row from the db for each matching word
-        rows = self.__get_match_rows(stemmed_query)
+        rows = self.__get_match_rows(stemmed_query, language)
 
         # apply the weights to each row
         weights = [(w, weight_fn(rows)) for w, weight_fn in settings.SEARCH_WEIGHTS]

trans/views.py

@@ -301,13 +301,13 @@ def translate(request, project, subproject, lang):
                     query |= Q(context = search_query)
                 units = units.filter(query)
             else:
-                units = obj.unit_set.search(search_query)
-#                if search_source:
-#                    query |= Q(source__icontains = search_query)
-#                if search_target:
-#                    query |= Q(target__icontains = search_query)
-#                if search_context:
-#                    query |= Q(context__icontains = search_query)
+                units = obj.unit_set.none()
+                if search_source:
+                    units |= obj.unit_set.search(search_query, Language.objects.get(code = 'en'))
+                if search_target:
+                    units |= obj.unit_set.search(search_query, unit.translation.language)
+                if search_context:
+                    units |= obj.unit_set.search(search_query, None)
             if direction == 'stay':
                 units = units.filter(position = pos)
             elif direction == 'back':