--- documentViewer/MpdlXmlTextServer.py	2011/03/07 14:08:07	1.230
+++ documentViewer/MpdlXmlTextServer.py	2011/04/19 14:21:32	1.233
@@ -20,7 +20,9 @@ class MpdlXmlTextServer(SimpleItem):
     
     manage_changeMpdlXmlTextServerForm = PageTemplateFile("zpt/manage_changeMpdlXmlTextServer", globals())
         
-    def __init__(self,id,title="",serverUrl="http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/", serverName=None, timeout=40):
+    def __init__(self,id,title="",serverUrl="http://mpdl-test.mpiwg-berlin.mpg.de/mpdl/interface/", serverName=None, timeout=40):
+    #def __init__(self,id,title="",serverUrl="http://mpdl-test.mpiwg-berlin.mpg.de:30030/mpdl/interface/", serverName=None, timeout=40):    
+        
         """constructor"""
         self.id=id
         self.title=title
@@ -183,6 +185,7 @@ class MpdlXmlTextServer(SimpleItem):
         name = docinfo.get('name',None)
         pn =pageinfo['current']
         sn = pageinfo['sn']
+        optionToggle =pageinfo ['optionToggle']
         highlightQuery = pageinfo['highlightQuery']
         #mode = pageinfo ['viewMode']
         tocMode = pageinfo['tocMode']
@@ -194,14 +197,14 @@ class MpdlXmlTextServer(SimpleItem):
         else:
             textmode = mode
         
-        textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s"%(docpath,textmode,pn,characterNormalization)
+        textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s&optionToggle=%s"%(docpath,textmode,pn,characterNormalization,optionToggle)
         if highlightQuery is not None:
             textParam +="&highlightQuery=%s&sn=%s"%(urllib.quote(highlightQuery),sn)           
         
         pagexml = self.getServerData("page-fragment.xql",textParam)
         dom = Parse(pagexml)
         #original Pages
-        pagedivs = dom.xpath("//div[@class='pageNumberOrig']")
+        pagedivs = dom.xpath("//div[@class='pageNumberOrig']")       
         """if pagedivs == dom.xpath("//div[@class='pageNumberOrig']"):
             if len(pagedivs)>0:
                 docinfo['pageNumberOrig']= getTextFromNode(pagedivs[0])
@@ -345,11 +348,11 @@ class MpdlXmlTextServer(SimpleItem):
                     if hrefNode:
                         # is link with href
                         href = hrefNode.nodeValue
-                        if href.startswith('lt/lex.xql'):
+                        if href.startswith('../lt/wordInfo.xql'):
                             # is pollux link
                             selfurl = self.absolute_url()
                             # change href
-                            hrefNode.nodeValue = href.replace('lt/lex.xql','%s/template/head_main_voc'%selfurl)
+                            hrefNode.nodeValue = href.replace('../lt/wordInfo.xql','%s/template/voc'%selfurl)
                             # add target
                             l.setAttributeNS(None, 'target', '_blank')
                             l.setAttributeNS(None, 'onClick',"popupWin = window.open(this.href, 'contacts', 'location,width=500,height=600,top=180, left=700, scrollbars=1'); return false;")
@@ -480,7 +483,8 @@ class MpdlXmlTextServer(SimpleItem):
         text = page.replace('mode=image','mode=texttool')
         return text
     
-    def manage_changeMpdlXmlTextServer(self,title="",serverUrl="http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/",timeout=40,RESPONSE=None):
+    def manage_changeMpdlXmlTextServer(self,title="",serverUrl="http://mpdl-test.mpiwg-berlin.mpg.de/mpdl/interface/",timeout=40,RESPONSE=None):
+    #def manage_changeMpdlXmlTextServer(self,title="",serverUrl="http://mpdl-test.mpiwg-berlin.mpg.de:30030/mpdl/interface/",timeout=40,RESPONSE=None):
         """change settings"""
         self.title=title
         self.timeout = timeout
@@ -494,7 +498,8 @@ def manage_addMpdlXmlTextServerForm(self
     pt = PageTemplateFile("zpt/manage_addMpdlXmlTextServer", globals()).__of__(self)
     return pt()
 
-def manage_addMpdlXmlTextServer(self,id,title="",serverUrl="http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/",timeout=40,RESPONSE=None):
+def manage_addMpdlXmlTextServer(self,id,title="",serverUrl="http://mpdl-test.mpiwg-berlin.mpg.de/mpdl/interface/",timeout=40,RESPONSE=None):
+#def manage_addMpdlXmlTextServer(self,id,title="",serverUrl="http://mpdl-test.mpiwg-berlin.mpg.de:30030/mpdl/interface/",timeout=40,RESPONSE=None):    
     """add zogiimage"""
     newObj = MpdlXmlTextServer(id,title,serverUrl,timeout)
     self.Destination()._setObject(id, newObj)