Changeset 409:f7d73ea4b38b in documentViewer

Timestamp:

Nov 25, 2010, 9:03:50 AM (13 years ago)

Author:

casties

Branch:

default

Message:

quick fix for broken texturlpath

Files:

• MpdlXmlTextServer.py (modified) (2 diffs)
• documentViewer.py (modified) (3 diffs)

MpdlXmlTextServer.py

@@ -144 +144 @@
         """ Show all Gis Places of whole Page"""
         xpath='//place'
-        docpath = docinfo['textURLPath'] 
+        docpath = docinfo.get('textURLPath',None)
+        if not docpath:
+            return None
+
         url = docinfo['url']
         selfurl = self.absolute_url()
@@ -199 +202 @@
     def getOrigPages (self, docinfo=None, pageinfo=None):
         """Show original page """
-        docpath = docinfo['textURLPath'] 
+        docpath = docinfo.get('textURLPath',None)
+        if not docpath:
+            return None
+
         logging.debug ("docinfo['textURLPath']=%s"%(docinfo['textURLPath']))
         #url = docinfo['url']

documentViewer.py

@@ -284 +284 @@
         
         if viewMode=="auto": # automodus gewaehlt
-            if docinfo.has_key("textURL") or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert
+            if docinfo.has_key("textURL") or docinfo.get('textURLPath',None): #texturl gesetzt und textViewer konfiguriert
                 viewMode="text"
             else:
@@ -320 +320 @@
             
         if viewMode=="auto": # automodus gewaehlt
-            if docinfo.has_key('textURL') or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert
+            if docinfo.has_key('textURL') or docinfo.get('textURLPath',None): #texturl gesetzt und textViewer konfiguriert
                 viewMode="text_dict"
             else:
@@ -797 +797 @@
             logging.error("documentViewer (getdocinfo) unknown mode: %s!"%mode)
             raise ValueError("Unknown mode %s! Has to be one of 'texttool','imagepath','filepath'."%(mode))
-                        
+                
+        # FIXME: fake texturlpath 
+        if not docinfo.has_key('textURLPath'):
+            docinfo['textURLPath'] = None
+        
         logging.debug("documentViewer (getdocinfo) docinfo: %s"%docinfo)
         #logging.debug("documentViewer (getdocinfo) docinfo: %s"%)