X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/3546a2b2d5f52224bcf95803030611ab505f29cd..888f954ea4d9b923e963525dbdf83d9ad1f9b443:/apps/api/handlers/library_handlers.py diff --git a/apps/api/handlers/library_handlers.py b/apps/api/handlers/library_handlers.py index f0ce1863..0f5b6d64 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 # @@ -55,8 +60,7 @@ class LibraryHandler(BaseHandler): documents = {} - for docid in lib.documents(): - docid = docid.decode('utf-8') + for docid in lib.documents(): documents[docid] = { 'url': reverse('document_view', args=[docid]), 'name': docid, @@ -71,7 +75,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] @@ -80,10 +84,7 @@ class LibraryHandler(BaseHandler): # not top-level anymore document_tree.pop(part) parent['parts'].append(child) - - # sort the right way - for doc in documents.itervalues(): doc['parts'].sort(key=natural_order(lambda d: d['name'])) @@ -100,6 +101,9 @@ class LibraryHandler(BaseHandler): else: data = request.FILES['ocr_file'].read().decode('utf-8') + if data is None: + return response.BadRequest().django_response('You must pass ocr_data or ocr_file.') + if form.cleaned_data['generate_dc']: data = librarian.wrap_text(data, unicode(date.today())) @@ -108,7 +112,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 @@ -116,9 +120,10 @@ class LibraryHandler(BaseHandler): doc = doc.quickwrite('xml', data.encode('utf-8'), '$AUTO$ XML data uploaded.', user=request.user.username) except Exception,e: + import traceback # rollback branch creation lib._rollback() - raise LibraryException("Exception occured:" + repr(e)) + raise LibraryException(traceback.format_exc()) url = reverse('document_view', args=[doc.id]) @@ -131,8 +136,9 @@ class LibraryHandler(BaseHandler): finally: lock.release() except LibraryException, e: + import traceback return response.InternalError().django_response(\ - {'exception': repr(e) }) + {'exception': traceback.format_exc()} ) except DocumentAlreadyExists: # Document is already there return response.EntityConflict().django_response(\ @@ -171,6 +177,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) @@ -221,7 +228,7 @@ class DocumentHTMLHandler(BaseHandler): return response.BadRequest().django_response({'reason': 'name-mismatch', 'message': 'Provided revision refers, to document "%s", but provided "%s"' % (document.id, docid) }) - return librarian.html.transform(document.data('xml'), is_file=False) + return librarian.html.transform(document.data('xml'), is_file=False, parse_dublincore=False) except (EntryNotFound, RevisionNotFound), e: return response.EntityNotFound().django_response({ 'exception': type(e), 'message': e.message}) @@ -230,7 +237,6 @@ class DocumentHTMLHandler(BaseHandler): # # Image Gallery # -from django.core.files.storage import FileSystemStorage class DocumentGalleryHandler(BaseHandler): allowed_methods = ('GET') @@ -243,17 +249,19 @@ 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 + for file in sorted( os.listdir(dirpath) ): + file = file.encode('utf-8') + + 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'); @@ -318,7 +326,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): @@ -507,17 +515,19 @@ 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() - new_udoc = udoc.latest() + nudoc = udoc.latest() return response.SuccessAllOk().django_response({ - "name": udoc.id, + "name": nudoc.id, "parent_user_resivion": udoc.revision, "parent_revision": doc.revision, - "revision": ndoc.revision, - 'timestamp': ndoc.revision.timestamp, + "revision": nudoc.revision, + 'timestamp': nudoc.revision.timestamp, })