Mercurial > hg > documentViewer

comparison documentViewer.py @ 338:0576f524e2ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author abukhman
date Mon, 18 Oct 2010 12:08:59 +0200
parents ee5e36c5a700
children 3cd6cb5e1e24
comparison
equal deleted inserted replaced
337:ee5e36c5a700 338:0576f524e2ee
241 241
242 if not self.digilibBaseUrl: 242 if not self.digilibBaseUrl:
243 self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary" 243 self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary"
244 244
245 docinfo = self.getDocinfo(mode=mode,url=url) 245 docinfo = self.getDocinfo(mode=mode,url=url)
246 pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo) 246 #pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo)
247 #pageinfo = self.getPageinfo(start=start,current=pn, originalPage=originalPage, docinfo=docinfo) 247 pageinfo = self.getPageinfo(start=start,current=pn, originalPage=originalPage, docinfo=docinfo)
248 ''' ZDES ''' 248 ''' ZDES '''
249 pt = getattr(self.template, 'thumbs_main_rss') 249 pt = getattr(self.template, 'thumbs_main_rss')
250 250
251 if viewMode=="auto": # automodus gewaehlt 251 if viewMode=="auto": # automodus gewaehlt
252 if docinfo.has_key("textURL") or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert 252 if docinfo.has_key("textURL") or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert
288 if docinfo.has_key('textURL') or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert 288 if docinfo.has_key('textURL') or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert
289 viewMode="text_dict" 289 viewMode="text_dict"
290 else: 290 else:
291 viewMode="images" 291 viewMode="images"
292 292
293 pageinfo = self.getPageinfo(start=start,current=pn, docinfo=docinfo,viewMode=viewMode,tocMode=tocMode) 293 pageinfo = self.getPageinfo(start=start,current=pn, docinfo=docinfo,viewMode=viewMode,tocMode=tocMode, originalPage=originalPage)
294 294
295 pt = getattr(self.template, 'viewer_main') 295 pt = getattr(self.template, 'viewer_main')
296 return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=self.generateMarks(mk)) 296 return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=self.generateMarks(mk))
297 297
298 def generateMarks(self,mk): 298 def generateMarks(self,mk):
660 docinfo = self.getNumTextPages(docinfo) 660 docinfo = self.getNumTextPages(docinfo)
661 661
662 presentationUrls = dom.xpath("//texttool/presentation") 662 presentationUrls = dom.xpath("//texttool/presentation")
663 docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag 663 docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag
664 docinfo = self.getNameFromIndexMeta(url, docinfo=docinfo, dom=dom) 664 docinfo = self.getNameFromIndexMeta(url, docinfo=docinfo, dom=dom)
665 docinfo =self.getOrigPages(docinfo=docinfo) 665 #docinfo =self.getOrigPages(docinfo=docinfo)
666 666
667 if presentationUrls and (len(presentationUrls) > 0): # ueberschreibe diese durch presentation informationen 667 if presentationUrls and (len(presentationUrls) > 0): # ueberschreibe diese durch presentation informationen
668 # presentation url ergiebt sich ersetzen von index.meta in der url der fuer die Metadaten 668 # presentation url ergiebt sich ersetzen von index.meta in der url der fuer die Metadaten
669 # durch den relativen Pfad auf die presentation infos 669 # durch den relativen Pfad auf die presentation infos
670 presentationPath = getTextFromNode(presentationUrls[0]) 670 presentationPath = getTextFromNode(presentationUrls[0])
744 744
745 logging.debug("documentViewer (getdocinfo) docinfo: %s"%docinfo) 745 logging.debug("documentViewer (getdocinfo) docinfo: %s"%docinfo)
746 self.REQUEST.SESSION['docinfo'] = docinfo 746 self.REQUEST.SESSION['docinfo'] = docinfo
747 return docinfo 747 return docinfo
748 748
749 def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None,characterNormalization=""): 749 def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None,characterNormalization="", originalPage=None):
750 """returns pageinfo with the given parameters""" 750 """returns pageinfo with the given parameters"""
751 pageinfo = {} 751 pageinfo = {}
752 current = getInt(current) 752 current = getInt(current)
753 #pageinfo ['originalPage'] = originalPage 753
754 pageinfo ['originalPage'] = originalPage
754 pageinfo['current'] = current 755 pageinfo['current'] = current
755 rows = int(rows or self.thumbrows) 756 rows = int(rows or self.thumbrows)
756 pageinfo['rows'] = rows 757 pageinfo['rows'] = rows
757 cols = int(cols or self.thumbcols) 758 cols = int(cols or self.thumbcols)
758 pageinfo['cols'] = cols 759 pageinfo['cols'] = cols