Merge commit '9bea91a' into merge_small_prs

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

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
index 69527580c18f59e5232bab1553001b3124cdf6ee..2b402666c6429f70d816788d34cf058f907f8006 100644 (file)
--- a/forum_modules/pgfulltext/handlers.py
+++ b/forum_modules/pgfulltext/handlers.py
@@ -1,17 +1,18 @@
 import re
 import re

+from django.db import connection, transaction

 from django.db.models import Q
 from forum.models.question import Question, QuestionManager
 from django.db.models import Q
 from forum.models.question import Question, QuestionManager

+from forum.models.node import Node

 from forum.modules import decorate
 
 from forum.modules import decorate
 

-repl_re = re.compile(r"^'|[^\'\-_\s\w]|'$", re.UNICODE)
-sing_quote_re = re.compile(r"\'+")
+word_re = re.compile(r'\w+', re.UNICODE)

 
 @decorate(QuestionManager.search, needs_origin=False)
 def question_search(self, keywords):
 
 @decorate(QuestionManager.search, needs_origin=False)
 def question_search(self, keywords):

-    tsquery = " | ".join([k for k in repl_re.sub('', sing_quote_re.sub("'", keywords.strip())).split(' ') if k])
+    tsquery = " | ".join(word_re.findall(keywords))

     ilike = keywords + u"%%"
 
     ilike = keywords + u"%%"
 

-    return self.extra(
+    return '-ranking', self.extra(

             tables = ['forum_rootnode_doc'],
             select={
             'ranking': """
             tables = ['forum_rootnode_doc'],
             select={
             'ranking': """


@@ -24,6 +25,14 @@ def question_search(self, keywords):
                            """],
             params=[tsquery, ilike],
             select_params=[tsquery],
                            """],
             params=[tsquery, ilike],
             select_params=[tsquery],

-            order_by=['-ranking']

             )
 
             )
 

+
+@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)
+
+