From 9462600628677b842c7e69d47a07f0b4581a897f Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Thu, 5 Apr 2012 20:52:53 +0200
Subject: The order of the regex matters, urls with a trailing slash should be
 before the one without

---
 urls.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'urls.py')

diff --git a/urls.py b/urls.py
index 4c9bdf2..057bc73 100644
--- a/urls.py
+++ b/urls.py
@@ -32,13 +32,14 @@ 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'),
     # 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'),
-    url(r'^search/(?P<mlist_fqdn>.*@.*)$', 'views.pages.search'),
+    url(r'^search/(?P<mlist_fqdn>.*@.*)\/(?P<target>.*)\/(?P<keyword>.*)$', 'views.pages.search_keyword'),
+    
     url(r'^search/(?P<mlist_fqdn>.*@.*)/$', 'views.pages.search'),
+    url(r'^search/(?P<mlist_fqdn>.*@.*)$', 'views.pages.search'),
     url(r'^tag/(?P<mlist_fqdn>.*@.*)\/(?P<tag>.*)$', 'views.pages.search_tag'),
     # mockups:
     url(r'^mockup/$', 'views.mockup.index'),
-- 
cgit