Mostly Javascript refactoring.

[redakcja.git] / apps / wiki / views.py

diff --git a/apps/wiki/views.py b/apps/wiki/views.py
index 78a1942..c3fd6e3 100644 (file)
--- a/apps/wiki/views.py
+++ b/apps/wiki/views.py
@@ -9,6 +9,7 @@ from wiki.models import Document, DocumentNotFound, getstorage
 from wiki.forms import DocumentForm
 from datetime import datetime
 from django.utils.encoding import smart_unicode
+import wlapi
 
 #
 # Quick hack around caching problems, TODO: use ETags
@@ -40,7 +41,7 @@ def document_list(request, template_name = 'wiki/document_list.html'):
 
 @never_cache
 def document_detail(request, name, template_name = 'wiki/document_details.html'):
-    print "Trying to get", repr(name)
+    
     try:
         document = getstorage().get(name)
     except DocumentNotFound:        
@@ -53,8 +54,19 @@ def document_detail(request, name, template_name = 'wiki/document_details.html')
     if len(last_documents) > MAX_LAST_DOCS:
         oldest_key = min(last_documents, key = last_documents.__getitem__)
         del last_documents[oldest_key]        
-    request.session['wiki_last_docs'] = last_documents   
-                
+    request.session['wiki_last_docs'] = last_documents      
+
+    return direct_to_template(request, template_name, extra_context = {
+        'document': document,        
+    })
+
+@never_cache
+def document_text(request, name):
+    try:
+        document = getstorage().get(name)
+    except DocumentNotFound:        
+        raise Http404
+    
     if request.method == 'POST':        
         form = DocumentForm(request.POST, instance = document)
         if form.is_valid():
@@ -63,12 +75,8 @@ def document_detail(request, name, template_name = 'wiki/document_details.html')
         else:
             return HttpResponse(json.dumps({'errors': form.errors}))
     else:
-        form = DocumentForm(instance = document)
-
-    return direct_to_template(request, template_name, extra_context = {
-        'document': document,
-        'form': form,
-    })
+        return HttpResponse(json.dumps({'text': document.plain_text, 'meta': document.meta(), 'revision': document.revision()}))
+   
 
 
 @never_cache
@@ -119,8 +127,6 @@ def document_history(request, name):
                 mimetype='application/json')
     
     
-import urllib, urllib2
-
 @never_cache
 def document_publish(request, name, version):
     storage = getstorage()
@@ -131,25 +137,10 @@ def document_publish(request, name, version):
     except DocumentNotFound:        
         raise Http404
     
-    auth_handler = urllib2.HTTPDigestAuthHandler();
-    auth_handler.add_password(
-                    realm="localhost:8000",
-                    uri="http://localhost:8000/api/",
-                    user="test", passwd="test")
-    
-    
-    opener = urllib2.build_opener(auth_handler)         
-    rq = urllib2.Request("http://localhost:8000/api/books.json")
-    rq.add_data(json.dumps({"text": document.text, "compressed": False}))
-    rq.add_header("Content-Type", "application/json")
-    
-    try:
-        response = opener.open(rq)                 
-        result = {"success": True, "message": response.read()}        
-    except urllib2.HTTPError, e:
-        logger.exception("Failed to send")
-        if e.code == 500:
-            return HttpResponse(e.read(), mimetype='text/plain')                        
-        result = {"success": False, "reason": e.read(), "errno": e.code}
+    api = wlapi.WLAPI(settings.WL_API_CONFIG)    
+    try:        
+        result = {"success": True, "result": api.publish_book(document)}
+    except wlapi.APICallException, e:                        
+        result = {"success": False, "reason": str(e)}
         
     return HttpResponse( json.dumps(result), mimetype='application/json')       
\ No newline at end of file