- return HttpResponse(json.dumps(images))
- except (IndexError, OSError), exc:
- import traceback
- traceback.print_exc()
-
- raise Http404
-
-def document_diff(request, name, revA, revB):
- docA = storage.get(name, int(revA))
- docB = storage.get(name, int(revB))
-
-
- return HttpResponse(nice_diff.html_diff_table(docA.plain_text.splitlines(),
- docB.plain_text.splitlines()) )
-
-
-def document_history(request, name):
- return HttpResponse(
- json.dumps(storage.history(name), cls=DateTimeEncoder),
- mimetype='application/json')
-
-
-def document_publish(request, name, version):
- # get the document
- try:
- document = storage.get(name, revision = int(version))
- except DocumentNotFound:
- raise Http404
-
- poster.streaminghttp.register_openers()
-
- # send request to WL
- http = httplib2.Http()
- http.add_credentials("test", "test")
- http.follow_all_redirects = True
- datagen, headers = poster.encode.multipart_encode({name: document.plain_text})
-
- for key, value in headers.items():
- headers[key] = unicode(value)
-
- try:
- resp, data = http.request("http://localhost:8000/api/books.json",
- method = "POST", body = ''.join(datagen), headers = headers)
-
- print resp, data
-
- if resp.status == 201: # success
- result = {"success": True}
- else:
- result = {"success": False, "errno": resp.status, "reason": resp.reason}
- except Exception, e:
- result = {"success": False, "errno": 500, "reason": unicode(e)}
-
- return HttpResponse( json.dumps(result), mimetype='application/json')
\ No newline at end of file
+
+ return JSONResponse(images)
+ except (IndexError, OSError):
+ logger.exception("Unable to fetch gallery")
+ raise http.Http404
+
+
+@never_cache
+def diff(request, doc_id):
+ revA = int(request.GET.get('from', 0))
+ revB = int(request.GET.get('to', 0))
+
+ if revA > revB:
+ revA, revB = revB, revA
+
+ if revB == 0:
+ revB = None
+
+ # TODO: check if revisions in line.
+
+ doc = get_object_or_404(Document, pk=doc_id, deleted=False)
+
+ # allow diff from the beginning
+ if revA:
+ docA = Revision.objects.get(pk=revA).materialize()
+ else:
+ docA = ""
+ docB = Revision.objects.get(pk=revB).materialize()
+
+ return http.HttpResponse(nice_diff.html_diff_table(docA.splitlines(), docB.splitlines(), context=3))
+
+
+@never_cache
+def history(request, doc_id):
+ # TODO: pagination
+ doc = get_object_or_404(Document, pk=doc_id, deleted=False)
+
+ return JSONResponse(get_history(doc))