--- documentViewer/documentViewer.py 2010/06/16 18:46:29 1.69.2.9 +++ documentViewer/documentViewer.py 2010/06/28 10:37:12 1.69.2.13 @@ -7,6 +7,7 @@ from AccessControl import getSecurityMan from Globals import package_home from Ft.Xml import EMPTY_NAMESPACE, Parse +from Ft.Xml.Domlette import PrettyPrint, Print import os.path import sys import urllib @@ -216,7 +217,7 @@ class documentViewer(Folder): pt = getattr(self.template, 'thumbs_main_rss') if viewMode=="auto": # automodus gewaehlt - if docinfo.get("textURL",'') and self.textViewerUrl: #texturl gesetzt und textViewer konfiguriert + if docinfo.has_key("textURL") or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert viewMode="text" else: viewMode="images" @@ -252,7 +253,7 @@ class documentViewer(Folder): docinfo = self.getToc(mode=tocMode, docinfo=docinfo) if viewMode=="auto": # automodus gewaehlt - if docinfo.get("textURL",''): #texturl gesetzt und textViewer konfiguriert + if docinfo.has_key("textURL") or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert viewMode="text_dict" else: viewMode="images" @@ -567,7 +568,8 @@ class documentViewer(Folder): if viewerUrls and (len(viewerUrls) > 0): viewerUrl = getTextFromNode(viewerUrls[0]) docinfo['viewerURL'] = viewerUrl - + + # old style text URL textUrls = dom.xpath("//texttool/text") if textUrls and (len(textUrls) > 0): textUrl = getTextFromNode(textUrls[0]) @@ -579,6 +581,7 @@ class documentViewer(Folder): docinfo['textURL'] = textUrl + # new style text-url-path textUrls = dom.xpath("//texttool/text-url-path") if textUrls and (len(textUrls) > 0): textUrl = getTextFromNode(textUrls[0]) @@ -718,6 +721,12 @@ class documentViewer(Folder): pageinfo['searchPN'] =self.REQUEST.get('searchPN','1') pageinfo['sn'] =self.REQUEST.get('sn','') return pageinfo + + def getOverview(self, mode="text" , docinfo=None, pageinfo=None, url=None, viewMode="auto", start=None,pn=1,textURLPath="auto", **args): + """overview mode all thumbnails in one window""" + docinfo = self.getDocinfo(mode=mode,url=url) + pageinfo = self.getPageinfo(current=pn,docinfo=docinfo) + return (docinfo, pageinfo, viewMode) def changeDocumentViewer(self,title="",digilibBaseUrl=None,thumbrows=2,thumbcols=5,authgroups='mpiwg',RESPONSE=None): """init document viewer"""