From 9921f8b795618bc017220c6ddd0a300b8e86a22a Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Sat, 18 May 2013 16:13:51 -0400 Subject: fixed bug in the main page pagination --- askbot/search/state_manager.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/askbot/search/state_manager.py b/askbot/search/state_manager.py index efefbc40..5c4e0776 100644 --- a/askbot/search/state_manager.py +++ b/askbot/search/state_manager.py @@ -184,14 +184,25 @@ class SearchState(object): 'sort:' + self.sort ] - if self.query: - lst.append('query:' + urllib.quote(smart_str(self.query), safe=self.SAFE_CHARS)) + """ + ATTN: a copy from urls.py + r'(%s)?' % r'/scope:(?P\w+)' + + r'(%s)?' % r'/sort:(?P[\w\-]+)' + + r'(%s)?' % r'/tags:(?P[\w+.#,-]+)' + # Should match: const.TAG_CHARS + ','; TODO: Is `#` char decoded by the time URLs are processed ?? + r'(%s)?' % r'/author:(?P\d+)' + + r'(%s)?' % r'/page:(?P\d+)' + + r'(%s)?' % r'/query:(?P.+)' + # INFO: query is last, b/c it can contain slash!!! + """ + + #order of items is important!!! if self.tags: lst.append('tags:' + urllib.quote(smart_str(const.TAG_SEP.join(self.tags)), safe=self.SAFE_CHARS)) if self.author: lst.append('author:' + str(self.author)) if self.page: lst.append('page:' + str(self.page)) + if self.query: + lst.append('query:' + urllib.quote(smart_str(self.query), safe=self.SAFE_CHARS)) return '/'.join(lst) + '/' def deepcopy(self): # TODO: test me -- cgit v1.2.3-1-g7c22