X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/36d8ccc491b157c00e38a8f3192d47b7ead19964..886fb5136dfb9ff258b8948c981a68bbf3550208:/forum_modules/pgfulltext/handlers.py

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
index f6decaf..780bfa9 100644
--- a/forum_modules/pgfulltext/handlers.py
+++ b/forum_modules/pgfulltext/handlers.py
@@ -1,26 +1,38 @@
 import re
+from django.db import connection, transaction
 from django.db.models import Q
 from forum.models.question import Question, QuestionManager
-from forum.modules.decorators import decorate
+from forum.models.node import Node
+from forum.modules import decorate
+
+word_re = re.compile(r'\w+', re.UNICODE)
 
 @decorate(QuestionManager.search, needs_origin=False)
 def question_search(self, keywords):
-    repl_re = re.compile(r"[^\'\-_\s\w]")
-    tsquery = " | ".join([k for k in repl_re.sub('', keywords).split(' ') if k])
+    tsquery = " | ".join(word_re.findall(keywords))
+    ilike = keywords + u"%%"
 
-    return self.extra(
-                    tables = ['forum_rootnode_doc'],
-                    select={
-                        'ranking': """
+    return True, self.extra(
+            tables = ['forum_rootnode_doc'],
+            select={
+            'ranking': """
                                 rank_exact_matches(ts_rank_cd('{0.1, 0.2, 0.8, 1.0}'::float4[], "forum_rootnode_doc"."document", to_tsquery('english', %s), 32))
                                 """,
-                    },
-                    where=["""
+            },
+            where=["""
                            "forum_rootnode_doc"."node_id" = "forum_node"."id" AND ("forum_rootnode_doc"."document" @@ to_tsquery('english', %s) OR
-                           "forum_node"."title" ILIKE '""" + keywords.replace("'",r"\'") + """%%')
+                           "forum_node"."title" ILIKE %s)
                            """],
-                    params=[tsquery],
-                    select_params=[tsquery],
-                    order_by=['-ranking']
-                )
+            params=[tsquery, ilike],
+            select_params=[tsquery],
+            )
+
+
+@decorate(Node.delete)
+def delete(origin, self, *args, **kwargs):
+    cursor = connection.cursor()
+    cursor.execute("DELETE FROM forum_rootnode_doc WHERE node_id = %s" % (self.id))
+    transaction.commit_unless_managed()
+    return origin(self, *args, **kwargs)
+