Changeset 334:a8fb29c62b47 in documentViewer
- Timestamp:
- Oct 18, 2010, 9:54:40 AM (14 years ago)
- Branch:
- default
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
MpdlXmlTextServer.py
r331 r334 192 192 if len(pagedivs)>0: 193 193 docinfo['originalPage'] = getTextFromNode(pagedivs[0]) 194 return docinfo['originalPage']194 #return docinfo['originalPage'] 195 195 #return originalPage 196 196 return docinfo 197 197 198 def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""): 198 199 """returns single page from fulltext""" -
documentViewer.py
r333 r334 244 244 245 245 docinfo = self.getDocinfo(mode=mode,url=url) 246 #pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo)247 pageinfo = self.getPageinfo(start=start,current=pn, originalPage=originalPage, docinfo=docinfo)246 pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo) 247 #pageinfo = self.getPageinfo(start=start,current=pn, originalPage=originalPage, docinfo=docinfo) 248 248 ''' ZDES ''' 249 249 pt = getattr(self.template, 'thumbs_main_rss') … … 258 258 259 259 security.declareProtected('View','index_html') 260 def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None, query=None, querySearch=None, characterNormalization="" , originalPage=None):260 def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None, query=None, querySearch=None, characterNormalization=""): 261 261 ''' 262 262 view it … … 663 663 docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag 664 664 docinfo = self.getNameFromIndexMeta(url, docinfo=docinfo, dom=dom) 665 docinfo =self.getOrigPages(docinfo=None, pageinfo=None) 665 666 666 667 if presentationUrls and (len(presentationUrls) > 0): # ueberschreibe diese durch presentation informationen … … 746 747 return docinfo 747 748 748 def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None,characterNormalization="" ,originalPage=originalPage):749 def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None,characterNormalization=""): 749 750 """returns pageinfo with the given parameters""" 750 751 pageinfo = {} 751 752 current = getInt(current) 752 pageinfo ['originalPage'] = originalPage753 #pageinfo ['originalPage'] = originalPage 753 754 pageinfo['current'] = current 754 755 rows = int(rows or self.thumbrows)
Note: See TracChangeset
for help on using the changeset viewer.