Mercurial > hg > documentViewer
diff documentViewer.py @ 532:0b8bed1223ad
new layout and styles.
author | casties |
---|---|
date | Wed, 25 Jul 2012 21:28:31 +0200 |
parents | 5c7433c2515c |
children | 510bae2b593b |
line wrap: on
line diff
--- a/documentViewer.py Thu Jul 05 12:08:58 2012 +0200 +++ b/documentViewer.py Wed Jul 25 21:28:31 2012 +0200 @@ -143,7 +143,7 @@ common_template = PageTemplateFile('zpt/common_template', globals()) info_xml = PageTemplateFile('zpt/info_xml', globals()) docuviewer_css = ImageFile('css/docuviewer.css',globals()) - # make ImageFile better for development + # make docuviewer_css refreshable for development docuviewer_css.index_html = refreshingImageFileIndexHtml jquery_js = ImageFile('js/jquery.js',globals()) @@ -576,13 +576,21 @@ # image path if mode != 'texttool': - # override image path from texttool with url TODO: how about mode=auto? + # override image path from texttool with url parameter TODO: how about mode=auto? docinfo['imagePath'] = url.replace('/mpiwg/online/', '', 1) # number of images from digilib if docinfo.get('imagePath', None): docinfo['imageURL'] = self.digilibBaseUrl + "/servlet/Scaler?fn=" + docinfo['imagePath'] docinfo = self.getDocinfoFromDigilib(docinfo, docinfo['imagePath']) + else: + # imagePath still missing? try "./pageimg" + imgPath = os.path.join(docUrl, 'pageimg') + docinfo = self.getDocinfoFromDigilib(docinfo, imgPath) + if docinfo.get('numPages', 0) > 0: + # there are pages + docinfo['imagePath'] = imgPath + docinfo['imageURL'] = self.digilibBaseUrl + "/servlet/Scaler?fn=" + docinfo['imagePath'] # check numPages if docinfo.get('numPages', 0) == 0: @@ -662,7 +670,6 @@ docinfo['presentationUrl'] = presentation else: docinfo['presentationUrl'] = os.path.join(docPath, presentation) - return docinfo