DC resource. More merge tests.

[redakcja.git] / apps / api / urls.py

diff --git a/apps/api/urls.py b/apps/api/urls.py
index ada879c..913acb7 100644 (file)
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@@ -9,20 +9,24 @@ from api.utils import TextEmitter, DjangoAuth
 
 authdata = {'authentication': DjangoAuth()}
 
-FORMAT_EXT = r"\.(?P<emitter_format>xml|json|yaml|django)$"
+FORMAT_EXT = r"\.(?P<emitter_format>xml|json|yaml)$"
 
 library_resource = Resource(LibraryHandler, **authdata)
 document_resource = Resource(DocumentHandler, **authdata)
 document_text_resource = Resource(DocumentTextHandler, **authdata)
+document_dc_resource = Resource(DocumentDublinCoreHandler, **authdata)
 
 urlpatterns = patterns('',
 #    url(r'^hello$', hello_resource, {'emitter_format': 'json'}),
 #    url(r'^hello\.(?P<emitter_format>.+)$', hello_resource),
 
     # Documents
-    url(r'^documents$', library_resource, {'emitter_format': 'json'},
-        name="document_list_view"),
+    url(r'^documents$', library_resource,
+        {'emitter_format': 'json'}, name="document_list_view"),
 
+    url(r'^documents'+FORMAT_EXT, library_resource,
+        name="document_list_view_withformat"),
+        
     url(r'^documents/(?P<docid>[^/]+)'+FORMAT_EXT,
         document_resource, name="document_view_withformat"),
 
@@ -34,8 +38,12 @@ urlpatterns = patterns('',
         document_text_resource, {'emitter_format': 'rawxml'},
         name="doctext_view"),
 
+    url(r'^documents/(?P<docid>[^/]+)/dc' + FORMAT_EXT,
+        document_dc_resource,
+        name="docdc_view_withformat"),
+
     url(r'^documents/(?P<docid>[^/]+)/dc$',
-        document_resource, {'emitter_format': 'json'},
+        document_dc_resource, {'emitter_format': 'json'},
         name="docdc_view"),
 
     url(r'^documents/(?P<docid>[^/]+)/parts$',