--- documentViewer/documentViewer.py	2010/05/21 14:20:38	1.59
+++ 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."""
@@ -725,7 +729,6 @@ class documentViewer(Folder):
         
         if (queryType=="fulltextMorph"):
             pagedivs = pagedom.xpath("//div[@class='queryResult']")
-            
             if len(pagedivs)>0:
                 pagenode=pagedivs[0]
                 links=pagenode.xpath("//a")
@@ -738,11 +741,12 @@ class documentViewer(Folder):
                             pagexml=href.replace('mode=text','mode=texttool&viewMode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&tocMode=%s&searchPN=%s&tocPN=%s'%(viewMode,queryType,query,pagesize,pn,tocMode,pn,tocPN))
                             hrefNode.nodeValue = pagexml.replace('page-fragment.xql','%s'%selfurl)  
                         if href.startswith('../lt/lemma.xql'):
-                            selfurl = self.absolute_url()
-                            hrefNode.nodeValue = href.replace('lt/lemma.xql','%s/template/head_main_lemma'%selfurl)        
+                            
+                            hrefNode.nodeValue = href.replace('../lt/lemma.xql','%s/template/head_main_lemma'%selfurl)        
                             l.setAttributeNS(None, 'target', '_blank')
                             l.setAttributeNS(None, 'onClick',"popupWin = window.open(this.href, 'contacts', 'location,width=500,height=600,top=180, left=400, scrollbars=1'); return false;")
-                            l.setAttributeNS(None, 'onDblclick', 'popupWin.focus();')                  
+                            l.setAttributeNS(None, 'onDblclick', 'popupWin.focus();')  
+                pagedivs = pagedom.xpath("//div[@class='queryResultMorphExpansion']")                
                 return serializeNode(pagenode)
         
         if (queryType=="ftIndex")or(queryType=="ftIndexMorph"):
@@ -777,7 +781,7 @@ class documentViewer(Folder):
         docinfo['numPages'] = text.count("<pb ")
         return docinfo
        
-    def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None, viewMode=None):
+    def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None, viewMode=None, tocMode=None, tocPN=None):
         """returns single page from fulltext"""
         docpath = docinfo['textURLPath']
         path = docinfo['textURLPath']
@@ -823,6 +827,12 @@ class documentViewer(Folder):
               if len(pagedivs) > 0:
                   pagenode = pagedivs[0]
                   return serializeNode(pagenode)
+        if mode == "pureXml":
+              # first div contains text
+              pagedivs = pagedom.xpath("/div")
+              if len(pagedivs) > 0:
+                  pagenode = pagedivs[0]
+                  return serializeNode(pagenode)      
         # text-with-links mode
         if mode == "text_dict":
             # first div contains text
@@ -894,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
@@ -955,7 +969,6 @@ class documentViewer(Folder):
         #    return serializeNode(pagenode)
         #else:
         #    return "No TOC!"
-
     
     def changeDocumentViewer(self,title="",digilibBaseUrl=None,thumbrows=2,thumbcols=5,authgroups='mpiwg',RESPONSE=None):
         """init document viewer"""