Changeset 570:61d53ccbdd70 in documentViewer

Timestamp:

Oct 12, 2012, 2:01:41 PM (12 years ago)

Author:

casties

Branch:

default

Message:

more resilience to server errors.

Files:

• MpdlXmlTextServer.py (modified) (2 diffs)
• MpiwgXmlTextServer.py (modified) (1 diff)
• zpt/viewer_text.zpt (modified) (1 diff)

MpdlXmlTextServer.py

@@ -119 +119 @@
             doc = dom.find("document")
         except Exception, e:
-            logging.error("getTextInfo: Error getting data: %s"%e)
+            logging.error("getTextInfo: Error reading doc info: %s"%e)
             return docinfo
             
@@ -295 +295 @@
         textParams['mode'] = textmode
         
-        # fetch the page
-        pagexml = self.getServerData("page-fragment.xql",urllib.urlencode(textParams))
-        dom = ET.fromstring(pagexml)
+        try:
+            # fetch the page
+            pagexml = self.getServerData("page-fragment.xql",urllib.urlencode(textParams))
+            dom = ET.fromstring(pagexml)
+        except Exception, e:
+            logging.error("getTextPage: Error reading page: %s"%e)
+            return None
+            
         # extract additional info
         self.processPageInfo(dom, docinfo, pageinfo)

MpiwgXmlTextServer.py

@@ -260 +260 @@
             textParams['outputFormat'] = 'html'
         
-        # fetch the page
-        pagexml = self.getServerData("query/GetPage",urllib.urlencode(textParams))
         try:
+            # fetch the page
+            pagexml = self.getServerData("query/GetPage",urllib.urlencode(textParams))
             dom = ET.fromstring(pagexml)
         except Exception, e:
-            logging.error("Error parsing page: %s"%e)
+            logging.error("Error reading page: %s"%e)
             return None
         

zpt/viewer_text.zpt

@@ -55 +55 @@
           <metal:block metal:use-macro="here/template/common_template/macros/page_ruler" />
         </div>
-        <div class="content text" tal:condition="textPage">
+        <div class="content text">
           <div class="pageHeaderTitle" tal:condition="exists:pageinfo/pageHeaderTitle"
             tal:content="structure pageinfo/pageHeaderTitle" />
           <tal:block tal:condition="textPage" tal:replace="structure textPage"/>
-          <div class="emptyPage" tal:condition="not:textPage">[Empty page]</div>
+          <div class="emptyPage" tal:condition="not:textPage">[Error: no page]</div>
         </div>
       </div>