# HG changeset patch
# User casties
# Date 1276715082 -7200
# Node ID 38e4af417f34a0cf0b318ff7024404e8cfd23115
# Parent  3e570be16eea56c9767a7aab7078d6dd23c73848
fixed oopsie

diff -r 3e570be16eea -r 38e4af417f34 documentViewer.py
--- a/documentViewer.py	Wed Jun 16 20:48:34 2010 +0200
+++ b/documentViewer.py	Wed Jun 16 21:04:42 2010 +0200
@@ -217,7 +217,7 @@
         pt = getattr(self.template, 'thumbs_main_rss')
         
         if viewMode=="auto": # automodus gewaehlt
-            if docinfo.get("textURL",'') and self.textViewerUrl: #texturl gesetzt und textViewer konfiguriert
+            if docinfo.has_key("textURL") or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert
                 viewMode="text"
             else:
                 viewMode="images"
@@ -253,7 +253,7 @@
             docinfo = self.getToc(mode=tocMode, docinfo=docinfo)
             
         if viewMode=="auto": # automodus gewaehlt
-            if docinfo.get("textURL",''): #texturl gesetzt und textViewer konfiguriert
+            if docinfo.has_key("textURL") or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert
                 viewMode="text_dict"
             else:
                 viewMode="images"
@@ -568,7 +568,8 @@
         if viewerUrls and (len(viewerUrls) > 0):
             viewerUrl = getTextFromNode(viewerUrls[0])
             docinfo['viewerURL'] = viewerUrl
-                   
+        
+        # old style text URL
         textUrls = dom.xpath("//texttool/text")
         if textUrls and (len(textUrls) > 0):
             textUrl = getTextFromNode(textUrls[0])
@@ -580,6 +581,7 @@
             
             docinfo['textURL'] = textUrl
     
+        # new style text-url-path
         textUrls = dom.xpath("//texttool/text-url-path")
         if textUrls and (len(textUrls) > 0):
             textUrl = getTextFromNode(textUrls[0])