X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/743349c4413cfceb6f52a12e0a0790d9db346c98..e9f8a9269b64a5af7c95d6c2714b1ae97e68d6a1:/apps/catalogue/urls.py?ds=sidebyside

diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py
index c40c4ec29..98990d0bf 100644
--- a/apps/catalogue/urls.py
+++ b/apps/catalogue/urls.py
@@ -3,6 +3,7 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.conf.urls.defaults import *
+from django.views.generic import RedirectView
 from catalogue.feeds import AudiobookFeed
 from catalogue.views import CustomPDFFormView
 
@@ -10,11 +11,18 @@ from catalogue.views import CustomPDFFormView
 SLUG = r'[a-z0-9-]*'
 
 urlpatterns = patterns('picture.views',
-                       # pictures - currently pictures are coupled with catalogue, hence the url is here
-        url(r'^obraz/?$', 'picture_list'),
-        url(r'^obraz/(?P<picture>%s)/?$' % SLUG, 'picture_detail')
-        ) + \
-    patterns('catalogue.views',
+    # pictures - currently pictures are coupled with catalogue, hence the url is here
+    url(r'^obraz/?$', 'picture_list'),
+    url(r'^obraz/(?P<picture>%s)/?$' % SLUG, 'picture_detail')
+)
+
+urlpatterns += patterns('',
+    # old search page - redirected
+    url(r'^szukaj/$', RedirectView.as_view(
+            url='/szukaj/', query_string=True)),
+)
+
+urlpatterns += patterns('catalogue.views',
     url(r'^$', 'catalogue', name='catalogue'),
 
     url(r'^lektury/$', 'book_list', name='book_list'),
@@ -23,7 +31,11 @@ urlpatterns = patterns('picture.views',
     url(r'^daisy/$', 'daisy_list', name='daisy_list'),
     url(r'^tags/$', 'tags_starting_with', name='hint'),
     url(r'^jtags/$', 'json_tags_starting_with', name='jhint'),
-    #url(r'^szukaj/$', 'search', name='old_search'),
+
+    url(r'^custompdf/(?P<slug>%s)/$' % SLUG, CustomPDFFormView(), name='custom_pdf_form'),
+
+    url(r'^audiobooki/(?P<type>mp3|ogg|daisy|all).xml$', AudiobookFeed(), name='audiobook_feed'),
+
 
     # zip
     url(r'^zip/pdf\.zip$', 'download_zip', {'format': 'pdf', 'slug': None}, 'download_zip_pdf'),
@@ -39,17 +51,6 @@ urlpatterns = patterns('picture.views',
     url(r'^lektura/(?P<slug>%s)/motyw/(?P<theme_slug>[a-zA-Z0-9-]+)/$' % SLUG,
         'book_fragments', name='book_fragments'),
 
+    # This should be the last pattern.
     url(r'^(?P<tags>[a-zA-Z0-9-/]*)/$', 'tagged_object_list', name='tagged_object_list'),
-
-    url(r'^audiobooki/(?P<type>mp3|ogg|daisy|all).xml$', AudiobookFeed(), name='audiobook_feed'),
-
-    url(r'^custompdf$', CustomPDFFormView(), name='custom_pdf_form'),
-    url(r'^custompdf/(?P<slug>%s).pdf' % SLUG, 'download_custom_pdf'),
-
-)
-
-urlpatterns += patterns('django.views.generic.simple',
-    # old static pages - redirected
-    url(r'^szukaj/$', 'redirect_to',
-        {'url': '/szukaj/'}),
 )