X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/3badd77f743883992829a1174eef7c8d5e851766..f3297edabcea6046315fe17012dfc7c82c108786:/apps/catalogue/urls.py?ds=inline

diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py
index 88e622678..647bc9f37 100644
--- a/apps/catalogue/urls.py
+++ b/apps/catalogue/urls.py
@@ -4,19 +4,29 @@
 #
 from django.conf.urls.defaults import *
 from catalogue.feeds import AudiobookFeed
-from catalogue.models import Book
-from picture.models import Picture
 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')
+)
+
+# 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'),
 
     url(r'^lektury/$', 'book_list', name='book_list'),
@@ -25,7 +35,12 @@ 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'^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'),
@@ -41,11 +56,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'),
-
-) 
+)