X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/0072f1058b57e2744e5f448a98d9d0c2e6492898..afb3cc283074103e1137e79589d15390c825ecf1:/src/api/urls.py diff --git a/src/api/urls.py b/src/api/urls.py index 9cec9b872..bd832fe25 100644 --- a/src/api/urls.py +++ b/src/api/urls.py @@ -7,7 +7,6 @@ from django.views.decorators.csrf import csrf_exempt from django.views.generic import TemplateView from piston.authentication import OAuthAuthentication, oauth_access_token, oauth_request_token from piston.resource import Resource -from ssify import ssi_included import catalogue.views from api import handlers from api.helpers import CsrfExemptResource @@ -69,22 +68,7 @@ blog_resource = Resource(handler=handlers.BlogEntryHandler) tags_re = r'^(?P(?:(?:[a-z0-9-]+/){2}){0,6})' -paginate_re = r'(?:before/(?P[a-z0-9-]+)/)?(?:after/(?P[a-z0-9-]+)/)?(?:count/(?P[0-9]+)/)?$' - - -@ssi_included -def incl(request, model, pk, emitter_format): - resource = { - 'book': book_list_resource, - 'fragment': fragment_list_resource, - 'tag': tag_list_resource, - }[model] - request.piwik_track = False - resp = resource(request, pk=pk, emitter_format=emitter_format) - if emitter_format == 'xml': - # Ugly, but quick way of stripping header and tags. - resp.content = resp.content[49:-11] - return resp +paginate_re = r'(?:after/(?P[a-z0-9-]+)/)?(?:count/(?P[0-9]+)/)?$' urlpatterns = [ @@ -93,8 +77,6 @@ urlpatterns = [ url(r'^oauth/access_token/$', csrf_exempt(oauth_access_token)), url(r'^$', TemplateView.as_view(template_name='api/main.html'), name='api'), - url(r'^include/(?Pbook|fragment|tag)/(?P\d+)\.(?P.+)\.(?Pxml|json)$', - incl, name='api_include'), # info boxes (used by mobile app) url(r'book/(?P\d*?)/info\.html$', catalogue.views.book_info),