From 9f2913c2565411c1bb8de79a9e7d17e441c9b409 Mon Sep 17 00:00:00 2001 From: hernani Date: Thu, 3 Jun 2010 18:01:39 +0000 Subject: [PATCH] Fixes some problems with urlquoting on seraches. git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@363 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- forum/views/readers.py | 4 ++-- forum_modules/pgfulltext/handlers.py | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/forum/views/readers.py b/forum/views/readers.py index f756a94..6e75b37 100644 --- a/forum/views/readers.py +++ b/forum/views/readers.py @@ -120,9 +120,9 @@ def search(request): if not keywords: return HttpResponseRedirect(reverse(index)) if search_type == 'tag': - return HttpResponseRedirect(reverse('tags') + '?q=%s' % (keywords.strip())) + return HttpResponseRedirect(reverse('tags') + '?q=%s' % urlquote(keywords.strip())) elif search_type == "user": - return HttpResponseRedirect(reverse('users') + '?q=%s' % (keywords.strip())) + return HttpResponseRedirect(reverse('users') + '?q=%s' % urlquote(keywords.strip())) elif search_type == "question": return question_search(request, keywords) else: diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py index f6decaf..196790b 100644 --- a/forum_modules/pgfulltext/handlers.py +++ b/forum_modules/pgfulltext/handlers.py @@ -5,8 +5,9 @@ from forum.modules.decorators import decorate @decorate(QuestionManager.search, needs_origin=False) def question_search(self, keywords): - repl_re = re.compile(r"[^\'\-_\s\w]") + repl_re = re.compile(r"[^\'\-_\s\w]", re.UNICODE) tsquery = " | ".join([k for k in repl_re.sub('', keywords).split(' ') if k]) + ilike = keywords + u"%%" return self.extra( tables = ['forum_rootnode_doc'], @@ -17,9 +18,9 @@ def question_search(self, keywords): }, 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], + params=[tsquery, ilike], select_params=[tsquery], order_by=['-ranking'] ) -- 2.45.2