diff options
| author | Aamir Khan <syst3m.w0rm@gmail.com> | 2012-04-05 23:28:19 +0530 |
|---|---|---|
| committer | Aamir Khan <syst3m.w0rm@gmail.com> | 2012-04-05 23:28:19 +0530 |
| commit | abfc1074741bbf65f3448c35c81d41889b72ae9c (patch) | |
| tree | 6c9cad7b1a3b4468eef976a764c14613a97f780b | |
| parent | c63d0f755feb49b79506777228ffc88a7c934f23 (diff) | |
| download | hyperkitty-abfc1074741bbf65f3448c35c81d41889b72ae9c.tar.gz hyperkitty-abfc1074741bbf65f3448c35c81d41889b72ae9c.tar.xz hyperkitty-abfc1074741bbf65f3448c35c81d41889b72ae9c.zip | |
urls.py fix - page can be more than a digit
| -rw-r--r-- | urls.py | 4 | ||||
| -rw-r--r-- | views/pages.py | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -32,8 +32,8 @@ urlpatterns = patterns('', # Search #url(r'^search$', 'views.pages.search'), # If page number is present in URL - url(r'^search/(?P<mlist_fqdn>.*@.*)\/(?P<target>.*)\/(?P<keyword>.*)\/(?P<page>\d)$', 'views.pages.search_keyword'), - url(r'^search/(?P<mlist_fqdn>.*@.*)\/(?P<target>.*)\/(?P<keyword>.*)\/(?P<page>\d)/$', 'views.pages.search_keyword'), + url(r'^search/(?P<mlist_fqdn>.*@.*)\/(?P<target>.*)\/(?P<keyword>.*)\/(?P<page>\d+)$', 'views.pages.search_keyword'), + url(r'^search/(?P<mlist_fqdn>.*@.*)\/(?P<target>.*)\/(?P<keyword>.*)\/(?P<page>\d+)/$', 'views.pages.search_keyword'), # Show the first page as default when no page number is present in URL url(r'^search/(?P<mlist_fqdn>.*@.*)\/(?P<target>.*)\/(?P<keyword>.*)$', 'views.pages.search_keyword'), url(r'^search/(?P<mlist_fqdn>.*@.*)\/(?P<target>.*)\/(?P<keyword>.*)/$', 'views.pages.search_keyword'), diff --git a/views/pages.py b/views/pages.py index 505ed36..7545a3a 100644 --- a/views/pages.py +++ b/views/pages.py @@ -203,7 +203,6 @@ def message (request, mlist_fqdn, messageid): def _search_results_page(request, mlist_fqdn, query_string, search_type, page=1, num_threads=25): search_form = SearchForm(auto_id=False) t = loader.get_template('search.html') - list_name = mlist_fqdn.split('@')[0] threads = mongo.search_archives(list_name, query_string) res_num = len(threads) @@ -254,13 +253,14 @@ def search(request, mlist_fqdn): target = request.GET.get('target') print request, target if keyword: - url = '/search/%s/%s/%s' % (mlist_fqdn, target, keyword) + url = '/search/%s/%s/%s/' % (mlist_fqdn, target, keyword) else: url = '/search/%s' % (mlist_fqdn) return HttpResponseRedirect(url) def search_keyword(request, mlist_fqdn, target=None, keyword=None, page=1): + print target, keyword, page if not keyword: keyword = request.GET.get('keyword') if not target: |