--- documentViewer/documentViewer.py 2010/10/15 14:26:20 1.124 +++ documentViewer/documentViewer.py 2010/12/20 13:52:07 1.161 @@ -18,7 +18,7 @@ import math import urlparse import cStringIO import re - +import string def logger(txt,method,txt2): """logging""" @@ -51,15 +51,32 @@ def serializeNode(node, encoding='utf-8' buf.close() return s -def getBrowserType(self): - """get browser type object""" - if self.REQUEST.SESSION.has_key('browserType'): - return self.REQUEST.SESSION['browserType'] - else: - bt = browserCheck(self) - self.REQUEST.SESSION.set('browserType', bt) - logging.debug("documentViewer (BROWSER TYPE) bt %s"%bt) - return bt +def browserCheck(self): + """check the browsers request to find out the browser type""" + bt = {} + ua = self.REQUEST.get_header("HTTP_USER_AGENT") + bt['ua'] = ua + bt['isIE'] = False + bt['isN4'] = False + if string.find(ua, 'MSIE') > -1: + bt['isIE'] = True + else: + bt['isN4'] = (string.find(ua, 'Mozilla/4.') > -1) + + try: + nav = ua[string.find(ua, '('):] + ie = string.split(nav, "; ")[1] + if string.find(ie, "MSIE") > -1: + bt['versIE'] = string.split(ie, " ")[1] + except: pass + + bt['isMac'] = string.find(ua, 'Macintosh') > -1 + bt['isWin'] = string.find(ua, 'Windows') > -1 + bt['isIEWin'] = bt['isIE'] and bt['isWin'] + bt['isIEMac'] = bt['isIE'] and bt['isMac'] + bt['staticHTML'] = False + + return bt def getParentDir(path): @@ -130,10 +147,12 @@ class documentViewer(Folder): toc_text = PageTemplateFile('zpt/toc_text', globals()) toc_figures = PageTemplateFile('zpt/toc_figures', globals()) page_main_images = PageTemplateFile('zpt/page_main_images', globals()) + page_main_double = PageTemplateFile('zpt/page_main_double', globals()) page_main_text = PageTemplateFile('zpt/page_main_text', globals()) page_main_text_dict = PageTemplateFile('zpt/page_main_text_dict', globals()) page_main_gis =PageTemplateFile ('zpt/page_main_gis', globals()) page_main_xml = PageTemplateFile('zpt/page_main_xml', globals()) + page_main_pureXml = PageTemplateFile('zpt/page_main_pureXml', globals()) head_main = PageTemplateFile('zpt/head_main', globals()) docuviewer_css = PageTemplateFile('css/docuviewer.css', globals()) info_xml = PageTemplateFile('zpt/info_xml', globals()) @@ -181,7 +200,19 @@ class documentViewer(Folder): def getQuery(self, **args): """get query""" return self.template.fulltextclient.getQuery(**args) - + + def getQueryResultHits(self, **args): + """get query""" + return self.template.fulltextclient.getQueryResultHits(**args) + + def getQueryResultHitsText(self, **args): + """get query""" + return self.template.fulltextclient.getQueryResultHitsText(**args) + + def getQueryResultHitsFigures(self, **args): + """get query""" + return self.template.fulltextclient.getQueryResultHitsFigures(**args) + def getSearch(self, **args): """get search""" return self.template.fulltextclient.getSearch(**args) @@ -198,6 +229,18 @@ class documentViewer(Folder): """get original page number """ return self.template.fulltextclient.getOrigPages(**args) + def getAllPlaces(self, **args): + """get original page number """ + return self.template.fulltextclient.getAllPlaces(**args) + + def getTocEntries(self, **args): + """get original page number """ + return self.template.fulltextclient.getTocEntries(**args) + + def getFigureEntries(self, **args): + """get original page number """ + return self.template.fulltextclient.getFigureEntries(**args) + def getNumPages(self, docinfo): """get numpages""" return self.template.fulltextclient.getNumPages(docinfo) @@ -243,11 +286,13 @@ class documentViewer(Folder): self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary" docinfo = self.getDocinfo(mode=mode,url=url) - pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo) + #pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo) + pageinfo = self.getPageinfo(start=start,current=pn, docinfo=docinfo) + ''' ZDES ''' pt = getattr(self.template, 'thumbs_main_rss') if viewMode=="auto": # automodus gewaehlt - if docinfo.has_key("textURL") or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert + if docinfo.has_key("textURL") or docinfo.get('textURLPath',None): #texturl gesetzt und textViewer konfiguriert viewMode="text" else: viewMode="images" @@ -255,7 +300,7 @@ class documentViewer(Folder): return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode) security.declareProtected('View','index_html') - def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None, query=None, querySearch=None, characterNormalization=""): + def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None): ''' view it @param mode: defines how to access the document behind url @@ -283,12 +328,12 @@ class documentViewer(Folder): docinfo = self.getToc(mode=tocMode, docinfo=docinfo) if viewMode=="auto": # automodus gewaehlt - if docinfo.has_key('textURL') or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert + if docinfo.has_key('textURL') or docinfo.get('textURLPath',None): #texturl gesetzt und textViewer konfiguriert viewMode="text_dict" else: viewMode="images" - pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo,viewMode=viewMode,tocMode=tocMode) + pageinfo = self.getPageinfo(start=start,current=pn, docinfo=docinfo,viewMode=viewMode,tocMode=tocMode) pt = getattr(self.template, 'viewer_main') return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=self.generateMarks(mk)) @@ -302,8 +347,14 @@ class documentViewer(Folder): for m in mk: ret+="mk=%s"%m return ret - - + + + def getBrowser(self): + """getBrowser the version of browser """ + names="" + names = browserCheck(self) + return names + def findDigilibUrl(self): """try to get the digilib URL from zogilib""" url = self.template.zogilib.getDLBaseUrl() @@ -367,6 +418,20 @@ class documentViewer(Folder): pt = getattr(self.template, 'info_xml') return pt(docinfo=docinfo) + def getOptionToggle(self, newState=None, optionName='text_options_open', initialState=True): + """returns new option state""" + if not self.REQUEST.SESSION.has_key(optionName): + # not in session -- initial + opt = {'lastState': newState, 'state': initialState} + else: + opt = self.REQUEST.SESSION.get(optionName) + if opt['lastState'] != newState: + # state in session has changed -- toggle + opt['state'] = not opt['state'] + opt['lastState'] = newState + + self.REQUEST.SESSION[optionName] = opt + return opt['state'] def isAccessible(self, docinfo): """returns if access to the resource is granted""" @@ -568,17 +633,9 @@ class documentViewer(Folder): for x in range(cut): path=getParentDir(path) dom = self.getDomFromIndexMeta(path) - - #docinfo['indexMetaPath']=self.getIndexMetaPath(path); - - #result= dom.xpath("//result/resultPage") - #docinfo['numPages']=int(getTextFromNode(result[0])) - - #result =dom.xpath("//name") + docinfo['name']=getTextFromNode(dom.xpath("/resource/name")[0]) logging.debug("documentViewer docinfo[name] %s"%docinfo['name']) - - #logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype) return docinfo def getDocinfoFromTextTool(self, url, dom=None, docinfo=None): @@ -669,6 +726,7 @@ class documentViewer(Folder): docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag docinfo = self.getNameFromIndexMeta(url, docinfo=docinfo, dom=dom) + if presentationUrls and (len(presentationUrls) > 0): # ueberschreibe diese durch presentation informationen # presentation url ergiebt sich ersetzen von index.meta in der url der fuer die Metadaten # durch den relativen Pfad auf die presentation infos @@ -746,16 +804,21 @@ class documentViewer(Folder): else: logging.error("documentViewer (getdocinfo) unknown mode: %s!"%mode) raise ValueError("Unknown mode %s! Has to be one of 'texttool','imagepath','filepath'."%(mode)) - + + # FIXME: fake texturlpath + if not docinfo.has_key('textURLPath'): + docinfo['textURLPath'] = None + logging.debug("documentViewer (getdocinfo) docinfo: %s"%docinfo) + #logging.debug("documentViewer (getdocinfo) docinfo: %s"%) self.REQUEST.SESSION['docinfo'] = docinfo return docinfo - def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None,characterNormalization=""): + def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None): """returns pageinfo with the given parameters""" pageinfo = {} current = getInt(current) - #pageinfo ['originalPage'] = originalPage + pageinfo['current'] = current rows = int(rows or self.thumbrows) pageinfo['rows'] = rows @@ -775,10 +838,10 @@ class documentViewer(Folder): pageinfo['numgroups'] += 1 pageinfo['viewMode'] = viewMode pageinfo['tocMode'] = tocMode - #pageinfo['characterNormalization'] =characterNormalization - pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization',' ') - pageinfo['query'] = self.REQUEST.get('query',' ') - pageinfo['queryType'] = self.REQUEST.get('queryType',' ') + pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','reg') + pageinfo['optionToggle'] = self.REQUEST.get('optionToggle','') + pageinfo['query'] = self.REQUEST.get('query','') + pageinfo['queryType'] = self.REQUEST.get('queryType','') pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext') pageinfo['textPN'] = self.REQUEST.get('textPN','1') pageinfo['highlightQuery'] = self.REQUEST.get('highlightQuery','')