--- documentViewer/documentViewer.py 2010/12/22 11:54:46 1.162 +++ documentViewer/documentViewer.py 2011/02/24 13:55:28 1.169 @@ -58,17 +58,51 @@ def browserCheck(self): bt['ua'] = ua bt['isIE'] = False bt['isN4'] = False + bt['versFirefox']="" + bt['versIE']="" + bt['versSafariChrome']="" + bt['versOpera']="" + if string.find(ua, 'MSIE') > -1: bt['isIE'] = True else: bt['isN4'] = (string.find(ua, 'Mozilla/4.') > -1) - + # Safari oder Chrome identification + try: + nav = ua[string.find(ua, '('):] + nav1=ua[string.find(ua,')'):] + nav2=nav1[string.find(nav1,'('):] + nav3=nav2[string.find(nav2,')'):] + ie = string.split(nav, "; ")[1] + ie1 =string.split(nav1, " ")[2] + ie2 =string.split(nav3, " ")[1] + ie3 =string.split(nav3, " ")[2] + if string.find(ie3, "Safari") >-1: + bt['versSafariChrome']=string.split(ie2, "/")[1] + except: pass + # IE identification 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 + except:pass + # Firefox identification + try: + nav = ua[string.find(ua, '('):] + nav1=ua[string.find(ua,')'):] + if string.find(ie1, "Firefox") >-1: + nav5= string.split(ie1, "/")[1] + logging.debug("FIREFOX: %s"%(nav5)) + bt['versFirefox']=nav5[0:3] + except:pass + #Opera identification + try: + if string.find(ua,"Opera") >-1: + nav = ua[string.find(ua, '('):] + nav1=nav[string.find(nav,')'):] + bt['versOpera']=string.split(nav1,"/")[2] + except:pass bt['isMac'] = string.find(ua, 'Macintosh') > -1 bt['isWin'] = string.find(ua, 'Windows') > -1 @@ -196,23 +230,11 @@ class documentViewer(Folder): def getTextPage(self, **args): """get page""" return self.template.fulltextclient.getTextPage(**args) - + def getQuery(self, **args): - """get query""" + """get query in search""" 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) @@ -224,31 +246,7 @@ class documentViewer(Folder): def getAllGisPlaces(self, **args): """get all gis places """ return self.template.fulltextclient.getAllGisPlaces(**args) - - def getOrigPages(self, **args): - """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) - - def getNumTextPages(self, docinfo): - """get numpages text""" - return self.template.fulltextclient.getNumTextPages(docinfo) - + def getTranslate(self, **args): """get translate""" return self.template.fulltextclient.getTranslate(**args) @@ -335,7 +333,11 @@ class documentViewer(Folder): pageinfo = self.getPageinfo(start=start,current=pn, docinfo=docinfo,viewMode=viewMode,tocMode=tocMode) - pt = getattr(self.template, 'viewer_main') + if (docinfo.get('textURLPath',None)): + page = self.getTextPage(docinfo=docinfo, pageinfo=pageinfo) + pageinfo['textPage'] = page + tt = getattr(self, 'template') + pt = getattr(tt, 'viewer_main') return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=self.generateMarks(mk)) def generateMarks(self,mk): @@ -352,6 +354,7 @@ class documentViewer(Folder): def getBrowser(self): """getBrowser the version of browser """ bt = browserCheck(self) + logging.debug("BROWSER VERSION: %s"%(bt)) return bt def findDigilibUrl(self): @@ -626,7 +629,46 @@ class documentViewer(Folder): docinfo['lang']=getTextFromNode(dom.xpath("//bib/lang")[0]) except: docinfo['lang']='' - + try: + docinfo['city']=getTextFromNode(dom.xpath("//bib/city")[0]) + except: + docinfo['city']='' + try: + docinfo['number_of_pages']=getTextFromNode(dom.xpath("//bib/number_of_pages")[0]) + except: + docinfo['number_of_pages']='' + try: + docinfo['series_volume']=getTextFromNode(dom.xpath("//bib/series_volume")[0]) + except: + docinfo['series_volume']='' + try: + docinfo['number_of_volumes']=getTextFromNode(dom.xpath("//bib/number_of_volumes")[0]) + except: + docinfo['number_of_volumes']='' + try: + docinfo['translator']=getTextFromNode(dom.xpath("//bib/translator")[0]) + except: + docinfo['translator']='' + try: + docinfo['edition']=getTextFromNode(dom.xpath("//bib/edition")[0]) + except: + docinfo['edition']='' + try: + docinfo['series_author']=getTextFromNode(dom.xpath("//bib/series_author")[0]) + except: + docinfo['series_author']='' + try: + docinfo['publisher']=getTextFromNode(dom.xpath("//bib/publisher")[0]) + except: + docinfo['publisher']='' + try: + docinfo['series_title']=getTextFromNode(dom.xpath("//bib/series_title")[0]) + except: + docinfo['series_title']='' + try: + docinfo['isbn_issn']=getTextFromNode(dom.xpath("//bib/isbn_issn")[0]) + except: + docinfo['isbn_issn']='' return docinfo @@ -724,9 +766,12 @@ class documentViewer(Folder): if textUrls and (len(textUrls) > 0): textUrl = getTextFromNode(textUrls[0]) docinfo['textURLPath'] = textUrl - if not docinfo['imagePath']: + textUrlkurz = string.split(textUrl, ".")[0] + docinfo['textURLPathkurz'] = textUrlkurz + #if not docinfo['imagePath']: # text-only, no page images - docinfo = self.getNumTextPages(docinfo) + #docinfo = self.getNumTextPages(docinfo) + presentationUrls = dom.xpath("//texttool/presentation") docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag @@ -854,6 +899,7 @@ class documentViewer(Folder): pageinfo['tocPageSize'] = self.REQUEST.get('tocPageSize', '30') pageinfo['queryPageSize'] =self.REQUEST.get('queryPageSize', '10') pageinfo['tocPN'] = self.REQUEST.get('tocPN', '1') + toc = int (pageinfo['tocPN']) pageinfo['textPages'] =int (toc)