improved text search

[osqa.git] / forum_modules / pgfulltext / handlers.py

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
old mode 100755 (executable)
new mode 100644 (file)
index 17fb176..4cac36f
--- a/forum_modules/pgfulltext/handlers.py
+++ b/forum_modules/pgfulltext/handlers.py
@@ -1,11 +1,11 @@
-from forum.models import Question\r
-\r
-def question_search(keywords, orderby):\r
-    return Question.objects.filter(deleted=False).extra(\r
-                    select={\r
-                        'ranking': "ts_rank_cd(tsv, plainto_tsquery(%s), 32)",\r
-                    },\r
-                    where=["tsv @@ plainto_tsquery(%s)"],\r
-                    params=[keywords],\r
-                    select_params=[keywords]\r
-                ).order_by(orderby, '-ranking')
\ No newline at end of file
+from forum.models import Question
+
+def question_search(keywords):
+    return Question.objects.extra(
+                    select={
+                        'ranking': "node_ranking(id, %s)",
+                    },
+                    where=["node_ranking(id, %s) > 0"],
+                    params=[keywords],
+                    select_params=[keywords]
+                ).order_by('-ranking')
\ No newline at end of file