search: Use PostgreSQL's websearch_to_tsquery()

[ipfire.org.git] / src / backend / blog.py

diff --git a/src/backend/blog.py b/src/backend/blog.py
index 6d2e0ac35d763c84b78763e2c73eb362efb8f605..b92b02767e3a392c67ee22de36fb9ed9b846d564 100644 (file)
--- a/src/backend/blog.py
+++ b/src/backend/blog.py
@@ -11,7 +11,6 @@ import textile
 import unicodedata
 
 from . import misc
-from . import util
 from .decorators import *
 
 class Blog(misc.Object):
@@ -80,12 +79,10 @@ class Blog(misc.Object):
                        ORDER BY COALESCE(updated_at, created_at) DESC LIMIT %s", limit)
 
        def search(self, query, limit=None):
-               query = util.parse_search_query(query)
-
                return self._get_posts("SELECT blog.* FROM blog \
                        LEFT JOIN blog_search_index search_index ON blog.id = search_index.post_id \
-                       WHERE search_index.document @@ to_tsquery('english', %s) \
-                               ORDER BY ts_rank(search_index.document, to_tsquery('english', %s)) DESC \
+                       WHERE search_index.document @@ websearch_to_tsquery('english', %s) \
+                               ORDER BY ts_rank(search_index.document, websearch_to_tsquery('english', %s)) DESC \
                        LIMIT %s", query, query, limit)
 
        def has_had_recent_activity(self, **kwargs):