--- documentViewer/documentViewer.py	2010/06/01 14:31:26	1.66
+++ documentViewer/documentViewer.py	2010/06/09 10:29:33	1.68
@@ -195,14 +195,14 @@ class documentViewer(Folder):
             # get table of contents
             docinfo = self.getToc(mode=tocMode, docinfo=docinfo)
             
-        pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo,viewMode=viewMode,tocMode=tocMode)
-        
         if viewMode=="auto": # automodus gewaehlt
             if docinfo.get("textURL",''): #texturl gesetzt und textViewer konfiguriert
-                viewMode="text"
+                viewMode="text_dict"
             else:
                 viewMode="images"
                 
+        pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo,viewMode=viewMode,tocMode=tocMode)
+        
         pt = getattr(self.template, 'viewer_main')               
         return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=self.generateMarks(mk))
   
@@ -221,6 +221,10 @@ class documentViewer(Folder):
         """try to get the digilib URL from zogilib"""
         url = self.template.zogilib.getDLBaseUrl()
         return url
+
+    def getDocumentViewerURL(self):
+        """returns the URL of this instance"""
+        return self.absolute_url()
     
     def getStyle(self, idx, selected, style=""):
         """returns a string with the given style and append 'sel' if path == selected."""
@@ -900,9 +904,13 @@ class documentViewer(Folder):
     def getToc(self, mode="text", docinfo=None):
         """loads table of contents and stores in docinfo"""
         logging.debug("documentViewer (gettoc) mode: %s"%(mode))
+        if mode == "none":
+            return docinfo
+        
         if 'tocSize_%s'%mode in docinfo:
             # cached toc
-            return docinfo 
+            return docinfo
+        
         docpath = docinfo['textURLPath']
         # we need to set a result set size
         pagesize = 1000