Mercurial > hg > documentViewer

comparison documentViewer.py @ 477:17f0290b2327 elementtree

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small fixes.
author casties
date Wed, 10 Aug 2011 21:18:03 +0200
parents 1d93a8cb2d8f
children cd37d6f8d5e8
comparison
equal deleted inserted replaced
476:1d93a8cb2d8f 477:17f0290b2327
174 # assume MetaDataFolder instance is called metadata 174 # assume MetaDataFolder instance is called metadata
175 self.metadataService = getattr(self, 'metadata') 175 self.metadataService = getattr(self, 'metadata')
176 except Exception, e: 176 except Exception, e:
177 logging.error("Unable to find MetaDataFolder 'metadata': "+str(e)) 177 logging.error("Unable to find MetaDataFolder 'metadata': "+str(e))
178 178
179 if digilibBaseUrl is not None:
180 self.digilibBaseUrl = digilibBaseUrl
181
179 182
180 # proxy text server methods to fulltextclient 183 # proxy text server methods to fulltextclient
181 def getTextPage(self, **args): 184 def getTextPage(self, **args):
182 """get page""" 185 """get page"""
183 return self.template.fulltextclient.getTextPage(**args) 186 return self.template.fulltextclient.getTextPage(**args)
445 448
446 # new docinfo 449 # new docinfo
447 docinfo = {'mode': mode, 'url': url} 450 docinfo = {'mode': mode, 'url': url}
448 # add self url 451 # add self url
449 docinfo['viewerUrl'] = self.getDocumentViewerURL() 452 docinfo['viewerUrl'] = self.getDocumentViewerURL()
453 docinfo['digilibBaseUrl'] = self.digilibBaseUrl
450 # get index.meta DOM 454 # get index.meta DOM
451 docUrl = None 455 docUrl = None
452 metaDom = None 456 metaDom = None
453 if mode=="texttool": 457 if mode=="texttool":
454 # url points to document dir or index.meta 458 # url points to document dir or index.meta
513 docinfo['copyright'] = copyright 517 docinfo['copyright'] = copyright
514 #docinfo = self.getDocinfoFromAccess(docinfo, access) 518 #docinfo = self.getDocinfoFromAccess(docinfo, access)
515 519
516 # image path 520 # image path
517 if mode != 'texttool': 521 if mode != 'texttool':
518 # override image path from texttool 522 # override image path from texttool with url
519 docinfo['imagePath'] = url.replace('/mpiwg/online/', '', 1) 523 docinfo['imagePath'] = url.replace('/mpiwg/online/', '', 1)
524
525
520 526
521 # number of images from digilib 527 # number of images from digilib
522 if docinfo.get('imagePath', None): 528 if docinfo.get('imagePath', None):
523 docinfo['imageURL'] = self.digilibBaseUrl + "/servlet/Scaler?fn=" + docinfo['imagePath'] 529 docinfo['imageURL'] = self.digilibBaseUrl + "/servlet/Scaler?fn=" + docinfo['imagePath']
524 docinfo = self.getDocinfoFromDigilib(docinfo, docinfo['imagePath']) 530 docinfo = self.getDocinfoFromDigilib(docinfo, docinfo['imagePath'])