Mercurial > hg > documentViewer
diff documentViewer.py @ 615:d6eca930a534
hocr viewer eingebaut
author | Dirk Wintergruen <dwinter@mpiwg-berlin.mpg.de> |
---|---|
date | Mon, 21 Jul 2014 12:53:42 +0200 |
parents | c57d80a649ea |
children | 54d3498a6e78 |
line wrap: on
line diff
--- a/documentViewer.py Mon Oct 21 10:36:54 2013 +0200 +++ b/documentViewer.py Mon Jul 21 12:53:42 2014 +0200 @@ -82,6 +82,7 @@ # # viewMode templates viewer_text = PageTemplateFile('zpt/viewer/viewer_text', globals()) + viewer_hocr = PageTemplateFile('zpt/viewer/viewer_hocr', globals()) viewer_xml = PageTemplateFile('zpt/viewer/viewer_xml', globals()) viewer_image = PageTemplateFile('zpt/viewer/viewer_image', globals()) viewer_index = PageTemplateFile('zpt/viewer/viewer_index', globals()) @@ -164,7 +165,11 @@ # proxy text server methods to fulltextclient def getTextPage(self, **args): """returns full text content of page""" + return self.template.fulltextclient.getTextPage(**args) + + + def getSearchResults(self, **args): """loads list of search results and stores XML in docinfo""" @@ -239,7 +244,7 @@ show page @param url: url which contains display information @param mode: defines how to access the document behind url - @param viewMode: 'image': display images, 'text': display text, 'xml': display xml, default is 'auto' + @param viewMode: 'image': display images, 'text': display text, 'xml': display xml, default is 'auto', 'hocr' : hocr format @param viewLayer: sub-type of viewMode, e.g. layer 'dict' for viewMode='text' @param tocMode: type of 'table of contents' for navigation (thumbs, text, figures, none) """ @@ -287,6 +292,9 @@ # legacy fix viewMode = 'image' self.REQUEST['viewMode'] = 'image' + + + # safe viewLayer in userinfo userinfo['viewLayer'] = viewLayer @@ -532,6 +540,23 @@ docUrl = getParentPath(url) metaDom = self.metadataService.getDomFromPathOrUrl(docUrl) docinfo['imagePath'] = url.replace('/mpiwg/online', '', 1) + + elif mode=="hocr": + # url points to folder with images, index.meta optional + # asssume index.meta in parent dir + docUrl = getParentPath(url) + metaDom = self.metadataService.getDomFromPathOrUrl(docUrl) + docinfo['imagePath'] = url.replace('/mpiwg/online', '', 1) + docinfo['textURLPath'] = url.replace('/mpiwg/online', '', 1) + if docinfo.get("creator", None) is None: + docinfo['creator'] = "" + + if docinfo.get("title", None) is None: + docinfo['title'] = "" + + if docinfo.get("documentPath", None) is None: + docinfo['documentPath'] = url.replace('/mpiwg/online', '', 1) + docinfo['documentPath'] = url.replace('/pages', '', 1) elif mode=="filepath": # url points to image file, index.meta optional