diff --git a/opds_catalog/urls.py b/opds_catalog/urls.py index 0c4668454d4645b59a53f7831762b51d997cd033..7ab04963b884ef38fc1905ab26b2d7e1b11bc333 100644 --- a/opds_catalog/urls.py +++ b/opds_catalog/urls.py @@ -9,46 +9,45 @@ urlpatterns = [ url(r'^books/$',feeds.LangFeed(), name='lang_books'), url(r'^books/0/$',feeds.BooksFeed(), name='nolang_books'), - url(r'^books/(?P<lang_code>[0-9])/$',feeds.BooksFeed(), name='char_books'), - url(r'^books/(?P<lang_code>[0-9])/(?P<chars>.+)/$',feeds.BooksFeed(), name='chars_books'), + url(r'^books/(?P<lang_code>[0-9])/$',feeds.BooksFeed(), name='char_books'), + url(r'^books/(?P<lang_code>[0-9])/(?P<chars>.+)/$',feeds.BooksFeed(), name='chars_books'), - url(r'^authors/$',feeds.LangFeed(), name='lang_authors'), - url(r'^authors/0/$',feeds.AuthorsFeed(), name='nolang_authors'), - url(r'^authors/(?P<lang_code>[0-9])/$',feeds.AuthorsFeed(), name='char_authors'), - url(r'^authors/(?P<lang_code>[0-9])/(?P<chars>.+)/$',feeds.AuthorsFeed(), name='chars_authors'), + url(r'^authors/$',feeds.LangFeed(), name='lang_authors'), + url(r'^authors/0/$',feeds.AuthorsFeed(), name='nolang_authors'), + url(r'^authors/(?P<lang_code>[0-9])/$',feeds.AuthorsFeed(), name='char_authors'), + url(r'^authors/(?P<lang_code>[0-9])/(?P<chars>.+)/$',feeds.AuthorsFeed(), name='chars_authors'), - url(r'^series/$',feeds.LangFeed(), name='lang_series'), - url(r'^series/0/$',feeds.SeriesFeed(), name='nolang_series'), - url(r'^series/(?P<lang_code>[0-9])/$',feeds.SeriesFeed(), name='char_series'), - url(r'^series/(?P<lang_code>[0-9])/(?P<chars>.+)/$',feeds.SeriesFeed(), name='chars_series'), + url(r'^series/$',feeds.LangFeed(), name='lang_series'), + url(r'^series/0/$',feeds.SeriesFeed(), name='nolang_series'), + url(r'^series/(?P<lang_code>[0-9])/$',feeds.SeriesFeed(), name='char_series'), + url(r'^series/(?P<lang_code>[0-9])/(?P<chars>.+)/$',feeds.SeriesFeed(), name='chars_series'), url(r'^genres/$',feeds.GenresFeed(), name='genres'), - url(r'^genres/(?P<section>\d+)/$',feeds.GenresFeed(), name='genres'), + url(r'^genres/(?P<section>\d+)/$',feeds.GenresFeed(), name='genres'), url(r'^search/$',feeds.OpenSearch, name='opensearch'), #url(r'search/{searchTerms}/$',feeds.OpenSearch, name='search_template'), - url(r'^search/books/(?P<searchtype>[bmasgued])/(?P<searchterms>.+)/(?P<page>\d+)/',feeds.SearchBooksFeed(), name='searchbooks'), - url(r'^search/books/(?P<searchtype>[bmasgued])/(?P<searchterms>.+)/',feeds.SearchBooksFeed(), name='searchbooks'), - url(r'^search/books/(?P<searchtype>as)/(?P<searchterms>.+)/(?P<searchterms0>.+)/(?P<page>\d+)/',feeds.SearchBooksFeed(), name='searchbooks'), - url(r'^search/books/(?P<searchtype>as)/(?P<searchterms>.+)/(?P<searchterms0>.+)/',feeds.SearchBooksFeed(), name='searchbooks'), - url(r'^search/books/(?P<searchtype>as)/(?P<searchterms>.+)/',feeds.SelectSeriesFeed(), name='searchbooks'), - url(r'^search/books/u/0/',feeds.SearchBooksFeed(), name='bookshelf'), + url(r'^search/books/(?P<searchtype>[bmasgued])/(?P<searchterms>.+)/(?P<page>\d+)/$',feeds.SearchBooksFeed(), name='searchbooks'), + url(r'^search/books/(?P<searchtype>[bmasgued])/(?P<searchterms>.+)/$',feeds.SearchBooksFeed(), name='searchbooks'), + url(r'^search/books/(?P<searchtype>as)/(?P<searchterms>.+)/(?P<searchterms0>.+)/(?P<page>\d+)/$',feeds.SearchBooksFeed(), name='searchbooks'), + url(r'^search/books/(?P<searchtype>as)/(?P<searchterms>.+)/(?P<searchterms0>.+)/$',feeds.SearchBooksFeed(), name='searchbooks'), + url(r'^search/books/(?P<searchtype>as)/(?P<searchterms>.+)/$',feeds.SelectSeriesFeed(), name='searchbooks'), + url(r'^search/books/u/0/$',feeds.SearchBooksFeed(), name='bookshelf'), - url(r'^search/authors/(?P<searchtype>[bme])/(?P<searchterms>.+)/(?P<page>\d+)/',feeds.SearchAuthorsFeed(), name='searchauthors'), - url(r'^search/authors/(?P<searchtype>[bme])/(?P<searchterms>.+)/',feeds.SearchAuthorsFeed(), name='searchauthors'), + url(r'^search/authors/(?P<searchtype>[bme])/(?P<searchterms>.+)/(?P<page>\d+)/$',feeds.SearchAuthorsFeed(), name='searchauthors'), + url(r'^search/authors/(?P<searchtype>[bme])/(?P<searchterms>.+)/$',feeds.SearchAuthorsFeed(), name='searchauthors'), - url(r'^search/series/(?P<searchtype>[bmae])/(?P<searchterms>.+)/(?P<page>\d+)/',feeds.SearchSeriesFeed(), name='searchseries'), - url(r'^search/series/(?P<searchtype>[bmae])/(?P<searchterms>.+)/',feeds.SearchSeriesFeed(), name='searchseries'), - + url(r'^search/series/(?P<searchtype>[bmae])/(?P<searchterms>.+)/(?P<page>\d+)/$',feeds.SearchSeriesFeed(), name='searchseries'), + url(r'^search/series/(?P<searchtype>[bmae])/(?P<searchterms>.+)/$',feeds.SearchSeriesFeed(), name='searchseries'), + url(r'^search/(?P<searchterms>.+)/$',feeds.SearchTypesFeed(), name='searchtypes'), - url(r'^search/(?P<searchterms>.+)$',feeds.SearchTypesFeed(), name='searchtypes'), - url(r'^convert/(?P<book_id>[0-9]+)/(?P<convert_type>.+)/$',dl.ConvertFB2, name='convert'), + url(r'^convert/(?P<book_id>[0-9]+)/(?P<convert_type>.+)/$',dl.ConvertFB2, name='convert'), url(r'^download/(?P<book_id>[0-9]+)/(?P<zip_flag>[0-1])/$',dl.Download, name='download'), url(r'^cover/(?P<book_id>[0-9]+)/$',dl.Cover, name='cover'), url(r'^thumb/(?P<book_id>[0-9]+)/$',dl.Thumbnail, name='thumb'), url(r'^thumb/$',dl.Cover, name='covertmpl'), - url(r'^',feeds.MainFeed(), name='main'), + url(r'^$',feeds.MainFeed(), name='main'), ] diff --git a/sopds/urls.py b/sopds/urls.py index 4ee723bcc7dc5b8c4ecf65e00587c1d357321043..0fc4d3a84c8be3148288f371f4a2422351dd4ee7 100644 --- a/sopds/urls.py +++ b/sopds/urls.py @@ -19,8 +19,8 @@ from django.contrib.auth.views import logout urlpatterns = [ url(r'^opds/', include('opds_catalog.urls', namespace='opds', app_name='opds_catalog')), - url(r'^web/', include('sopds_web_backend.urls', namespace='web', app_name='opds_web_backend')), + url(r'^web/', include('sopds_web_backend.urls', namespace='web', app_name='opds_web_backend')), url(r'^admin/', admin.site.urls), #url(r'^logout/$', logout, {'next_page':'/web/'},name='logout'), - url(r'^', include('sopds_web_backend.urls', namespace='web', app_name='opds_web_backend')), + url(r'^$', include('sopds_web_backend.urls', namespace='web', app_name='opds_web_backend')), ] diff --git a/sopds_web_backend/urls.py b/sopds_web_backend/urls.py index 366405f21d744b7a71a9d2749a4ca73dede4f059..48c5679374acadf25356c3c7559439b819d5fe99 100644 --- a/sopds_web_backend/urls.py +++ b/sopds_web_backend/urls.py @@ -3,17 +3,17 @@ from django.conf.urls import url from sopds_web_backend import views urlpatterns = [ - url(r'^search/books/',views.SearchBooksView, name='searchbooks'), - url(r'^search/authors/',views.SearchAuthorsView, name='searchauthors'), - url(r'^search/series/',views.SearchSeriesView, name='searchseries'), - url(r'^catalog/',views.CatalogsView, name='catalog'), - url(r'^book/',views.BooksView, name='book'), - url(r'^author/',views.AuthorsView, name='author'), - url(r'^genre/',views.GenresView, name='genre'), - url(r'^series/',views.SeriesView, name='series'), - url(r'^login/',views.LoginView, name='login'), - url(r'^logout/',views.LogoutView, name='logout'), - url(r'^bs/delete/',views.BSDelView, name='bsdel'), - url(r'^bs/clear/', views.BSClearView, name='bsclear'), - url(r'^',views.hello, name='main'), + url(r'^search/books/$',views.SearchBooksView, name='searchbooks'), + url(r'^search/authors/$',views.SearchAuthorsView, name='searchauthors'), + url(r'^search/series/$',views.SearchSeriesView, name='searchseries'), + url(r'^catalog/$',views.CatalogsView, name='catalog'), + url(r'^book/$',views.BooksView, name='book'), + url(r'^author/$',views.AuthorsView, name='author'), + url(r'^genre/$',views.GenresView, name='genre'), + url(r'^series/$',views.SeriesView, name='series'), + url(r'^login/$',views.LoginView, name='login'), + url(r'^logout/$',views.LogoutView, name='logout'), + url(r'^bs/delete/$',views.BSDelView, name='bsdel'), + url(r'^bs/clear/$', views.BSClearView, name='bsclear'), + url(r'^$',views.hello, name='main'), ]