X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/51d914bc0007135058a61623a2d057d2a7626a28..8b3b5216a1690aff61e4da42a2523406fd8b21e3:/apps/api/handlers/library_handlers.py?ds=inline diff --git a/apps/api/handlers/library_handlers.py b/apps/api/handlers/library_handlers.py index 2170b44b..4d23478d 100644 --- a/apps/api/handlers/library_handlers.py +++ b/apps/api/handlers/library_handlers.py @@ -1,5 +1,6 @@ -import os.path # -*- encoding: utf-8 -*- +import os.path +import logging __author__= "Łukasz Rekucki" __date__ = "$2009-09-25 15:49:50$" @@ -29,6 +30,10 @@ from api.models import PartCache # import settings + +log = logging.getLogger('platforma.api') + + # # Document List Handlers # @@ -71,7 +76,7 @@ class LibraryHandler(BaseHandler): for part, docid in parts: # this way, we won't display broken links if not documents.has_key(part): - print "NOT FOUND:", part + log.info("NOT FOUND: %s", part) continue parent = documents[docid] @@ -108,7 +113,7 @@ class LibraryHandler(BaseHandler): try: lock = lib.lock() try: - print "DOCID", docid + log.info("DOCID %s", docid) doc = lib.document_create(docid) # document created, but no content yet @@ -153,9 +158,9 @@ class BasicDocumentHandler(AnonymousBaseHandler): result = { 'name': doc.id, - 'html_url': reverse('dochtml_view', args=[doc.id,doc.revision]), - 'text_url': reverse('doctext_view', args=[doc.id,doc.revision]), - 'dc_url': reverse('docdc_view', args=[doc.id,doc.revision]), + 'html_url': reverse('dochtml_view', args=[doc.id]), + 'text_url': reverse('doctext_view', args=[doc.id]), + 'dc_url': reverse('docdc_view', args=[doc.id]), 'public_revision': doc.revision, } @@ -171,6 +176,7 @@ class DocumentHandler(BaseHandler): @hglibrary def read(self, request, docid, lib): """Read document's meta data""" + log.info("Read %s", docid) try: doc = lib.document(docid) udoc = doc.take(request.user.username) @@ -183,9 +189,9 @@ class DocumentHandler(BaseHandler): result = { 'name': udoc.id, - 'html_url': reverse('dochtml_view', args=[udoc.id,udoc.revision]), - 'text_url': reverse('doctext_view', args=[udoc.id,udoc.revision]), - 'dc_url': reverse('docdc_view', args=[udoc.id,udoc.revision]), + 'html_url': reverse('dochtml_view', args=[udoc.id]), + 'text_url': reverse('doctext_view', args=[udoc.id]), + 'dc_url': reverse('docdc_view', args=[udoc.id]), 'gallery_url': reverse('docgallery_view', args=[udoc.id]), 'merge_url': reverse('docmerge_view', args=[udoc.id]), 'user_revision': udoc.revision, @@ -207,9 +213,11 @@ class DocumentHTMLHandler(BaseHandler): allowed_methods = ('GET') @hglibrary - def read(self, request, docid, revision, lib): + def read(self, request, docid, lib): """Read document as html text""" try: + revision = request.GET.get('revision', 'latest') + if revision == 'latest': document = lib.document(docid) else: @@ -241,17 +249,17 @@ class DocumentGalleryHandler(BaseHandler): dirpath = os.path.join(settings.MEDIA_ROOT, assoc.subpath) if not os.path.isdir(dirpath): - print u"[WARNING]: missing gallery %s" % dirpath + log.info(u"[WARNING]: missing gallery %s", dirpath) continue gallery = {'name': assoc.name, 'pages': []} for file in sorted(os.listdir(dirpath), key=natural_order()): - print file + log.info(file) name, ext = os.path.splitext(os.path.basename(file)) if ext.lower() not in ['.png', '.jpeg', '.jpg']: - print "Ignoring:", name, ext + log.info("Ignoring: %s %s", name, ext) continue url = settings.MEDIA_URL + assoc.subpath + u'/' + file.decode('utf-8'); @@ -270,11 +278,12 @@ XINCLUDE_REGEXP = r"""<(?:\w+:)?include\s+[^>]*?href=("|')wlrepo://(?P[^\1 # # class DocumentTextHandler(BaseHandler): - allowed_methods = ('GET', 'PUT') + allowed_methods = ('GET', 'POST') @hglibrary - def read(self, request, docid, revision, lib): - """Read document as raw text""" + def read(self, request, docid, lib): + """Read document as raw text""" + revision = request.GET.get('revision', 'latest') try: if revision == 'latest': document = lib.document(docid) @@ -292,12 +301,13 @@ class DocumentTextHandler(BaseHandler): 'exception': type(e), 'message': e.message}) @hglibrary - def update(self, request, docid, revision, lib): + def create(self, request, docid, lib): try: - data = request.PUT['contents'] + data = request.POST['contents'] + revision = request.POST['revision'] - if request.PUT.has_key('message'): - msg = u"$USER$ " + request.PUT['message'] + if request.POST.has_key('message'): + msg = u"$USER$ " + request.POST['message'] else: msg = u"$AUTO$ XML content update." @@ -314,7 +324,7 @@ class DocumentTextHandler(BaseHandler): includes = [m.groupdict()['link'] for m in (re.finditer(\ XINCLUDE_REGEXP, data, flags=re.UNICODE) or []) ] - print "INCLUDES: ", includes + log.info("INCLUDES: %s", includes) # TODO: provide useful routines to make this simpler def xml_update_action(lib, resolve): @@ -353,7 +363,7 @@ class DocumentTextHandler(BaseHandler): "previous_revision": current.revision, "revision": ndoc.revision, 'timestamp': ndoc.revision.timestamp, - "url": reverse("doctext_view", args=[ndoc.id, ndoc.revision]) + "url": reverse("doctext_view", args=[ndoc.id]) }) except Exception, e: if ndoc: lib._rollback() @@ -369,12 +379,14 @@ class DocumentTextHandler(BaseHandler): # @requires librarian # class DocumentDublinCoreHandler(BaseHandler): - allowed_methods = ('GET', 'PUT') + allowed_methods = ('GET', 'POST') @hglibrary - def read(self, request, docid, revision, lib): + def read(self, request, docid, lib): """Read document as raw text""" try: + revision = request.GET.get('revision', 'latest') + if revision == 'latest': doc = lib.document(docid) else: @@ -392,10 +404,12 @@ class DocumentDublinCoreHandler(BaseHandler): 'exception': type(e), 'message': e.message}) @hglibrary - def update(self, request, docid, revision, lib): + def create(self, request, docid, lib): try: - bi_json = request.PUT['contents'] - if request.PUT.has_key('message'): + bi_json = request.POST['contents'] + revision = request.POST['revision'] + + if request.POST.has_key('message'): msg = u"$USER$ " + request.PUT['message'] else: msg = u"$AUTO$ Dublin core update." @@ -425,7 +439,7 @@ class DocumentDublinCoreHandler(BaseHandler): "previous_revision": current.revision, "revision": ndoc.revision, 'timestamp': ndoc.revision.timestamp, - "url": reverse("docdc_view", args=[ndoc.id, ndoc.revision]) + "url": reverse("docdc_view", args=[ndoc.id]) } except Exception, e: if ndoc: lib._rollback() @@ -499,7 +513,9 @@ class MergeHandler(BaseHandler): success, changed = udoc.share(form.cleaned_data['message']) if not success: - return response.EntityConflict().django_response({}) + return response.EntityConflict().django_response({ + 'reason': 'merge-failure', + }) if not changed: return response.SuccessNoContent().django_response()