--- documentViewer/MpdlXmlTextServer.py	2011/01/20 16:04:21	1.224
+++ documentViewer/MpdlXmlTextServer.py	2011/02/14 14:41:12	1.225
@@ -85,6 +85,7 @@ class MpdlXmlTextServer(SimpleItem):
                             selfurl = self.absolute_url()            
                             pagexml=href.replace('mode=text','mode=texttool&viewMode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&tocMode=%s&searchPN=%s&tocPN=%s&optionToggle=%s&characterNormalization=%s'%(viewMode,queryType,urllib.quote(query),pagesize,pn,tocMode,pn,tocPN,optionToggle,characterNormalization))
                             hrefNode.nodeValue = pagexml.replace('page-fragment.xql','%s'%selfurl)                                           
+                logging.debug("PUREXML :%s"%(serializeNode(pagenode)))
                 return serializeNode(pagenode)        
         if (queryType=="fulltextMorph"):
             pagedivs = pagedom.xpath("//div[@class='queryResult']")
@@ -175,7 +176,7 @@ class MpdlXmlTextServer(SimpleItem):
         return myList
           
            
-    def getTextPage(self, docinfo=None, pageinfo=None):
+    def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None):
         """returns single page from fulltext"""
         docpath = docinfo['textURLPath']
         path = docinfo['textURLPath']
@@ -185,7 +186,7 @@ class MpdlXmlTextServer(SimpleItem):
         viewMode= pageinfo['viewMode']
         sn = pageinfo['sn']
         highlightQuery = pageinfo['highlightQuery']
-        mode = pageinfo ['viewMode']
+        #mode = pageinfo ['viewMode']
         tocMode = pageinfo['tocMode']
         characterNormalization=pageinfo['characterNormalization']
         tocPN = pageinfo['tocPN']
@@ -362,7 +363,22 @@ class MpdlXmlTextServer(SimpleItem):
                             hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%s#note-"%(url,viewMode,tocMode,tocPN,pn))    
                 return serializeNode(pagenode)
         return "no text here"
-
+    
+    def getText(self, mode="text", pn=1, docinfo=None, pageinfo=None):
+        data = self.getTextPage(mode="text", pn=1 ,docinfo=docinfo, pageinfo=pageinfo)
+        logging.debug("TEXT ALL data: %s"%(data))
+        return data
+    
+    def getXML(self, mode="xml", pn=1, docinfo=None, pageinfo=None):
+        data = self.getTextPage(mode="xml", pn=1 ,docinfo=docinfo, pageinfo=pageinfo)
+        logging.debug("TEXT ALL data: %s"%(data))
+        return data
+    
+    def getDictionary(self, mode="text_dict", pn=1, docinfo=None, pageinfo=None):
+        data = self.getTextPage(mode="text_dict", pn=1 ,docinfo=docinfo, pageinfo=pageinfo)
+        logging.debug("TEXT ALL data: %s"%(data))
+        return data
+    
     def getTranslate(self, query=None, language=None):
         """translate into another languages"""
         data = self.getServerData("lt/lex.xql","document=&language="+str(language)+"&query="+urllib.quote(query))
@@ -455,7 +471,7 @@ class MpdlXmlTextServer(SimpleItem):
         page = data.replace('page-fragment.xql?document=%s'%str(path),'%s?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&optionToggle=1'%(selfurl,url, viewMode, tocMode, tocPN))
         text = page.replace('mode=image','mode=texttool')
         #logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization))
-        
+        logging.debug("TEXT %s"%(text))
         return text
     
     def manage_changeMpdlXmlTextServer(self,title="",serverUrl="http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/",timeout=40,RESPONSE=None):