bump librarian to master

[wolnelektury.git] / apps / catalogue / urls.py

diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py
index 4c53da4..647bc9f 100644 (file)
--- a/apps/catalogue/urls.py
+++ b/apps/catalogue/urls.py
@@ -15,11 +15,16 @@ urlpatterns = patterns('picture.views',
     url(r'^obraz/(?P<picture>%s)/?$' % SLUG, 'picture_detail')
 )
 
-urlpatterns += patterns('django.views.generic.simple',
-    # old static pages - redirected
-    url(r'^szukaj/$', 'redirect_to',
-        {'url': '/szukaj/', 'query_string': True}),
+# workaround for Django ticket #17111; redirect when resolved
+urlpatterns += patterns('search.views',
+    url(r'^szukaj/$', 'main'),  
 )
+#urlpatterns += patterns('django.views.generic.simple',
+#    # old search page - redirected
+#    url(r'^szukaj/$', 'redirect_to',
+#        
+#        {'url': '/szukaj/', 'query_string': True}),  
+#)
 
 urlpatterns += patterns('catalogue.views',
     url(r'^$', 'catalogue', name='catalogue'),
@@ -32,6 +37,11 @@ urlpatterns += patterns('catalogue.views',
     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'),
     url(r'^zip/epub\.zip$', 'download_zip', {'format': 'epub', 'slug': None}, 'download_zip_epub'),
@@ -46,11 +56,6 @@ urlpatterns += patterns('catalogue.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'),
-
 )