X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/927a991b71d9876995dd2beadee8d9ff16175a50..05dbee77e04a759128a17cb988cb94732490f641:/apps/api/urls.py?ds=sidebyside

diff --git a/apps/api/urls.py b/apps/api/urls.py
index 18fc02c4..deac319a 100644
--- 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 *
-
 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)
@@ -17,9 +16,17 @@ urlpatterns = patterns('',
 #    url(r'^hello$', hello_resource, {'emitter_format': 'json'}),
 #    url(r'^hello\.(?P<emitter_format>.+)$', hello_resource),
 
+    # HTML Renderer service
+    url(r'^render$', 'api.views.render'),
+    
     # 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,
@@ -35,8 +42,8 @@ urlpatterns = patterns('',
     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'},
@@ -47,21 +54,21 @@ urlpatterns = patterns('',
         name="docgallery_view"),
 
     # XML    
-    url(urlpath(r'documents', DOC, 'text', REVISION, format=False),
-        document_text_resource, {'emitter_format': 'rawxml'},
+    url(urlpath(r'documents', DOC, 'text', format=False),
+        document_text_resource, {'emitter_format': 'raw'},
         name="doctext_view"),
 
     # HTML
-    url(urlpath(r'documents', DOC, 'html', REVISION, format=False),
-        document_html_resource, {'emitter_format': 'rawhtml'},
+    url(urlpath(r'documents', DOC, 'html', format=False),
+        document_html_resource, {'emitter_format': 'raw'},
         name="dochtml_view"),
 
     # DC
-    url(urlpath(r'documents', DOC, 'dc', REVISION),
-        document_dc_resource,
-        name="docdc_view_withformat"),
+    #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"),