fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reverted CM to version 0.63 with 2 patches:
[redakcja.git]
/
apps
/
api
/
handlers
/
library_handlers.py
diff --git
a/apps/api/handlers/library_handlers.py
b/apps/api/handlers/library_handlers.py
index
f0ce186
..
b726067
100644
(file)
--- a/
apps/api/handlers/library_handlers.py
+++ b/
apps/api/handlers/library_handlers.py
@@
-1,5
+1,6
@@
-import os.path
# -*- encoding: utf-8 -*-
# -*- encoding: utf-8 -*-
+import os.path
+import logging
__author__= "Łukasz Rekucki"
__date__ = "$2009-09-25 15:49:50$"
__author__= "Łukasz Rekucki"
__date__ = "$2009-09-25 15:49:50$"
@@
-29,6
+30,10
@@
from api.models import PartCache
#
import settings
#
import settings
+
+log = logging.getLogger('platforma.api')
+
+
#
# Document List Handlers
#
#
# Document List Handlers
#
@@
-55,8
+60,7
@@
class LibraryHandler(BaseHandler):
documents = {}
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,
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):
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]
continue
parent = documents[docid]
@@
-80,10
+84,7
@@
class LibraryHandler(BaseHandler):
# not top-level anymore
document_tree.pop(part)
parent['parts'].append(child)
# 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']))
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')
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()))
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:
try:
lock = lib.lock()
try:
- print "DOCID", docid
+ log.info("DOCID %s", docid)
doc = lib.document_create(docid)
# document created, but no content yet
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:
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()
# rollback branch creation
lib._rollback()
- raise LibraryException(
"Exception occured:" + repr(e
))
+ raise LibraryException(
traceback.format_exc(
))
url = reverse('document_view', args=[doc.id])
url = reverse('document_view', args=[doc.id])
@@
-131,8
+136,9
@@
class LibraryHandler(BaseHandler):
finally:
lock.release()
except LibraryException, e:
finally:
lock.release()
except LibraryException, e:
+ import traceback
return response.InternalError().django_response(\
return response.InternalError().django_response(\
- {'exception':
repr(e) })
+ {'exception':
traceback.format_exc()} )
except DocumentAlreadyExists:
# Document is already there
return response.EntityConflict().django_response(\
except DocumentAlreadyExists:
# Document is already there
return response.EntityConflict().django_response(\
@@
-171,12
+177,14
@@
class DocumentHandler(BaseHandler):
@hglibrary
def read(self, request, docid, lib):
"""Read document's meta data"""
@hglibrary
def read(self, request, docid, lib):
"""Read document's meta data"""
+ log.info(u"Read %s (%s)" % (docid, type(docid)) )
try:
doc = lib.document(docid)
udoc = doc.take(request.user.username)
except RevisionNotFound, e:
return response.EntityNotFound().django_response({
try:
doc = lib.document(docid)
udoc = doc.take(request.user.username)
except RevisionNotFound, e:
return response.EntityNotFound().django_response({
- 'exception': type(e), 'message': e.message})
+ 'exception': type(e), 'message': e.message,
+ 'docid': docid })
# is_shared = udoc.ancestorof(doc)
# is_uptodate = is_shared or shared.ancestorof(document)
# is_shared = udoc.ancestorof(doc)
# is_uptodate = is_shared or shared.ancestorof(document)
@@
-221,44
+229,52
@@
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 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({
except (EntryNotFound, RevisionNotFound), e:
return response.EntityNotFound().django_response({
- 'exception': type(e), 'message': e.message})
-
+ 'reason': 'not-found', 'message': e.message})
+ except librarian.ParseError, e:
+ return response.InternalError().django_response({
+ 'reason': 'xml-parse-error', 'message': e.message })
#
# Image Gallery
#
#
# Image Gallery
#
-from django.core.files.storage import FileSystemStorage
class DocumentGalleryHandler(BaseHandler):
allowed_methods = ('GET')
class DocumentGalleryHandler(BaseHandler):
allowed_methods = ('GET')
+
def read(self, request, docid):
"""Read meta-data about scans for gallery of this document."""
galleries = []
def read(self, request, docid):
"""Read meta-data about scans for gallery of this document."""
galleries = []
+ from urllib import quote
for assoc in GalleryForDocument.objects.filter(document=docid):
dirpath = os.path.join(settings.MEDIA_ROOT, assoc.subpath)
if not os.path.isdir(dirpath):
for assoc in GalleryForDocument.objects.filter(document=docid):
dirpath = os.path.join(settings.MEDIA_ROOT, assoc.subpath)
if not os.path.isdir(dirpath):
- print u"[WARNING]: missing gallery %s" % dirpath
+ log.warn(u"[WARNING]: missing gallery %s", dirpath)
continue
gallery = {'name': assoc.name, 'pages': []}
continue
gallery = {'name': assoc.name, 'pages': []}
- for file in sorted(os.listdir(dirpath), key=natural_order()):
- print file
+ for file in os.listdir(dirpath):
+ if not isinstance(file, unicode):
+ log.warn(u"File %r is gallery %r is not unicode. Ommiting."\
+ % (file, dirpath) )
+ continue
+
name, ext = os.path.splitext(os.path.basename(file))
name, ext = os.path.splitext(os.path.basename(file))
- if ext.lower() not in [
'.png', '.jpeg',
'.jpg']:
- print "Ignoring:", name, ext
+ if ext.lower() not in [
u'.png', u'.jpeg', u
'.jpg']:
+ log.info(u"Ignoring: %s %s", name, ext)
continue
continue
- url = settings.MEDIA_URL + assoc.subpath + u'/' + file.decode('utf-8');
- gallery['pages'].append(url)
-
+ url = settings.MEDIA_URL + assoc.subpath + u'/' + file;
+ gallery['pages'].append( quote(url.encode('utf-8')) )
+
+ gallery['pages'].sort()
galleries.append(gallery)
return galleries
galleries.append(gallery)
return galleries
@@
-318,7
+334,7
@@
class DocumentTextHandler(BaseHandler):
includes = [m.groupdict()['link'] for m in (re.finditer(\
XINCLUDE_REGEXP, data, flags=re.UNICODE) or []) ]
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):
# TODO: provide useful routines to make this simpler
def xml_update_action(lib, resolve):
@@
-507,17
+523,19
@@
class MergeHandler(BaseHandler):
success, changed = udoc.share(form.cleaned_data['message'])
if not success:
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()
if not changed:
return response.SuccessNoContent().django_response()
- n
ew_
udoc = udoc.latest()
+ nudoc = udoc.latest()
return response.SuccessAllOk().django_response({
return response.SuccessAllOk().django_response({
- "name": udoc.id,
+ "name":
n
udoc.id,
"parent_user_resivion": udoc.revision,
"parent_revision": doc.revision,
"parent_user_resivion": udoc.revision,
"parent_revision": doc.revision,
- "revision": ndoc.revision,
- 'timestamp': ndoc.revision.timestamp,
+ "revision": n
u
doc.revision,
+ 'timestamp': n
u
doc.revision.timestamp,
})
})
fnp / redakcja.git / blobdiff