Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma

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

diff --git a/apps/api/urls.py b/apps/api/urls.py
index 8c47e83..0ae1420 100644 (file)
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@@ -2,12 +2,11 @@ __author__="lreqc"
 __date__ ="$2009-09-17 16:16:54$"
 
 from django.conf.urls.defaults import *
 __date__ ="$2009-09-17 16:16:54$"
 
 from django.conf.urls.defaults import *

-

 from api.resources import *
 
 FORMAT = r"\.(?P<emitter_format>xml|json|yaml)"
 DOC = r'(?P<docid>[^/]+)'
 from api.resources import *
 
 FORMAT = r"\.(?P<emitter_format>xml|json|yaml)"
 DOC = r'(?P<docid>[^/]+)'

-REVISION = r'(?P<revision>latest|[0-9a-f]{40})'
+# REVISION = r'(?P<revision>latest|[0-9a-f]{40})'

 
 def urlpath(*args, **kwargs):
     format = kwargs.get('format', True)
 
 def urlpath(*args, **kwargs):
     format = kwargs.get('format', True)


@@ -18,8 +17,13 @@ urlpatterns = patterns('',
 #    url(r'^hello\.(?P<emitter_format>.+)$', hello_resource),
 
     # Toolbar
 #    url(r'^hello\.(?P<emitter_format>.+)$', hello_resource),
 
     # Toolbar

-    url(r'^toolbar/buttons$', toolbar_buttons, {'emitter_format': 'json'}),    
-    url(r'^toolbar/scriptlets$', scriptlets, {'emitter_format': 'json'}),
+    url(r'^toolbar/buttons$', toolbar_buttons, {'emitter_format': 'json'},
+        name="toolbar_buttons"
+    ),
+    
+    url(r'^toolbar/scriptlets$', scriptlets, {'emitter_format': 'json'},
+        name="toolbar_scriptlets"
+    ),

 
     # Pull requests
     url(r"^pull-requests$", pullrequest_collection,
 
     # Pull requests
     url(r"^pull-requests$", pullrequest_collection,


@@ -35,29 +39,37 @@ urlpatterns = patterns('',
     url(urlpath(r'documents'), library_resource,
         name="document_list_view_withformat"),
         
     url(urlpath(r'documents'), library_resource,
         name="document_list_view_withformat"),
         

-    url(urlpath(r'documents', DOC),
-        document_resource, name="document_view_withformat"),
+    #url(urlpath(r'documents', DOC),
+    #    document_resource, name="document_view_withformat"),

 
     url(urlpath(r'documents', DOC, format=False),
         document_resource, {'emitter_format': 'json'},
         name="document_view"),
 
     url(urlpath(r'documents', DOC, format=False),
         document_resource, {'emitter_format': 'json'},
         name="document_view"),

-    
-    url(urlpath(r'documents', DOC, 'text', REVISION, format=False),
+
+    url(urlpath(r'documents', DOC, 'gallery', format=False),
+        document_gallery, {'emitter_format': 'json'},
+        name="docgallery_view"),
+
+    # XML    
+    url(urlpath(r'documents', DOC, 'text', format=False),

         document_text_resource, {'emitter_format': 'rawxml'},
         name="doctext_view"),
 
         document_text_resource, {'emitter_format': 'rawxml'},
         name="doctext_view"),
 

-    url(urlpath(r'documents', DOC, 'html', REVISION, format=False),
-        document_text_resource, {'emitter_format': 'rawhtml'},
+    # HTML
+    url(urlpath(r'documents', DOC, 'html', format=False),
+        document_html_resource, {'emitter_format': 'rawhtml'},

         name="dochtml_view"),
 
         name="dochtml_view"),
 

-    url(urlpath(r'documents', DOC, 'dc', REVISION),
-        document_dc_resource,
-        name="docdc_view_withformat"),
+    # DC
+    #url(urlpath(r'documents', DOC, 'dc'),
+    #    document_dc_resource,
+    #    name="docdc_view_withformat"),

 
 

-    url(urlpath(r'documents', DOC, 'dc', REVISION, format=False),
+    url(urlpath(r'documents', DOC, 'dc', format=False),

         document_dc_resource, {'emitter_format': 'json'},
         name="docdc_view"),
 
         document_dc_resource, {'emitter_format': 'json'},
         name="docdc_view"),
 

+    # MERGE

     url(urlpath(r'documents', DOC, 'revision', format=False),
         document_merge, {'emitter_format': 'json'}, name="docmerge_view")
 
     url(urlpath(r'documents', DOC, 'revision', format=False),
         document_merge, {'emitter_format': 'json'}, name="docmerge_view")