Changeset 162:e6f0553ad176 in documentViewer for MpdlXmlTextServer.py
- Timestamp:
- Aug 24, 2010, 10:47:37 AM (14 years ago)
- Branch:
- default
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
MpdlXmlTextServer.py
r161 r162 138 138 viewMode= pageinfo['viewMode'] 139 139 tocMode = pageinfo['tocMode'] 140 characterNormalization = pageinfo ['characterNormalization']140 #characterNormalization = pageinfo ['characterNormalization'] 141 141 tocPN = pageinfo['tocPN'] 142 142 selfurl = self.absolute_url() … … 145 145 else: 146 146 textmode = mode 147 logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization))147 #logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization)) 148 148 textParam = "document=%s&mode=%s&pn=%s"%(docpath,textmode,pn) 149 149 if highlightQuery is not None: … … 166 166 href= hrefNode.nodeValue 167 167 if href.startswith('#note-'): 168 hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=%s&tocMode=%s& characterNormalization=%s&tocPN=%s&pn=%s#note-"%(url,viewMode,tocMode,characterNormalization,tocPN,pn))168 hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%s#note-"%(url,viewMode,tocMode,tocPN,pn)) 169 169 return serializeNode(pagenode) 170 170 if mode == "xml": … … 216 216 l.setAttributeNS(None, 'onClick', 'popupWin.focus();') 217 217 if href.startswith('#note-'): 218 hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=%s&tocMode=%s& characterNormalization=%s&tocPN=%s&pn=%s#note-"%(url,viewMode,tocMode,characterNormalization,tocPN,pn))218 hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%s#note-"%(url,viewMode,tocMode,tocPN,pn)) 219 219 return serializeNode(pagenode) 220 220 return "no text here" … … 303 303 selfurl = self.absolute_url() 304 304 viewMode= pageinfo['viewMode'] 305 characterNormalization =pageinfo ['characterNormalization']305 #characterNormalization =pageinfo ['characterNormalization'] 306 306 tocMode = pageinfo['tocMode'] 307 307 tocPN = pageinfo['tocPN'] 308 308 309 309 data = self.getServerData("doc-query.xql","document=%s&queryType=%s&queryResultPageSize=%s&queryResultPN=%s"%(docpath,queryType, pagesize, pn)) 310 311 page = data.replace('page-fragment.xql?document=%s'%str(path),'%s?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&characterNormalization=%s'%(selfurl,url, viewMode, tocMode, tocPN, characterNormalization)) 310 page = data.replace('page-fragment.xql?document=%s'%str(path),'%s?url=%s&viewMode=%s&tocMode=%s&tocPN=%s'%(selfurl,url, viewMode, tocMode, tocPN)) 312 311 text = page.replace('mode=image','mode=texttool') 313 logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization))314 logging.debug("documentViewer (characterNormalization) text: %s"%(text))312 #logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization)) 313 #logging.debug("documentViewer (characterNormalization) text: %s"%(text)) 315 314 return text 316 315
Note: See TracChangeset
for help on using the changeset viewer.