--- documentViewer/MpdlXmlTextServer.py	2011/07/29 10:33:17	1.241
+++ documentViewer/MpdlXmlTextServer.py	2012/03/20 14:09:17	1.245
@@ -198,15 +198,18 @@ class MpdlXmlTextServer(SimpleItem):
         highlightQuery = pageinfo['highlightQuery']
         #mode = pageinfo ['viewMode']
         tocMode = pageinfo['tocMode']
+        xpointer = pageinfo['xpointer']
         characterNormalization=pageinfo['characterNormalization']
         tocPN = pageinfo['tocPN']
         selfurl = self.absolute_url()   
+        
         if mode == "text_dict":
             textmode = "textPollux"
         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&xpointer=%s"%(docpath,textmode,pn,characterNormalization, xpointer)
+        #textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s&xpointer=%s&options=withIdentifier"%(docpath,textmode,pn,characterNormalization, xpointer)
         if highlightQuery is not None:
             #textParam +="&highlightQuery=%s&sn=%s"%(urllib.quote(highlightQuery),sn)
             textParam +="&highlightQuery=%s&s=%s&highlightElement=%s&highlightElementPos=%s"%(urllib.quote(highlightQuery),s, highlightElement, highlightElementPos)           
@@ -319,6 +322,7 @@ class MpdlXmlTextServer(SimpleItem):
                         href= hrefNode.nodeValue
                         if href.startswith('#note-'):
                             hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=text&tocMode=%s&tocPN=%s&pn=%s#note-"%(url,tocMode,tocPN,pn))
+                        #if href.startswith():
                 return serializeNode(pagenode)
         if mode == "xml":
               # first div contains text
@@ -336,8 +340,8 @@ class MpdlXmlTextServer(SimpleItem):
                       hrefNode =l.getAttributeNodeNS(None, u"href")
                       if hrefNode:
                           href=hrefNode.nodeValue
-                          if href.startswith('http://chinagis.mpiwg-berlin.mpg.de'):
-                              hrefNode.nodeValue =href.replace('chinagis_REST/REST/db/chgis/mpdl','chinagis/REST/db/mpdl/%s'%name)
+                          if href.startswith('http://mappit.mpiwg-berlin.mpg.de'):
+                              hrefNode.nodeValue =href.replace('db/REST/db/chgis/mpdl','db/RESTdb/db/mpdl/%s'%name)
                               l.setAttributeNS(None, 'target', '_blank') 
                   return serializeNode(pagenode)
                     
@@ -526,4 +530,4 @@ def manage_addMpdlXmlTextServer(self,id,
     newObj = MpdlXmlTextServer(id,title,serverUrl,timeout)
     self.Destination()._setObject(id, newObj)
     if RESPONSE is not None:
-        RESPONSE.redirect('manage_main')
\ No newline at end of file
+        RESPONSE.redirect('manage_main')