Changeset 455:0a53fea83df7 in documentViewer for documentViewer.py
- Timestamp:
- Jul 15, 2011, 7:34:41 PM (13 years ago)
- Branch:
- elementtree
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
documentViewer.py
r454 r455 355 355 # get table of contents 356 356 docinfo = self.getToc(mode=tocMode, docinfo=docinfo) 357 358 if viewMode=="auto": # automodus gewaehlt 359 if docinfo.has_key('textURL') or docinfo.get('textURLPath',None): #texturl gesetzt und textViewer konfiguriert 357 358 # auto viewMode: text_dict if text else images 359 if viewMode=="auto": 360 if docinfo.get('textURL', None) or docinfo.get('textURLPath', None): 361 #texturl gesetzt und textViewer konfiguriert 360 362 viewMode="text_dict" 361 363 else: 362 364 viewMode="images" 363 365 364 pageinfo = self.getPageinfo(start=start,current=pn, docinfo=docinfo,viewMode=viewMode,tocMode=tocMode) 365 366 if (docinfo.get('textURLPath',None)): 367 page = self.getTextPage(mode=viewMode, docinfo=docinfo, pageinfo=pageinfo) 366 pageinfo = self.getPageinfo(start=start, current=pn, docinfo=docinfo, viewMode=viewMode, tocMode=tocMode) 367 368 if viewMode != 'images' and docinfo.get('textURLPath', None): 369 # get full text page 370 page = self.getTextPage(mode=viewMode, pn=pn, docinfo=docinfo, pageinfo=pageinfo) 368 371 pageinfo['textPage'] = page 369 tt = getattr(self, 'template') 370 pt = getattr(tt, 'viewer_main') 371 return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=self.generateMarks(mk)) 372 373 # get template /template/viewer_main 374 pt = getattr(self.template, 'viewer_main') 375 # and execute with parameters 376 return pt(docinfo=docinfo, pageinfo=pageinfo, viewMode=viewMode, mk=self.generateMarks(mk)) 372 377 373 378 def generateMarks(self,mk): … … 867 872 # check if its still current 868 873 if docinfo is not None and docinfo.get('mode') == mode and docinfo.get('url') == url: 869 logging.debug("documentViewer (getdocinfo) docinfo in session : %s"%docinfo)874 logging.debug("documentViewer (getdocinfo) docinfo in session. keys=%s"%docinfo.keys()) 870 875 return docinfo 876 871 877 # new docinfo 872 878 docinfo = {'mode': mode, 'url': url} 873 if mode=="texttool": #index.meta with texttool information 879 # add self url 880 docinfo['viewerUrl'] = self.getDocumentViewerURL() 881 if mode=="texttool": 882 # index.meta with texttool information 874 883 docinfo = self.getDocinfoFromTextTool(url, docinfo=docinfo) 875 884 elif mode=="imagepath": 885 # folder with images, index.meta optional 876 886 docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo) 877 887 elif mode=="filepath": 888 # filename 878 889 docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo,cut=1) 879 890 else:
Note: See TracChangeset
for help on using the changeset viewer.