X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/50f38b58c45dc9b68da614b3e26d45951088ec0c..67ea42add2b196f5ab07dafd6af0a6b9cb628bb2:/apps/catalogue/urls.py

diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py
index 4baf225a5..647bc9f37 100644
--- a/apps/catalogue/urls.py
+++ b/apps/catalogue/urls.py
@@ -4,33 +4,43 @@
 #
 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'^polki/(?P<shelf>[a-zA-Z0-9-]+)/formaty/$', 'shelf_book_formats', name='shelf_book_formats'),
-    url(r'^polki/(?P<shelf>[a-zA-Z0-9-]+)/(?P<slug>%s)/usun$' % SLUG, 'remove_from_shelf', name='remove_from_shelf'),
-    url(r'^polki/$', 'user_shelves', name='user_shelves'),
-    url(r'^polki/(?P<slug>[a-zA-Z0-9-]+)/usun/$', 'delete_shelf', name='delete_shelf'),
-    url(r'^polki/(?P<slug>[a-zA-Z0-9-]+)\.zip$', 'download_shelf', name='download_shelf'),
-    url(r'^lektury/', 'book_list', name='book_list'),
+
+    url(r'^lektury/$', 'book_list', name='book_list'),
+    url(r'^lektury/(?P<slug>[a-zA-Z0-9-]+)/$', 'collection', name='collection'),
     url(r'^audiobooki/$', 'audiobook_list', name='audiobook_list'),
     url(r'^daisy/$', 'daisy_list', name='daisy_list'),
-    url(r'^lektura/(?P<book>%s)/polki/' % SLUG, 'book_sets', name='book_shelves'),
-    url(r'^polki/nowa/$', 'new_set', name='new_set'),
     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'),
@@ -46,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'),
-
-) 
+)