From: zuber Date: Thu, 22 Oct 2009 15:07:03 +0000 (+0200) Subject: Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/0917e94c7b5403408a167ac17f8c6474f9563fe8?ds=sidebyside;hp=-c Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma --- 0917e94c7b5403408a167ac17f8c6474f9563fe8 diff --combined apps/api/handlers/library_handlers.py index 5eb5202c,a3285821..942ea0e8 --- a/apps/api/handlers/library_handlers.py +++ b/apps/api/handlers/library_handlers.py @@@ -328,7 -328,7 +328,7 @@@ class DocumentHTMLHandler(BaseHandler) return error return librarian.html.transform(document.data('xml'), is_file=False, \ - parse_dublincore=False, stylesheet=stylesheet,\ + parse_dublincore=False, stylesheet='full',\ options={ "with-paths": 'boolean(1)', }) @@@ -336,6 -336,9 +336,9 @@@ except (EntryNotFound, RevisionNotFound), e: return response.EntityNotFound().django_response({ 'reason': 'not-found', 'message': e.message}) + except librarian.ValidationError, e: + return response.InternalError().django_response({ + 'reason': 'xml-non-valid', 'message': e.message }) except librarian.ParseError, e: return response.InternalError().django_response({ 'reason': 'xml-parse-error', 'message': e.message }) @@@ -385,7 -388,7 +388,7 @@@ class DocumentGalleryHandler(BaseHandle gallery['pages'].append( quote(url.encode('utf-8')) ) -# gallery['pages'].sort() + gallery['pages'].sort() galleries.append(gallery) return galleries