Changeset 570:61d53ccbdd70 in documentViewer
- Timestamp:
- Oct 12, 2012, 2:01:41 PM (12 years ago)
- Branch:
- default
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
MpdlXmlTextServer.py
r569 r570 119 119 doc = dom.find("document") 120 120 except Exception, e: 121 logging.error("getTextInfo: Error getting data: %s"%e)121 logging.error("getTextInfo: Error reading doc info: %s"%e) 122 122 return docinfo 123 123 … … 295 295 textParams['mode'] = textmode 296 296 297 # fetch the page 298 pagexml = self.getServerData("page-fragment.xql",urllib.urlencode(textParams)) 299 dom = ET.fromstring(pagexml) 297 try: 298 # fetch the page 299 pagexml = self.getServerData("page-fragment.xql",urllib.urlencode(textParams)) 300 dom = ET.fromstring(pagexml) 301 except Exception, e: 302 logging.error("getTextPage: Error reading page: %s"%e) 303 return None 304 300 305 # extract additional info 301 306 self.processPageInfo(dom, docinfo, pageinfo) -
MpiwgXmlTextServer.py
r568 r570 260 260 textParams['outputFormat'] = 'html' 261 261 262 # fetch the page263 pagexml = self.getServerData("query/GetPage",urllib.urlencode(textParams))264 262 try: 263 # fetch the page 264 pagexml = self.getServerData("query/GetPage",urllib.urlencode(textParams)) 265 265 dom = ET.fromstring(pagexml) 266 266 except Exception, e: 267 logging.error("Error parsing page: %s"%e)267 logging.error("Error reading page: %s"%e) 268 268 return None 269 269 -
zpt/viewer_text.zpt
r559 r570 55 55 <metal:block metal:use-macro="here/template/common_template/macros/page_ruler" /> 56 56 </div> 57 <div class="content text" tal:condition="textPage">57 <div class="content text"> 58 58 <div class="pageHeaderTitle" tal:condition="exists:pageinfo/pageHeaderTitle" 59 59 tal:content="structure pageinfo/pageHeaderTitle" /> 60 60 <tal:block tal:condition="textPage" tal:replace="structure textPage"/> 61 <div class="emptyPage" tal:condition="not:textPage">[E mptypage]</div>61 <div class="emptyPage" tal:condition="not:textPage">[Error: no page]</div> 62 62 </div> 63 63 </div>
Note: See TracChangeset
for help on using the changeset viewer.